X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa99a28f4aa15a759609b66eae65501eccc1cf4a..431765cb8198579ac316fa0875b5c8988a501675:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index f05e1f1f4f..15aeec6e93 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -84,8 +84,7 @@ smx_activity_t simcall_execution_start(const char *name, * \return A new SIMIX execution synchronization */ 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 amount, double rate, - double timeout) + double* flops_amount, double* bytes_amount, double rate, double timeout) { /* checking for infinite values */ for (int i = 0 ; i < host_nb ; ++i) { @@ -98,11 +97,9 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s } } - xbt_assert(std::isfinite(amount), "amount is not finite!"); xbt_assert(std::isfinite(rate), "rate is not finite!"); - return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, - timeout); + return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); } /** @@ -267,25 +264,7 @@ XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_ { simcall_BODY_process_on_exit(process, fun, data); } -/** - * \ingroup simix_process_management - * \brief Sets the process to be auto-restarted or not by SIMIX when its host comes back up. - * Will restart the process when the host comes back up if auto_restart is set to 1. - */ - -XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart) -{ - simcall_BODY_process_auto_restart_set(process, auto_restart); -} -/** - * \ingroup simix_process_management - * \brief Restarts the process, killing it and starting it again from scratch. - */ -XBT_PUBLIC(smx_actor_t) simcall_process_restart(smx_actor_t process) -{ - return (smx_actor_t) simcall_BODY_process_restart(process); -} /** * \ingroup simix_process_management * \brief Creates a new sleep SIMIX synchro. @@ -472,7 +451,7 @@ smx_mutex_t simcall_mutex_init() fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization xbt_abort(); } - return simcall_BODY_mutex_init(); + return simgrid::simix::kernelImmediate([] { return new simgrid::simix::MutexImpl(); }); } /** @@ -550,33 +529,6 @@ void simcall_cond_broadcast(smx_cond_t cond) simcall_BODY_cond_broadcast(cond); } -/** - * \ingroup simix_synchro_management - * - */ -smx_sem_t simcall_sem_init(int capacity) -{ - return simcall_BODY_sem_init(capacity); -} - -/** - * \ingroup simix_synchro_management - * - */ -void simcall_sem_release(smx_sem_t sem) -{ - simcall_BODY_sem_release(sem); -} - -/** - * \ingroup simix_synchro_management - * - */ -int simcall_sem_would_block(smx_sem_t sem) -{ - return simcall_BODY_sem_would_block(sem); -} - /** * \ingroup simix_synchro_management * @@ -596,15 +548,6 @@ void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) simcall_BODY_sem_acquire_timeout(sem, timeout); } -/** - * \ingroup simix_synchro_management - * - */ -int simcall_sem_get_capacity(smx_sem_t sem) -{ - return simcall_BODY_sem_get_capacity(sem); -} - /** * \ingroup simix_file_management *