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
allStorages() -> getStorageList(whereTo)
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Actor.hpp
diff --git
a/include/simgrid/s4u/Actor.hpp
b/include/simgrid/s4u/Actor.hpp
index
17df501
..
c6384f4
100644
(file)
--- a/
include/simgrid/s4u/Actor.hpp
+++ b/
include/simgrid/s4u/Actor.hpp
@@
-109,17
+109,17
@@
namespace s4u {
* <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
* <platform version="4">
*
* <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
* <platform version="4">
*
- * <!-- Start a
process
called 'master' on the host called 'Tremblay' -->
- * <
process
host="Tremblay" function="master">
+ * <!-- Start a
n actor
called 'master' on the host called 'Tremblay' -->
+ * <
actor
host="Tremblay" function="master">
* <!-- Here come the parameter that you want to feed to this instance of master -->
* <argument value="20"/> <!-- argv[1] -->
* <argument value="50000000"/> <!-- argv[2] -->
* <argument value="1000000"/> <!-- argv[3] -->
* <argument value="5"/> <!-- argv[4] -->
* <!-- Here come the parameter that you want to feed to this instance of master -->
* <argument value="20"/> <!-- argv[1] -->
* <argument value="50000000"/> <!-- argv[2] -->
* <argument value="1000000"/> <!-- argv[3] -->
* <argument value="5"/> <!-- argv[4] -->
- * </
process
>
+ * </
actor
>
*
*
- * <!-- Start a
process
called 'worker' on the host called 'Jupiter' -->
- * <
process
host="Jupiter" function="worker"/> <!-- Don't provide any parameter ->>
+ * <!-- Start a
n actor
called 'worker' on the host called 'Jupiter' -->
+ * <
actor
host="Jupiter" function="worker"/> <!-- Don't provide any parameter ->>
*
* </platform>
* @endcode
*
* </platform>
* @endcode
@@
-176,7
+176,7
@@
public:
/** Create an actor using code
*
* Using this constructor, move-only type can be used. The consequence is
/** Create an actor using code
*
* Using this constructor, move-only type can be used. The consequence is
- * that we cannot copy the value and restart the
process
in its initial
+ * that we cannot copy the value and restart the
actor
in its initial
* state. In order to use auto-restart, an explicit `function` must be passed
* instead.
*/
* state. In order to use auto-restart, an explicit `function` must be passed
* instead.
*/
@@
-194,7
+194,7
@@
public:
static ActorPtr createActor(const char* name, s4u::Host* host, const char* function, std::vector<std::string> args);
// ***** Methods *****
static ActorPtr createActor(const char* name, s4u::Host* host, const char* function, std::vector<std::string> args);
// ***** Methods *****
- /** This actor will be automatically terminated when the last non-daemon
process
finishes **/
+ /** This actor will be automatically terminated when the last non-daemon
actor
finishes **/
void daemonize();
/** Retrieves the name of that actor as a C++ string */
void daemonize();
/** Retrieves the name of that actor as a C++ string */
@@
-215,17
+215,19
@@
public:
/** Suspend an actor by suspending the task on which it was waiting for the completion. */
void suspend();
/** Suspend an actor by suspending the task on which it was waiting for the completion. */
void suspend();
- /** Resume a suspended
process
by resuming the task on which it was waiting for the completion. */
+ /** Resume a suspended
actor
by resuming the task on which it was waiting for the completion. */
void resume();
void resume();
-
- /** Returns true if the process is suspended. */
+
+ void yield();
+
+ /** Returns true if the actor is suspended. */
int isSuspended();
/** If set to true, the actor will automatically restart when its host reboots */
void setAutoRestart(bool autorestart);
/** Add a function to the list of "on_exit" functions for the current actor. The on_exit functions are the functions
int isSuspended();
/** If set to true, the actor will automatically restart when its host reboots */
void setAutoRestart(bool autorestart);
/** Add a function to the list of "on_exit" functions for the current actor. The on_exit functions are the functions
- * executed when your actor is killed. You should use them to free the data used by your
process
.
+ * executed when your actor is killed. You should use them to free the data used by your
actor
.
*/
void onExit(int_f_pvoid_pvoid_t fun, void* data);
*/
void onExit(int_f_pvoid_pvoid_t fun, void* data);
@@
-256,6
+258,7
@@
public:
* This blocks the calling actor until the actor on which we call join() is terminated
*/
void join();
* This blocks the calling actor until the actor on which we call join() is terminated
*/
void join();
+ void join(double timeout);
// Static methods on all actors:
// Static methods on all actors:
@@
-267,6
+270,7
@@
public:
simix::ActorImpl* getImpl();
/** Retrieve the property value (or nullptr if not set) */
simix::ActorImpl* getImpl();
/** Retrieve the property value (or nullptr if not set) */
+ std::map<std::string, std::string>* getProperties();
const char* getProperty(const char* key);
void setProperty(const char* key, const char* value);
Actor* restart();
const char* getProperty(const char* key);
void setProperty(const char* key, const char* value);
Actor* restart();
@@
-306,6
+310,10
@@
XBT_PUBLIC(void) execute(double flop);
* An execution of priority 2 computes twice as fast as an execution at priority 1. */
XBT_PUBLIC(void) execute(double flop, double priority);
* An execution of priority 2 computes twice as fast as an execution at priority 1. */
XBT_PUBLIC(void) execute(double flop, double priority);
+XBT_PUBLIC(void) parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount);
+XBT_PUBLIC(void)
+parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double timeout);
+
/** Block the actor until it gets a message from the given mailbox.
*
* See \ref Comm for the full communication API (including non blocking communications).
/** Block the actor until it gets a message from the given mailbox.
*
* See \ref Comm for the full communication API (including non blocking communications).
@@
-341,12
+349,15
@@
XBT_PUBLIC(std::string) getName();
/** @brief Returns the name of the current actor as a C string. */
XBT_PUBLIC(const char*) getCname();
/** @brief Returns the name of the current actor as a C string. */
XBT_PUBLIC(const char*) getCname();
-/** @brief Returns the name of the host on which the
process
is running. */
+/** @brief Returns the name of the host on which the
actor
is running. */
XBT_PUBLIC(Host*) getHost();
/** @brief Suspend the actor. */
XBT_PUBLIC(void) suspend();
XBT_PUBLIC(Host*) getHost();
/** @brief Suspend the actor. */
XBT_PUBLIC(void) suspend();
+/** @brief yield the actor. */
+XBT_PUBLIC(void) yield();
+
/** @brief Resume the actor. */
XBT_PUBLIC(void) resume();
/** @brief Resume the actor. */
XBT_PUBLIC(void) resume();