- Execution->setHost() can be called after start() to migrate it.
- Comm::test_any() is now implemented.
- s4u::Actor now has onCreation() and onDestruction() signals.
+ - Install some kernel header files for the users' plugins and more.
+ Warning, their API is really not stable yet.
+ include/simgrid/kernel/resource/{Action,Resource,Model}.hpp
+ include/simgrid/kernel/routing/*Zone.hpp
XBT
- Remove XBT_LOG_CONNECT, it should be useless nowadays.
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "simgrid/kernel/routing/ClusterZone.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
#include "simgrid/s4u.hpp"
-#include "src/kernel/routing/ClusterZone.hpp"
-#include "src/kernel/routing/DragonflyZone.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
* @param cost The cost of the Action
* @param failed If the action is impossible (e.g.: execute something on a switched off host)
*/
- Action(simgrid::kernel::resource::Model * model, double cost, bool failed);
+ Action(simgrid::kernel::resource::Model* model, double cost, bool failed);
/**
* @brief Action constructor
* @param failed If the action is impossible (e.g.: execute something on a switched off host)
* @param var The lmm variable associated to this Action if it is part of a LMM component
*/
- Action(simgrid::kernel::resource::Model * model, double cost, bool failed, kernel::lmm::Variable* var);
+ Action(simgrid::kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var);
virtual ~Action();
public:
virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; };
- void heapInsert(heap_type & heap, double key, Action::Type hat);
- void heapRemove(heap_type & heap);
- void heapUpdate(heap_type & heap, double key, Action::Type hat);
+ void heapInsert(heap_type& heap, double key, Action::Type hat);
+ void heapRemove(heap_type& heap);
+ void heapUpdate(heap_type& heap, double key, Action::Type hat);
void clearHeapHandle() { heapHandle_ = boost::none; }
kernel::lmm::Variable* getVariable() const { return variable_; }
- void setVariable(kernel::lmm::Variable * var) { variable_ = var; }
+ void setVariable(kernel::lmm::Variable* var) { variable_ = var; }
double getLastUpdate() const { return lastUpdate_; }
void refreshLastUpdate() { lastUpdate_ = surf_get_clock(); }
double getLastValue() const { return lastValue_; }
typedef Action::ActionList ActionList;
typedef Action::ActionLmmList ActionLmmList;
typedef Action::ActionLmmList* ActionLmmListPtr;
-} // namespace surf
-} // namespace simgrid
+} // namespace resource
+} // namespace kernel
} // namespace simgrid
#endif
#ifndef SIMGRID_KERNEL_RESOURCE_MODEL_HPP
#define SIMGRID_KERNEL_RESOURCE_MODEL_HPP
-#include "src/kernel/resource/Action.hpp"
+#include <simgrid/kernel/resource/Action.hpp>
namespace simgrid {
namespace kernel {
heap_type actionHeap_;
};
-} // namespace surf
-} // namespace simgrid
+} // namespace resource
+} // namespace kernel
} // namespace simgrid
#endif
* @param name The name of the Resource
* @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
*/
- Resource(Model * model, const std::string& name, lmm::Constraint* constraint);
+ Resource(Model* model, const std::string& name, lmm::Constraint* constraint);
virtual ~Resource();
#ifndef SIMGRID_ROUTING_CLUSTER_HPP_
#define SIMGRID_ROUTING_CLUSTER_HPP_
-#include <unordered_map>
+#include <src/kernel/routing/NetZoneImpl.hpp>
-#include "src/kernel/routing/NetZoneImpl.hpp"
+#include <unordered_map>
namespace simgrid {
namespace kernel {
bool hasLoopback_ = false;
unsigned int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
};
-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif /* SIMGRID_ROUTING_CLUSTER_HPP_ */
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SURF_ROUTING_DIJKSTRA_HPP_
#define SURF_ROUTING_DIJKSTRA_HPP_
-#include "src/kernel/routing/RoutedZone.hpp"
+#include <simgrid/kernel/routing/RoutedZone.hpp>
struct s_graph_node_data_t {
int id;
* The path between components is computed each time you request it,
* using the Dijkstra algorithm. A cache can be used to reduce the computation.
*
- * This result in rather small platform file, very fast initialization, and very low memory requirements, but somehow long path resolution times.
+ * This result in rather small platform file, very fast initialization, and very low memory requirements, but somehow
+ * long path resolution times.
*/
class XBT_PRIVATE DijkstraZone : public RoutedZone {
public:
void addRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical) override;
- xbt_graph_t routeGraph_ = nullptr; /* xbt_graph */
+ xbt_graph_t routeGraph_ = nullptr; /* xbt_graph */
std::map<int, xbt_node_t> graphNodeMap_; /* map */
bool cached_; /* cache mode */
std::map<int, std::vector<int>> routeCache_; /* use in cache mode */
};
-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif /* SURF_ROUTING_DIJKSTRA_HPP_ */
#ifndef SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
#define SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
-#include "src/kernel/routing/ClusterZone.hpp"
+#include <simgrid/kernel/routing/ClusterZone.hpp>
namespace simgrid {
namespace kernel {
unsigned int numLinksperLink_ = 1; // splitduplex -> 2, only for local link
DragonflyRouter** routers_ = nullptr;
};
-}
-}
-}
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif
void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* /*nodes*/,
std::map<std::string, xbt_edge_t>* /*edges*/) override;
};
-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif /* SURF_ROUTING_NONE_HPP_ */
-/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
#define SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
-#include "src/kernel/routing/ClusterZone.hpp"
+#include <simgrid/kernel/routing/ClusterZone.hpp>
namespace simgrid {
namespace kernel {
bool areRelated(FatTreeNode* parent, FatTreeNode* child);
bool isInSubTree(FatTreeNode* root, FatTreeNode* node);
};
-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SURF_ROUTING_FLOYD_HPP_
#define SURF_ROUTING_FLOYD_HPP_
-#include "src/kernel/routing/RoutedZone.hpp"
+#include <simgrid/kernel/routing/RoutedZone.hpp>
namespace simgrid {
namespace kernel {
double* costTable_;
RouteCreationArgs** linkTable_;
};
-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif /* SURF_ROUTING_FLOYD_HPP_ */
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SIMGRID_ROUTING_FULL_HPP_
#define SIMGRID_ROUTING_FULL_HPP_
-#include "src/kernel/routing/RoutedZone.hpp"
+#include <simgrid/kernel/routing/RoutedZone.hpp>
namespace simgrid {
namespace kernel {
RouteCreationArgs** routingTable_ = nullptr;
};
-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif /* SIMGRID_ROUTING_FULL_HPP_ */
#include <xbt/base.h>
#include <xbt/signal.hpp>
-#include "src/kernel/routing/NetZoneImpl.hpp"
+#include <src/kernel/routing/NetZoneImpl.hpp>
namespace simgrid {
namespace kernel {
NetPoint::Type componentType_;
NetZoneImpl* netzone_;
};
-}
-}
-}
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
XBT_PUBLIC sg_netpoint_t sg_netpoint_by_name_or_null(const char* name);
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical);
};
-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
extern "C" {
XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,
-/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
#define SURF_ROUTING_CLUSTER_TORUS_HPP_
-#include "src/kernel/routing/ClusterZone.hpp"
+#include <simgrid/kernel/routing/ClusterZone.hpp>
+
#include <vector>
namespace simgrid {
private:
std::vector<unsigned int> dimensions_;
};
-}
-}
-}
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SURF_ROUTING_VIVALDI_HPP_
#define SURF_ROUTING_VIVALDI_HPP_
-#include "src/kernel/routing/ClusterZone.hpp"
+#include <simgrid/kernel/routing/ClusterZone.hpp>
+#include <xbt/Extendable.hpp>
namespace simgrid {
namespace kernel {
std::vector<double> coords;
};
-}
-}
-}
-} // namespace
+} // namespace vivaldi
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
#endif /* SURF_ROUTING_VIVALDI_HPP_ */
/* SimGrid Lua bindings */
#include "lua_private.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include <cctype>
-/* Copyright (c) 2010-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid_config.h"
#include "src/instr/instr_private.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_private.hpp"
#include "surf/surf.hpp"
-/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/EngineImpl.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/StorageImpl.hpp"
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
#include "simgrid/modelchecker.h"
#include "src/mc/mc_replay.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
#include "src/kernel/context/Context.hpp"
-#include "src/kernel/resource/Action.hpp"
#include "src/simix/ActorImpl.hpp"
#include "src/simix/popping_private.hpp"
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/activity/SynchroIo.hpp"
-#include "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/surf_interface.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/surf_interface.hpp"
#ifndef SURF_MAXMIN_HPP
#define SURF_MAXMIN_HPP
+#include "simgrid/kernel/resource/Action.hpp"
#include "src/internal_config.h"
-#include "src/kernel/resource/Action.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "xbt/asserts.h"
#include "xbt/mallocator.h"
#include "xbt/misc.h"
#include "xbt/utility.hpp"
+
#include <boost/intrusive/list.hpp>
#include <cmath>
#include <limits>
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Model.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "src/kernel/resource/Model.hpp"
XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Model.hpp"
#include "src/kernel/lmm/maxmin.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(resource);
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/resource/Resource.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"
#include "src/kernel/lmm/maxmin.hpp" // Constraint
#include "src/surf/surf_interface.hpp"
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/routing/ClusterZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/kernel/routing/RoutedZone.hpp"
+#include "simgrid/kernel/routing/ClusterZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/routing/DijkstraZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/DijkstraZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include <cfloat>
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/routing/DragonflyZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include <boost/algorithm/string/classification.hpp>
-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <xbt/graph.h>
#include <xbt/log.h>
-#include "src/kernel/routing/EmptyZone.hpp"
+#include "simgrid/kernel/routing/EmptyZone.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <sstream>
#include <string>
-#include "src/kernel/routing/FatTreeZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/FatTreeZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include <boost/algorithm/string/classification.hpp>
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/routing/FloydZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/FloydZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/log.h"
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/routing/FullZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/FullZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/routing/NetPoint.hpp"
-
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/log.h"
#include "xbt/sysdep.h"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/kernel/routing/RoutedZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/kernel/routing/TorusZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/TorusZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
+
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <string>
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <boost/algorithm/string.hpp>
-
+#include "simgrid/kernel/routing/VivaldiZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/kernel/routing/VivaldiZone.hpp"
#include "src/surf/network_interface.hpp"
+#include <boost/algorithm/string.hpp>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
namespace simgrid {
/* s4u::Engine Simulation Engine and global functions. */
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "instr/instr_interface.h"
#include "mc/mc.h"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.h"
#include "src/kernel/EngineImpl.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
#include <map>
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/msg/msg_private.hpp"
#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_private.hpp"
#include "xbt/log.h"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/simix.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/msg.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
-#include "src/kernel/resource/Resource.hpp"
#include "src/plugins/file_system/FileSystem.hpp"
#include "src/surf/StorageImpl.hpp"
#include <unordered_map>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simdag_private.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.h"
#include "src/include/instr/instr_interface.h"
-#include "src/kernel/resource/Action.hpp"
#include "src/surf/surf_interface.hpp"
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/Extendable.hpp"
#include "xbt/dict.h"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/simix/smx_host_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include <xbt/base.h>
#include <xbt/signal.hpp>
+#include "simgrid/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Storage.hpp"
-#include "src/kernel/resource/Action.hpp"
-#include "src/kernel/resource/Model.hpp"
-#include "src/kernel/resource/Resource.hpp"
#include "src/surf/PropertyHolder.hpp"
#include "surf_interface.hpp"
+
#include <map>
#ifndef STORAGE_INTERFACE_HPP_
#ifndef SURF_CPU_INTERFACE_HPP_
#define SURF_CPU_INTERFACE_HPP_
+#include "simgrid/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "src/kernel/resource/Model.hpp"
-#include "src/kernel/resource/Resource.hpp"
#include <list>
#include "src/instr/instr_private.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#ifndef SURF_NETWORK_INTERFACE_HPP_
#define SURF_NETWORK_INTERFACE_HPP_
+#include "simgrid/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Link.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "src/kernel/resource/Model.hpp"
-#include "src/kernel/resource/Resource.hpp"
#include "src/surf/PropertyHolder.hpp"
#include "src/surf/surf_interface.hpp"
#include "xbt/base.h"
+
#include <list>
#include <unordered_map>
#include "network_ns3.hpp"
#include "ns3/ns3_simulator.hpp"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/routing/NetPoint.hpp"
-
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/plugins/energy.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
+#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/kernel/routing/ClusterZone.hpp"
-#include "src/kernel/routing/DijkstraZone.hpp"
-#include "src/kernel/routing/DragonflyZone.hpp"
-#include "src/kernel/routing/EmptyZone.hpp"
-#include "src/kernel/routing/FatTreeZone.hpp"
-#include "src/kernel/routing/FloydZone.hpp"
-#include "src/kernel/routing/FullZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/ClusterZone.hpp"
+#include "simgrid/kernel/routing/DijkstraZone.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
+#include "simgrid/kernel/routing/EmptyZone.hpp"
+#include "simgrid/kernel/routing/FatTreeZone.hpp"
+#include "simgrid/kernel/routing/FloydZone.hpp"
+#include "simgrid/kernel/routing/FullZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/TorusZone.hpp"
+#include "simgrid/kernel/routing/VivaldiZone.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
-#include "src/kernel/routing/TorusZone.hpp"
-#include "src/kernel/routing/VivaldiZone.hpp"
#include <string>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "storage_n11.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
#include "xbt/utility.hpp"
#include <cmath> /*ceil*/
#include "surf_interface.hpp"
#include "mc/mc.h"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.h"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "src/kernel/lmm/maxmin.hpp" // Constraint
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/HostImpl.hpp"
#include "xbt/utility.hpp"
#define BOOST_TEST_NO_MAIN
#include <boost/test/unit_test.hpp>
-#include "src/kernel/resource/Resource.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/surf/trace_mgr.hpp"
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.h"
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/file.hpp"
-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <xbt/xbt_os_time.h>
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-
#include "simgrid/simdag.h"
-
-#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include <algorithm>
-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/simdag.h"
-#include "src/kernel/routing/NetPoint.hpp"
+
#include <algorithm>
#include <cstdio>
set(NS3_SRC src/surf/network_ns3.cpp
src/surf/ns3/ns3_simulator.cpp )
-set(KERNEL_HEADERS
- src/kernel/resource/Action.hpp
- src/kernel/resource/Model.hpp
- src/kernel/resource/Resource.hpp
-
- src/kernel/routing/ClusterZone.hpp
- src/kernel/routing/DijkstraZone.hpp
- src/kernel/routing/DragonflyZone.hpp
- src/kernel/routing/EmptyZone.hpp
- src/kernel/routing/FatTreeZone.hpp
- src/kernel/routing/FloydZone.hpp
- src/kernel/routing/FullZone.hpp
- src/kernel/routing/NetPoint.hpp
- src/kernel/routing/RoutedZone.hpp
- src/kernel/routing/TorusZone.hpp
- src/kernel/routing/VivaldiZone.hpp
-)
-
set(SURF_SRC
src/kernel/lmm/fair_bottleneck.cpp
src/kernel/lmm/lagrange.cpp
set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp)
set(headers_to_install
- ${KERNEL_HEADERS}
include/simgrid/chrono.hpp
include/simgrid/plugins/dvfs.h
include/simgrid/s4u/Storage.hpp
include/simgrid/s4u/VirtualMachine.hpp
include/simgrid/s4u.hpp
+
+ include/simgrid/kernel/resource/Action.hpp
+ include/simgrid/kernel/resource/Model.hpp
+ include/simgrid/kernel/resource/Resource.hpp
+
+ include/simgrid/kernel/routing/ClusterZone.hpp
+ include/simgrid/kernel/routing/DijkstraZone.hpp
+ include/simgrid/kernel/routing/DragonflyZone.hpp
+ include/simgrid/kernel/routing/EmptyZone.hpp
+ include/simgrid/kernel/routing/FatTreeZone.hpp
+ include/simgrid/kernel/routing/FloydZone.hpp
+ include/simgrid/kernel/routing/FullZone.hpp
+ include/simgrid/kernel/routing/NetPoint.hpp
+ include/simgrid/kernel/routing/RoutedZone.hpp
+ include/simgrid/kernel/routing/TorusZone.hpp
+ include/simgrid/kernel/routing/VivaldiZone.hpp
+
include/smpi/mpi.h
include/smpi/smpi.h
include/smpi/smpi_main.h
foreach(file ${headers_to_install} ${generated_headers_to_install})
get_filename_component(location ${file} PATH)
string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")
- string(REPLACE "src/" "include/simgrid/" location "${location}") # For kernel headers
install(FILES ${file} DESTINATION ${location})
endforeach()