inline 2 more VM functions, and kill a simcall

[simgrid.git] / src / simix / simcalls.in

diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in
index f2b8b0f..1aa78dd 100644 (file)
--- a/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@ -37,23 +37,22 @@
 # compilation time)
 
 void vm_suspend(sg_host_t ind_vm);
-void vm_resume(sg_host_t ind_vm);
+void vm_resume(sg_host_t ind_vm) [[nohandler]];
 void vm_shutdown(sg_host_t ind_vm);
 void vm_save(sg_host_t ind_vm);
-void vm_restore(sg_host_t ind_vm);
 
 void process_kill(smx_actor_t process);
 void process_killall(int reset_pid);
 void process_cleanup(smx_actor_t process) [[nohandler]];
 void process_suspend(smx_actor_t process) [[block]];
-void process_resume(smx_actor_t process);
+void process_resume(smx_actor_t process) [[nohandler]];
 void process_set_host(smx_actor_t process, sg_host_t dest);
 int  process_is_suspended(smx_actor_t process) [[nohandler]];
 int  process_join(smx_actor_t process, double timeout) [[block]];
 int  process_sleep(double duration) [[block]];
 
 smx_activity_t execution_start(const char* name, double flops_amount, double priority, double bound);
-smx_activity_t execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate) [[nohandler]];
+smx_activity_t execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) [[nohandler]];
 void          execution_cancel(smx_activity_t execution) [[nohandler]];
 void          execution_set_priority(smx_activity_t execution, double priority) [[nohandler]];
 void          execution_set_bound(smx_activity_t execution, double bound) [[nohandler]];