A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
callbacks are actually meant for external users to use
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Engine.hpp
diff --git
a/include/simgrid/s4u/Engine.hpp
b/include/simgrid/s4u/Engine.hpp
index
a42beca
..
b9c7707
100644
(file)
--- a/
include/simgrid/s4u/Engine.hpp
+++ b/
include/simgrid/s4u/Engine.hpp
@@
-56,8
+56,18
@@
public:
/** @brief Load a deployment file and launch the actors that it contains */
void loadDeployment(const char* deploy);
/** @brief Load a deployment file and launch the actors that it contains */
void loadDeployment(const char* deploy);
+protected:
+ friend s4u::Host;
+ void addHost(std::string name, simgrid::s4u::Host * host);
+ void delHost(std::string name);
+
+public:
+ simgrid::s4u::Host* hostByName(std::string name);
+ simgrid::s4u::Host* hostByNameOrNull(std::string name);
size_t getHostCount();
void getHostList(std::vector<Host*> * whereTo);
size_t getHostCount();
void getHostList(std::vector<Host*> * whereTo);
+ size_t getLinkCount();
+ void getLinkList(std::vector<Link*> * list);
/** @brief Run the simulation */
void run();
/** @brief Run the simulation */
void run();
@@
-75,7
+85,7
@@
public:
simgrid::s4u::NetZone* getNetzoneByNameOrNull(const char* name);
/** @brief Retrieve the netcard of the given name (or nullptr if not found) */
simgrid::s4u::NetZone* getNetzoneByNameOrNull(const char* name);
/** @brief Retrieve the netcard of the given name (or nullptr if not found) */
- simgrid::kernel::routing::NetPoint* getNetpointByNameOrNull(
const char*
name);
+ simgrid::kernel::routing::NetPoint* getNetpointByNameOrNull(
std::string
name);
void getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*> * list);
void netpointRegister(simgrid::kernel::routing::NetPoint * card);
void netpointUnregister(simgrid::kernel::routing::NetPoint * card);
void getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*> * list);
void netpointRegister(simgrid::kernel::routing::NetPoint * card);
void netpointUnregister(simgrid::kernel::routing::NetPoint * card);
@@
-117,13
+127,16
@@
private:
/** Callback fired when the platform is created (ie, the xml file parsed),
* right before the actual simulation starts. */
/** Callback fired when the platform is created (ie, the xml file parsed),
* right before the actual simulation starts. */
-extern XBT_P
RIVATE xbt::signal<void()>
onPlatformCreated;
+extern XBT_P
UBLIC(xbt::signal<void()>)
onPlatformCreated;
/** Callback fired when the main simulation loop ends, just before MSG_run (or similar) ends */
/** Callback fired when the main simulation loop ends, just before MSG_run (or similar) ends */
-extern XBT_P
RIVATE xbt::signal<void()>
onSimulationEnd;
+extern XBT_P
UBLIC(xbt::signal<void()>)
onSimulationEnd;
/** Callback fired when the time jumps into the future */
/** Callback fired when the time jumps into the future */
-extern XBT_PRIVATE xbt::signal<void(double)> onTimeAdvance;
+extern XBT_PUBLIC(xbt::signal<void(double)>) onTimeAdvance;
+
+/** Callback fired when the time cannot jump because of inter-actors deadlock */
+extern XBT_PUBLIC(xbt::signal<void(void)>) onDeadlock;
}
} // namespace simgrid::s4u
}
} // namespace simgrid::s4u