X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53dd673a07059d04f7ee5c280470958856fdf8d8..50c46c12da0939b796b69af632cde52a8513338a:/src/simix/smx_process.cpp diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index f61113affc..93c852ed1f 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -11,7 +11,7 @@ #include "xbt/dict.h" #include "mc/mc.h" #include "src/mc/mc_replay.h" -#include "src/mc/mc_client.h" +#include "src/mc/Client.hpp" #include "src/simix/smx_private.hpp" #include "src/msg/msg_private.h" @@ -294,7 +294,7 @@ smx_process_t SIMIX_process_create( process->ppid = SIMIX_process_get_PID(parent_process); /* SMPI process have their own data segment and each other inherit from their father */ -#ifdef HAVE_SMPI +#if HAVE_SMPI if(smpi_privatize_global_variables){ if( parent_process->pid != 0){ SIMIX_segment_index_set(process, parent_process->segment_index); @@ -383,7 +383,7 @@ smx_process_t SIMIX_process_attach( process->ppid = SIMIX_process_get_PID(parent_process); /* SMPI process have their own data segment and each other inherit from their father */ - #ifdef HAVE_SMPI + #if HAVE_SMPI if(smpi_privatize_global_variables){ if(parent_process->pid != 0){ SIMIX_segment_index_set(process, parent_process->segment_index); @@ -768,9 +768,9 @@ int SIMIX_process_get_PPID(smx_process_t self){ return self->ppid; } -void* SIMIX_process_self_get_data(smx_process_t self) +void* SIMIX_process_self_get_data() { - xbt_assert(self == SIMIX_process_self(), "This is not the current process"); + smx_process_t self = SIMIX_process_self(); if (!self) { return NULL; @@ -778,9 +778,9 @@ void* SIMIX_process_self_get_data(smx_process_t self) return SIMIX_process_get_data(self); } -void SIMIX_process_self_set_data(smx_process_t self, void *data) +void SIMIX_process_self_set_data(void *data) { - xbt_assert(self == SIMIX_process_self(), "This is not the current process"); + smx_process_t self = SIMIX_process_self(); SIMIX_process_set_data(self, data); } @@ -926,13 +926,13 @@ void SIMIX_post_process_sleep(smx_synchro_t synchro) while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) { switch (synchro->sleep.surf_sleep->getState()){ - case SURF_ACTION_FAILED: + case simgrid::surf::Action::State::failed: simcall->issuer->context->iwannadie = 1; //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); state = SIMIX_SRC_HOST_FAILURE; break; - case SURF_ACTION_DONE: + case simgrid::surf::Action::State::done: state = SIMIX_DONE; break;