X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad32fd753f73b8a8a14242781eb011e78446995a..f5acac9da28f84a6625be7afaa01fc4ec6c643e7:/src/simix/popping_generated.cpp diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp index 2306854f1f..1d8618988a 100644 --- a/src/simix/popping_generated.cpp +++ b/src/simix/popping_generated.cpp @@ -15,8 +15,8 @@ #include #include "smx_private.h" -#ifdef HAVE_MC -#include "src/mc/mc_forward.h" +#if HAVE_MC +#include "src/mc/mc_forward.hpp" #endif XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping); @@ -51,12 +51,10 @@ const char* simcall_names[] = { "SIMCALL_PROCESS_ON_EXIT", "SIMCALL_PROCESS_AUTO_RESTART_SET", "SIMCALL_PROCESS_RESTART", - "SIMCALL_RDV_CREATE", - "SIMCALL_RDV_DESTROY", - "SIMCALL_RDV_COMM_COUNT_BY_HOST", - "SIMCALL_RDV_GET_HEAD", - "SIMCALL_RDV_SET_RECEIVER", - "SIMCALL_RDV_GET_RECEIVER", + "SIMCALL_MBOX_CREATE", + "SIMCALL_MBOX_GET_HEAD", + "SIMCALL_MBOX_SET_RECEIVER", + "SIMCALL_MBOX_GET_RECEIVER", "SIMCALL_COMM_IPROBE", "SIMCALL_COMM_SEND", "SIMCALL_COMM_ISEND", @@ -68,7 +66,6 @@ const char* simcall_names[] = { "SIMCALL_COMM_TEST", "SIMCALL_COMM_TESTANY", "SIMCALL_COMM_GET_REMAINS", - "SIMCALL_COMM_GET_STATE", "SIMCALL_COMM_GET_SRC_DATA", "SIMCALL_COMM_GET_DST_DATA", "SIMCALL_COMM_GET_SRC_PROC", @@ -105,12 +102,7 @@ const char* simcall_names[] = { "SIMCALL_ASR_GET_PROPERTIES", "SIMCALL_MC_RANDOM", "SIMCALL_SET_CATEGORY", - "SIMCALL_RUN_KERNEL", -#ifdef HAVE_MC - "SIMCALL_MC_SNAPSHOT", - "SIMCALL_MC_COMPARE_SNAPSHOTS", -#endif -}; + "SIMCALL_RUN_KERNEL",}; /** * @brief (in kernel mode) unpack the simcall and activate the handler @@ -259,33 +251,23 @@ case SIMCALL_PROCESS_RESTART: SIMIX_simcall_answer(simcall); break; -case SIMCALL_RDV_CREATE: - simcall->result.dp = SIMIX_rdv_create( simcall->args[0].cc); +case SIMCALL_MBOX_CREATE: + simcall->result.dp = SIMIX_mbox_create( simcall->args[0].cc); SIMIX_simcall_answer(simcall); break; -case SIMCALL_RDV_DESTROY: - SIMIX_rdv_destroy((smx_mailbox_t) simcall->args[0].dp); +case SIMCALL_MBOX_GET_HEAD: + simcall->result.dp = SIMIX_mbox_get_head((smx_mailbox_t) simcall->args[0].dp); SIMIX_simcall_answer(simcall); break; -case SIMCALL_RDV_COMM_COUNT_BY_HOST: - simcall->result.ui = SIMIX_rdv_comm_count_by_host((smx_mailbox_t) simcall->args[0].dp,(sg_host_t) simcall->args[1].dp); +case SIMCALL_MBOX_SET_RECEIVER: + SIMIX_mbox_set_receiver((smx_mailbox_t) simcall->args[0].dp,(smx_process_t) simcall->args[1].dp); SIMIX_simcall_answer(simcall); break; -case SIMCALL_RDV_GET_HEAD: - simcall->result.dp = SIMIX_rdv_get_head((smx_mailbox_t) simcall->args[0].dp); - SIMIX_simcall_answer(simcall); - break; - -case SIMCALL_RDV_SET_RECEIVER: - SIMIX_rdv_set_receiver((smx_mailbox_t) simcall->args[0].dp,(smx_process_t) simcall->args[1].dp); - SIMIX_simcall_answer(simcall); - break; - -case SIMCALL_RDV_GET_RECEIVER: - simcall->result.dp = SIMIX_rdv_get_receiver((smx_mailbox_t) simcall->args[0].dp); +case SIMCALL_MBOX_GET_RECEIVER: + simcall->result.dp = SIMIX_mbox_get_receiver((smx_mailbox_t) simcall->args[0].dp); SIMIX_simcall_answer(simcall); break; @@ -338,11 +320,6 @@ case SIMCALL_COMM_GET_REMAINS: SIMIX_simcall_answer(simcall); break; -case SIMCALL_COMM_GET_STATE: - simcall->result.i = SIMIX_comm_get_state((smx_synchro_t) simcall->args[0].dp); - SIMIX_simcall_answer(simcall); - break; - case SIMCALL_COMM_GET_SRC_DATA: simcall->result.dp = SIMIX_comm_get_src_data((smx_synchro_t) simcall->args[0].dp); SIMIX_simcall_answer(simcall); @@ -518,19 +495,6 @@ case SIMCALL_RUN_KERNEL: SIMIX_run_kernel( simcall->args[0].dp); SIMIX_simcall_answer(simcall); break; - -#ifdef HAVE_MC -case SIMCALL_MC_SNAPSHOT: - simcall->result.dp = simcall_HANDLER_mc_snapshot(simcall ); - SIMIX_simcall_answer(simcall); - break; - -case SIMCALL_MC_COMPARE_SNAPSHOTS: - simcall->result.i = simcall_HANDLER_mc_compare_snapshots(simcall , (mc_snapshot_t) simcall->args[0].dp, (mc_snapshot_t) simcall->args[1].dp); - SIMIX_simcall_answer(simcall); - break; - -#endif case NUM_SIMCALLS: break; case SIMCALL_NONE: