#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)");
SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
SIMIX_process_yield(self);
} else {
+ XBT_DEBUG("I'm the maestro, execute the simcall directly");
SIMIX_simcall_pre(&self->simcall, 0);
}
}
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);
break;
case SIMCALL_HOST_EXECUTE:
- simcall->host_execute.result = SIMIX_host_execute(
- simcall->host_execute.name,
- simcall->host_execute.host,
- simcall->host_execute.computation_amount,
- simcall->host_execute.priority);
+ simcall->host_execute.result = simcall_table[simcall->call](simcall->args);
SIMIX_simcall_answer(simcall);
break;
SIMIX_simcall_answer(simcall);
break;
+#ifdef HAVE_MC
+ case SIMCALL_MC_SNAPSHOT:
+ simcall->mc_snapshot.s = MC_take_snapshot();
+ 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, NULL, NULL);
+ 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;
}
}
case SIMIX_ACTION_IO:
SIMIX_post_io(action);
break;
+
+ /* ****************************************************************************************** */
+ /* TUTORIAL: New API */
+ /* ****************************************************************************************** */
+ case SIMIX_ACTION_NEW_API:
+ SIMIX_post_new_api(action);
+ break;
+ }
+}
+
+/* New Simcal interface */
+
+/* FIXME: add types for every simcall */
+const char *simcall_types[NUM_SIMCALLS] = { [SIMCALL_HOST_EXECUTE] = "%s%p%f%f%p" };
+
+simcall_handler_t simcall_table[NUM_SIMCALLS] = {[SIMCALL_HOST_EXECUTE] = &SIMIX_host_execute};
+
+void SIMIX_simcall_typecheck(const char *fmt, ...)
+{
+ return;
+}
+
+void __SIMIX_simcall(e_smx_simcall_t simcall_id, u_smx_scalar_t *args)
+{
+ smx_process_t self = SIMIX_process_self();
+ self->simcall.call = simcall_id;
+ self->simcall.args = args;
+
+ if (self != simix_global->maestro_process) {
+ XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+ SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
+
+ SIMIX_process_yield(self);
+ } else {
+
+ SIMIX_simcall_pre(&self->simcall, 0);
}
}