Merge branch 's_SimGrid_simgrid' into 'master'

[simgrid.git] / include / simgrid / actor.h

diff --git a/include/simgrid/actor.h b/include/simgrid/actor.h
index 858063f43cdab5056fcc269af96892d8211f4525..220b449f23c95d050e9ef80700f44fcc7f70d880 100644 (file)
--- a/include/simgrid/actor.h
+++ b/include/simgrid/actor.h
@@ -41,7 +41,7 @@ XBT_PUBLIC int sg_actor_is_suspended(sg_actor_t actor);
 XBT_PUBLIC sg_actor_t sg_actor_restart(sg_actor_t actor);
 XBT_PUBLIC void sg_actor_set_auto_restart(sg_actor_t actor, int auto_restart);
 XBT_PUBLIC void sg_actor_daemonize(sg_actor_t actor);
-XBT_PUBLIC int sg_actor_is_daemon(sg_actor_t actor);
+XBT_PUBLIC int sg_actor_is_daemon(const_sg_actor_t actor);
 
 #ifndef DOXYGEN
 XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_set_host() instead") XBT_PUBLIC
@@ -64,12 +64,18 @@ XBT_PUBLIC aid_t sg_actor_self_get_ppid();
 XBT_PUBLIC const char* sg_actor_self_get_name();
 XBT_PUBLIC void* sg_actor_self_data();
 XBT_PUBLIC void sg_actor_self_data_set(void* data);
-XBT_PUBLIC void sg_actor_self_execute(double flops);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_execute() instead") XBT_PUBLIC void sg_actor_self_execute(double flops);
+XBT_PUBLIC void sg_actor_execute(double flops);
+void sg_actor_parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount);
 XBT_PUBLIC void sg_actor_ref(const_sg_actor_t actor);
 XBT_PUBLIC void sg_actor_unref(const_sg_actor_t actor);
 XBT_PUBLIC void* sg_actor_data(const_sg_actor_t actor);
 XBT_PUBLIC void sg_actor_data_set(sg_actor_t actor, void* userdata);
 
+XBT_PUBLIC sg_exec_t sg_actor_exec_init(double computation_amount);
+XBT_PUBLIC sg_exec_t sg_actor_parallel_exec_init(int host_nb, const sg_host_t* host_list, double* flops_amount,
+                                                 double* bytes_amount);
+XBT_PUBLIC sg_exec_t sg_actor_exec_async(double computation_amount);
 SG_END_DECL
 
 #endif /* INCLUDE_SIMGRID_ACTOR_H_ */