X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/418ac8d537f356100767b8a21f65e16f7ba1d986..2fe56becb7b12edd78788a83dbc1d3e1d85d9dbc:/src/simix/popping.cpp diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp index e4a621b274..70a30d26f2 100644 --- a/src/simix/popping.cpp +++ b/src/simix/popping.cpp @@ -24,7 +24,7 @@ void SIMIX_simcall_answer(smx_simcall_t simcall) { if (simcall->issuer != simix_global->maestro_process){ XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), (int)simcall->call, - simcall->issuer->name, simcall->issuer); + simcall->issuer->name.c_str(), simcall->issuer); simcall->issuer->simcall.call = SIMCALL_NONE; /* This check should be useless and slows everyone. Reactivate if you see something * weird in process scheduling. @@ -37,39 +37,23 @@ void SIMIX_simcall_answer(smx_simcall_t simcall) void SIMIX_simcall_exit(smx_synchro_t synchro) { - simgrid::simix::Exec *exec = dynamic_cast(synchro); - if (exec != nullptr) { - SIMIX_post_host_execute(synchro); - return; - } - - simgrid::simix::Comm *comm = dynamic_cast(synchro); - if (comm != nullptr) { - SIMIX_post_comm(synchro); - return; - } - - simgrid::simix::Sleep *sleep = dynamic_cast(synchro); - if (sleep != nullptr) { - SIMIX_post_process_sleep(synchro); - return; - } - - simgrid::simix::Raw *raw = dynamic_cast(synchro); - if (raw != nullptr) { - SIMIX_post_synchro(synchro); - return; - } + synchro->post(); +} - simgrid::simix::Io *io = dynamic_cast(synchro); - if (io != nullptr) { - SIMIX_post_io(synchro); - return; - } +void SIMIX_run_kernel(std::function const* code) +{ + (*code)(); } -void SIMIX_run_kernel(void* code) +/** Kernel code for run_blocking + * + * The implementtion looks a lot like SIMIX_run_kernel ^^ + * + * However, this `run_blocking` is blocking so the process will not be woken + * up until `SIMIX_simcall_answer(simcall)`` is called by the kernel. + * This means that `code` is responsible for doing this. + */ +void SIMIX_run_blocking(std::function const* code) { - std::function* function = (std::function*) code; - (*function)(); + (*code)(); }