Merge branch 'cmake-no-doc-when-disabled' into 'master'

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

diff --git a/include/simgrid/actor.h b/include/simgrid/actor.h
index b5de5fdeb5bb6595ca86f04deb3eae56fa2fab23..220b449f23c95d050e9ef80700f44fcc7f70d880 100644 (file)
--- a/include/simgrid/actor.h
+++ b/include/simgrid/actor.h
@@ -64,13 +64,17 @@ 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