X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/356d964ef596cb5f8905b6a6f54a1053d8ad86b6..23f5bf52cc58cf837840f231cf638e9fcd45097b:/src/simix/smx_smurf.c diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c index 214f0227c0..d5a93fc25b 100644 --- a/src/simix/smx_smurf.c +++ b/src/simix/smx_smurf.c @@ -1,6 +1,7 @@ #include "smx_private.h" #include "xbt/fifo.h" #include "xbt/xbt_os_thread.h" +#include "../mc/mc_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix, "Logging specific to SIMIX (SMURF)"); @@ -123,6 +124,17 @@ void SIMIX_simcall_pre(smx_simcall_t simcall, int value) SIMIX_simcall_answer(simcall); break; + case SIMCALL_COMM_IPROBE: + simcall->comm_iprobe.result = SIMIX_comm_iprobe( + simcall->issuer, + simcall->comm_iprobe.rdv, + simcall->comm_iprobe.src, + simcall->comm_iprobe.tag, + simcall->comm_iprobe.match_fun, + simcall->comm_iprobe.data); + SIMIX_simcall_answer(simcall); + break; + case SIMCALL_COMM_DESTROY: SIMIX_comm_destroy(simcall->comm_destroy.comm); SIMIX_simcall_answer(simcall); @@ -203,6 +215,16 @@ void SIMIX_simcall_pre(smx_simcall_t simcall, int value) SIMIX_simcall_answer(simcall); break; + case SIMCALL_RDV_SET_RECV: + SIMIX_rdv_set_receiver(simcall->rdv_set_rcv_proc.rdv, simcall->rdv_set_rcv_proc.receiver); + SIMIX_simcall_answer(simcall); + break; + + case SIMCALL_RDV_GET_RECV: + simcall->rdv_get_rcv_proc.result = SIMIX_rdv_get_receiver(simcall->rdv_set_rcv_proc.rdv); + SIMIX_simcall_answer(simcall); + break; + case SIMCALL_HOST_GET_BY_NAME: simcall->host_get_by_name.result = SIMIX_host_get_by_name(simcall->host_get_by_name.name); @@ -365,7 +387,7 @@ void SIMIX_simcall_pre(smx_simcall_t simcall, int value) SIMIX_simcall_answer(simcall); break; case SIMCALL_PROCESS_RESTART: - SIMIX_process_restart(simcall->process_restart.process, simcall->issuer); + simcall->process_restart.result = SIMIX_process_restart(simcall->process_restart.process, simcall->issuer); SIMIX_simcall_answer(simcall); break; case SIMCALL_PROCESS_AUTO_RESTART_SET: @@ -522,12 +544,46 @@ void SIMIX_simcall_pre(smx_simcall_t simcall, int value) SIMIX_pre_file_stat(simcall); break; + case SIMCALL_FILE_UNLINK: + SIMIX_pre_file_unlink(simcall); + break; + + case SIMCALL_FILE_LS: + SIMIX_pre_file_ls(simcall); + break; + + case SIMCALL_ASR_GET_PROPERTIES: + simcall->asr_get_properties.result = + SIMIX_asr_get_properties(simcall->asr_get_properties.name); + SIMIX_simcall_answer(simcall); + break; + +#ifdef HAVE_MC + case SIMCALL_MC_SNAPSHOT: + simcall->mc_snapshot.s = MC_take_snapshot_liveness(); + SIMIX_simcall_answer(simcall); + break; + + case SIMCALL_MC_COMPARE_SNAPSHOTS: + simcall->mc_compare_snapshots.result = + snapshot_compare(simcall->mc_compare_snapshots.snapshot1, simcall->mc_compare_snapshots.snapshot2); + SIMIX_simcall_answer(simcall); + break; +#endif /* HAVE_MC */ + case SIMCALL_NONE: THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s", SIMIX_process_get_name(simcall->issuer), SIMIX_host_get_name(SIMIX_process_get_host(simcall->issuer)) ); break; + + /* ****************************************************************************************** */ + /* TUTORIAL: New API */ + /* ****************************************************************************************** */ + case SIMCALL_NEW_API_INIT: + SIMIX_pre_new_api_fct(simcall); + break; } } @@ -555,5 +611,12 @@ void SIMIX_simcall_post(smx_action_t action) case SIMIX_ACTION_IO: SIMIX_post_io(action); break; + + /* ****************************************************************************************** */ + /* TUTORIAL: New API */ + /* ****************************************************************************************** */ + case SIMIX_ACTION_NEW_API: + SIMIX_post_new_api(action); + break; } }