X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9cca09ad88fcaeb49f2637de97df519c3920aaa4..cc4ca208c5e056ac569cd07e08f09a416f3606fe:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 8d2729174a..5acf3b829e 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -186,9 +186,8 @@ XBT_PUBLIC(void) simcall_call(smx_actor_t process); /******************************* Host simcalls ********************************/ XBT_PUBLIC(void) simcall_host_set_data(sg_host_t host, void *data); -XBT_PUBLIC(smx_activity_t) simcall_execution_start(const char *name, - double flops_amount, - double priority, double bound); +XBT_PUBLIC(smx_activity_t) +simcall_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host); XBT_PUBLIC(smx_activity_t) simcall_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate, double timeout); @@ -196,6 +195,7 @@ XBT_PUBLIC(void) simcall_execution_cancel(smx_activity_t execution); XBT_PUBLIC(void) simcall_execution_set_priority(smx_activity_t execution, double priority); XBT_PUBLIC(void) simcall_execution_set_bound(smx_activity_t execution, double bound); XBT_PUBLIC(e_smx_state_t) simcall_execution_wait(smx_activity_t execution); +XBT_PUBLIC(e_smx_state_t) simcall_execution_test(smx_activity_t execution); /**************************** Process simcalls ********************************/ SG_BEGIN_DECL() @@ -284,9 +284,9 @@ XBT_PUBLIC(void) SIMIX_sem_destroy(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_acquire(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration); -/***************************** File **********************************/ -XBT_PUBLIC(sg_size_t) simcall_file_read(surf_file_t fd, sg_size_t size); -XBT_PUBLIC(sg_size_t) simcall_file_write(surf_file_t fd, sg_size_t size); +/***************************** Storage **********************************/ +XBT_PUBLIC(sg_size_t) simcall_storage_read(surf_storage_t st, sg_size_t size); +XBT_PUBLIC(sg_size_t) simcall_storage_write(surf_storage_t fd, sg_size_t size); /************************** MC simcalls **********************************/ XBT_PUBLIC(int) simcall_mc_random(int min, int max);