SIMIX_process_resume needed to signal cond after resuming surf action.

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

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index f9514ec..c6516fc 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -69,7 +69,7 @@ smx_process_t SIMIX_process_create(const char *name,
   simdata->cond = NULL;
   simdata->argc = argc;
   simdata->argv = argv;
-  simdata->context = xbt_context_new(code, NULL, NULL,
+  simdata->context = xbt_context_new(name,code, NULL, NULL,
                                     simix_global->
                                     cleanup_process_function, process,
                                     simdata->argc, simdata->argv);
@@ -132,7 +132,7 @@ void SIMIX_jprocess_create(const char *name, smx_host_t host,
   simdata->argc = 0;
   simdata->argv = NULL;
 
-  simdata->context = xbt_context_new(NULL, NULL, NULL,
+  simdata->context = xbt_context_new(name,NULL, NULL, NULL,
                                     simix_global->
                                     cleanup_process_function, process,
                                     /* argc/argv */ 0, NULL);
@@ -292,7 +292,7 @@ void SIMIX_process_suspend(smx_process_t process)
       simdata->suspended = 1;
       c = simdata->cond;
       xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
-       surf_workstation_resource->common_public->suspend(act->simdata->
+       surf_workstation_model->common_public->suspend(act->simdata->
                                                          surf_action);
       }
     } else {
@@ -307,7 +307,7 @@ void SIMIX_process_suspend(smx_process_t process)
 
     cond = SIMIX_cond_init();
     dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
-    surf_workstation_resource->common_public->set_priority(dummy->simdata->
+    surf_workstation_model->common_public->set_priority(dummy->simdata->
                                                           surf_action,
                                                           0.0);
     SIMIX_register_action_to_condition(dummy, cond);
@@ -350,9 +350,9 @@ void SIMIX_process_resume(smx_process_t process)
     simdata->suspended = 0;
     c = simdata->cond;
     xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
-      surf_workstation_resource->common_public->resume(act->simdata->
-                                                      surf_action);
+      surf_workstation_model->common_public->resume(act->simdata->surf_action);
     }
+    SIMIX_cond_signal(c);
     return;
   } else {
     simdata->suspended = 0;