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_RDV_GEY_BY_NAME:
+ case SIMCALL_RDV_GET_BY_NAME:
simcall->rdv_get_by_name.result =
SIMIX_rdv_get_by_name(simcall->rdv_get_by_name.name);
SIMIX_simcall_answer(simcall);
case SIMCALL_HOST_GET_BY_NAME:
simcall->host_get_by_name.result =
- SIMIX_host_get_by_name(simcall->host_get_by_name.name);
+ SIMIX_host_get_by_name(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_GET_NAME:
- simcall->host_get_name.result = SIMIX_host_get_name(simcall->host_get_name.host);
+ simcall->host_get_name.result = SIMIX_host_get_name(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_GET_PROPERTIES:
simcall->host_get_properties.result =
- SIMIX_host_get_properties(simcall->host_get_properties.host);
+ SIMIX_host_get_properties(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_GET_SPEED:
simcall->host_get_speed.result =
- SIMIX_host_get_speed(simcall->host_get_speed.host);
+ SIMIX_host_get_speed(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_GET_AVAILABLE_SPEED:
simcall->host_get_available_speed.result =
- SIMIX_host_get_available_speed(simcall->host_get_available_speed.host);
+ SIMIX_host_get_available_speed(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_GET_STATE:
simcall->host_get_state.result =
- SIMIX_host_get_state(simcall->host_get_state.host);
+ SIMIX_host_get_state(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_GET_DATA:
- simcall->host_get_data.result = SIMIX_host_get_data(simcall->host_get_data.host);
+ simcall->host_get_data.result = SIMIX_host_get_data(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_SET_DATA:
- SIMIX_host_set_data(simcall->host_set_data.host, simcall->host_set_data.data);
+ SIMIX_host_set_data(SIMIX_pack_args(PTR(simcall->host_set_data.host), PTR(simcall->host_set_data.data)));
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;
case SIMCALL_HOST_PARALLEL_EXECUTE:
- simcall->host_parallel_execute.result = SIMIX_host_parallel_execute(
- simcall->host_parallel_execute.name,
- simcall->host_parallel_execute.host_nb,
- simcall->host_parallel_execute.host_list,
- simcall->host_parallel_execute.computation_amount,
- simcall->host_parallel_execute.communication_amount,
- simcall->host_parallel_execute.amount,
- simcall->host_parallel_execute.rate);
+ simcall->host_parallel_execute.result = SIMIX_host_parallel_execute(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_EXECUTION_DESTROY:
- SIMIX_host_execution_destroy(simcall->host_execution_destroy.execution);
+ SIMIX_host_execution_destroy(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_EXECUTION_CANCEL:
- SIMIX_host_execution_cancel(simcall->host_execution_cancel.execution);
+ SIMIX_host_execution_cancel(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_EXECUTION_GET_REMAINS:
simcall->host_execution_get_remains.result =
- SIMIX_host_execution_get_remains(simcall->host_execution_get_remains.execution);
+ SIMIX_host_execution_get_remains(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_EXECUTION_GET_STATE:
simcall->host_execution_get_state.result =
- SIMIX_host_execution_get_state(simcall->host_execution_get_state.execution);
+ SIMIX_host_execution_get_state(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_EXECUTION_SET_PRIORITY:
- SIMIX_host_execution_set_priority(
- simcall->host_execution_set_priority.execution,
- simcall->host_execution_set_priority.priority);
+ SIMIX_host_execution_set_priority(simcall->args);
SIMIX_simcall_answer(simcall);
break;
case SIMCALL_HOST_EXECUTION_WAIT:
- SIMIX_pre_host_execution_wait(simcall);
+ SIMIX_pre_host_execution_wait(simcall->args);
break;
case SIMCALL_PROCESS_CREATE:
SIMIX_simcall_answer(simcall);
break;
+#ifdef HAVE_MC
case SIMCALL_MC_SNAPSHOT:
- simcall->mc_snapshot.s = MC_take_snapshot_liveness();
+ 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);
+ 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),
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] = {
+#undef SIMCALL_ENUM_ELEMENT
+#define SIMCALL_ENUM_ELEMENT(x,y) &y /* generate strings from the enumeration values */
+SIMCALL_LIST
+#undef SIMCALL_ENUM_ELEMENT
+};
+
+
+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);
+ }
+}
+
+/* New Simcal interface */
+
+/* FIXME: add types for every simcall */
+const char *simcall_types[NUM_SIMCALLS] = { [SIMCALL_HOST_EXECUTE] = "%s%p%f%f%p", [SIMCALL_HOST_EXECUTION_WAIT] = "%p%p" };
+
+
+simcall_handler_t simcall_table[NUM_SIMCALLS] = {
+#undef SIMCALL_ENUM_ELEMENT
+#define SIMCALL_ENUM_ELEMENT(x,y) &y /* generate strings from the enumeration values */
+SIMCALL_LIST
+#undef SIMCALL_ENUM_ELEMENT
+};
+
+
+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);
+ }
+}