Move SIMCALL_HOST_EXECUTE to the new simcall architecture for initial testing.

[simgrid.git] / src / simix / smx_smurf.c

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 91c67a4..0f1bdfb 100644 (file)
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -198,7 +198,7 @@ void SIMIX_simcall_pre(smx_simcall_t simcall, int value)
       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);
@@ -623,6 +623,41 @@ void SIMIX_simcall_post(smx_action_t action)
 /* 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_handler_t simcall_table[NUM_SIMCALLS] = {[SIMCALL_HOST_EXECUTE] = &SIMIX_host_execute};
 
 void SIMIX_simcall_typecheck(const char *fmt, ...)