X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8340b9ca34a27bc19136607105d3ec1fe15c91db..b9922f60d05b3a465f766be535baf55aef0a6651:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 47d902190f..d019078c51 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -14,7 +14,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); static const char* simcall_names[] = { #undef SIMCALL_ENUM_ELEMENT -#define SIMCALL_ENUM_ELEMENT(x) #x /* generate strings from the enumeration values */ +#define SIMCALL_ENUM_ELEMENT(x,y) #x /* generate strings from the enumeration values */ SIMCALL_LIST #undef SIMCALL_ENUM_ELEMENT }; @@ -204,6 +204,7 @@ void simcall_host_set_data(smx_host_t host, void *data) * \param priority computation priority * \return A new SIMIX execution action */ + smx_action_t simcall_host_execute(const char *name, smx_host_t host, double computation_amount, double priority) @@ -219,9 +220,12 @@ smx_action_t simcall_host_execute(const char *name, smx_host_t host, simcall->host_execute.host = host; simcall->host_execute.computation_amount = computation_amount; simcall->host_execute.priority = priority; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ simcall->host_execute.result = NULL; - SIMIX_simcall_push(simcall->issuer); + + SIMIX_simcall(SIMCALL_HOST_EXECUTE, PTR(name), PTR(host), DOUBLE(computation_amount), DOUBLE(priority)); + return simcall->host_execute.result; } @@ -726,6 +730,7 @@ XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int aut SIMIX_simcall_push(simcall->issuer); } + /** * \ingroup simix_process_management * \brief Restarts the process, killing it and starting it again from scratch.