#include <xbt/base.h>
#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);
"SIMCALL_PROCESS_SLEEP",
"SIMCALL_EXECUTION_START",
"SIMCALL_EXECUTION_PARALLEL_START",
- "SIMCALL_EXECUTION_DESTROY",
"SIMCALL_EXECUTION_CANCEL",
- "SIMCALL_EXECUTION_GET_REMAINS",
- "SIMCALL_EXECUTION_GET_STATE",
"SIMCALL_EXECUTION_SET_PRIORITY",
"SIMCALL_EXECUTION_SET_BOUND",
"SIMCALL_EXECUTION_SET_AFFINITY",
"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_SET_RECEIVER",
"SIMCALL_COMM_IPROBE",
"SIMCALL_COMM_SEND",
"SIMCALL_COMM_ISEND",
"SIMCALL_COMM_RECV",
"SIMCALL_COMM_IRECV",
- "SIMCALL_COMM_CANCEL",
"SIMCALL_COMM_WAITANY",
"SIMCALL_COMM_WAIT",
"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",
- "SIMCALL_COMM_GET_DST_PROC",
"SIMCALL_MUTEX_INIT",
- "SIMCALL_MUTEX_DESTROY",
"SIMCALL_MUTEX_LOCK",
"SIMCALL_MUTEX_TRYLOCK",
"SIMCALL_MUTEX_UNLOCK",
"SIMCALL_COND_INIT",
- "SIMCALL_COND_DESTROY",
"SIMCALL_COND_SIGNAL",
"SIMCALL_COND_WAIT",
"SIMCALL_COND_WAIT_TIMEOUT",
"SIMCALL_COND_BROADCAST",
"SIMCALL_SEM_INIT",
- "SIMCALL_SEM_DESTROY",
"SIMCALL_SEM_RELEASE",
"SIMCALL_SEM_WOULD_BLOCK",
"SIMCALL_SEM_ACQUIRE",
"SIMCALL_ASR_GET_PROPERTIES",
"SIMCALL_MC_RANDOM",
"SIMCALL_SET_CATEGORY",
- "SIMCALL_RUN_KERNEL",
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- "SIMCALL_COMM_IS_LATENCY_BOUNDED",
-#endif
-
-#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
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_EXECUTION_DESTROY:
- SIMIX_execution_destroy((smx_synchro_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_EXECUTION_CANCEL:
SIMIX_execution_cancel((smx_synchro_t) simcall->args[0].dp);
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_EXECUTION_GET_REMAINS:
- simcall->result.d = SIMIX_execution_get_remains((smx_synchro_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
-case SIMCALL_EXECUTION_GET_STATE:
- simcall->result.i = SIMIX_execution_get_state((smx_synchro_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_EXECUTION_SET_PRIORITY:
SIMIX_execution_set_priority((smx_synchro_t) simcall->args[0].dp, simcall->args[1].d);
SIMIX_simcall_answer(simcall);
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_RDV_CREATE:
- simcall->result.dp = SIMIX_rdv_create( simcall->args[0].cc);
- SIMIX_simcall_answer(simcall);
- break;
-
-case SIMCALL_RDV_DESTROY:
- SIMIX_rdv_destroy((smx_rdv_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_rdv_t) simcall->args[0].dp,(sg_host_t) simcall->args[1].dp);
+case SIMCALL_MBOX_CREATE:
+ simcall->result.dp = SIMIX_mbox_create( simcall->args[0].cc);
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_RDV_GET_HEAD:
- simcall->result.dp = SIMIX_rdv_get_head((smx_rdv_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
-case SIMCALL_RDV_SET_RECEIVER:
- SIMIX_rdv_set_receiver((smx_rdv_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_rdv_t) simcall->args[0].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_COMM_IPROBE:
- simcall->result.dp = simcall_HANDLER_comm_iprobe(simcall , (smx_rdv_t) simcall->args[0].dp, simcall->args[1].i, simcall->args[2].i, simcall->args[3].i, (simix_match_func_t) simcall->args[4].fp, simcall->args[5].dp);
+ simcall->result.dp = simcall_HANDLER_comm_iprobe(simcall , (smx_mailbox_t) simcall->args[0].dp, simcall->args[1].i, simcall->args[2].i, simcall->args[3].i, (simix_match_func_t) simcall->args[4].fp, simcall->args[5].dp);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_COMM_SEND:
- simcall_HANDLER_comm_send(simcall , (smx_process_t) simcall->args[0].dp, (smx_rdv_t) simcall->args[1].dp, simcall->args[2].d, simcall->args[3].d, simcall->args[4].dp, simcall->args[5].sz, (simix_match_func_t) simcall->args[6].fp, (simix_copy_data_func_t) simcall->args[7].fp, simcall->args[8].dp, simcall->args[9].d);
+ simcall_HANDLER_comm_send(simcall , (smx_process_t) simcall->args[0].dp, (smx_mailbox_t) simcall->args[1].dp, simcall->args[2].d, simcall->args[3].d, simcall->args[4].dp, simcall->args[5].sz, (simix_match_func_t) simcall->args[6].fp, (simix_copy_data_func_t) simcall->args[7].fp, simcall->args[8].dp, simcall->args[9].d);
break;
case SIMCALL_COMM_ISEND:
- simcall->result.dp = simcall_HANDLER_comm_isend(simcall , (smx_process_t) simcall->args[0].dp, (smx_rdv_t) simcall->args[1].dp, simcall->args[2].d, simcall->args[3].d, simcall->args[4].dp, simcall->args[5].sz, (simix_match_func_t) simcall->args[6].fp, (simix_clean_func_t) simcall->args[7].fp, (simix_copy_data_func_t) simcall->args[8].fp, simcall->args[9].dp, simcall->args[10].i);
+ simcall->result.dp = simcall_HANDLER_comm_isend(simcall , (smx_process_t) simcall->args[0].dp, (smx_mailbox_t) simcall->args[1].dp, simcall->args[2].d, simcall->args[3].d, simcall->args[4].dp, simcall->args[5].sz, (simix_match_func_t) simcall->args[6].fp, (simix_clean_func_t) simcall->args[7].fp, (simix_copy_data_func_t) simcall->args[8].fp, simcall->args[9].dp, simcall->args[10].i);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_COMM_RECV:
- simcall_HANDLER_comm_recv(simcall , (smx_process_t) simcall->args[0].dp, (smx_rdv_t) simcall->args[1].dp, simcall->args[2].dp, (size_t*) simcall->args[3].dp, (simix_match_func_t) simcall->args[4].fp, (simix_copy_data_func_t) simcall->args[5].fp, simcall->args[6].dp, simcall->args[7].d, simcall->args[8].d);
+ simcall_HANDLER_comm_recv(simcall , (smx_process_t) simcall->args[0].dp, (smx_mailbox_t) simcall->args[1].dp, simcall->args[2].dp, (size_t*) simcall->args[3].dp, (simix_match_func_t) simcall->args[4].fp, (simix_copy_data_func_t) simcall->args[5].fp, simcall->args[6].dp, simcall->args[7].d, simcall->args[8].d);
break;
case SIMCALL_COMM_IRECV:
- simcall->result.dp = simcall_HANDLER_comm_irecv(simcall , (smx_process_t) simcall->args[0].dp, (smx_rdv_t) simcall->args[1].dp, simcall->args[2].dp, (size_t*) simcall->args[3].dp, (simix_match_func_t) simcall->args[4].fp, (simix_copy_data_func_t) simcall->args[5].fp, simcall->args[6].dp, simcall->args[7].d);
- SIMIX_simcall_answer(simcall);
- break;
-
-case SIMCALL_COMM_CANCEL:
- SIMIX_comm_cancel((smx_synchro_t) simcall->args[0].dp);
+ simcall->result.dp = simcall_HANDLER_comm_irecv(simcall , (smx_process_t) simcall->args[0].dp, (smx_mailbox_t) simcall->args[1].dp, simcall->args[2].dp, (size_t*) simcall->args[3].dp, (simix_match_func_t) simcall->args[4].fp, (simix_copy_data_func_t) simcall->args[5].fp, simcall->args[6].dp, simcall->args[7].d);
SIMIX_simcall_answer(simcall);
break;
simcall_HANDLER_comm_testany(simcall , (xbt_dynar_t) simcall->args[0].dp);
break;
-case SIMCALL_COMM_GET_REMAINS:
- simcall->result.d = SIMIX_comm_get_remains((smx_synchro_t) simcall->args[0].dp);
- 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);
- break;
-
-case SIMCALL_COMM_GET_DST_DATA:
- simcall->result.dp = SIMIX_comm_get_dst_data((smx_synchro_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
-case SIMCALL_COMM_GET_SRC_PROC:
- simcall->result.dp = SIMIX_comm_get_src_proc((smx_synchro_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
-case SIMCALL_COMM_GET_DST_PROC:
- simcall->result.dp = SIMIX_comm_get_dst_proc((smx_synchro_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_MUTEX_INIT:
simcall->result.dp = simcall_HANDLER_mutex_init(simcall );
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_MUTEX_DESTROY:
- SIMIX_mutex_destroy((smx_mutex_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_MUTEX_LOCK:
simcall_HANDLER_mutex_lock(simcall , (smx_mutex_t) simcall->args[0].dp);
break;
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_COND_DESTROY:
- SIMIX_cond_destroy((smx_cond_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_COND_SIGNAL:
SIMIX_cond_signal((smx_cond_t) simcall->args[0].dp);
SIMIX_simcall_answer(simcall);
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_SEM_DESTROY:
- SIMIX_sem_destroy((smx_sem_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_SEM_RELEASE:
simcall_HANDLER_sem_release(simcall , (smx_sem_t) simcall->args[0].dp);
SIMIX_simcall_answer(simcall);
SIMIX_run_kernel( simcall->args[0].dp);
SIMIX_simcall_answer(simcall);
break;
-
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-case SIMCALL_COMM_IS_LATENCY_BOUNDED:
- simcall->result.i = SIMIX_comm_is_latency_bounded((smx_synchro_t) simcall->args[0].dp);
- SIMIX_simcall_answer(simcall);
- break;
-
-#endif
-
-#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: