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 652e87a..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);
@@ -172,28 +172,21 @@ void SIMIX_process_kill(smx_process_t process)
         p_simdata->s_host->name);
 
   /* Cleanup if we were waiting for something */
-  DEBUG0("Here!");
   if (p_simdata->mutex)
     xbt_swag_remove(process, p_simdata->mutex->sleeping);
 
-  DEBUG0("Here!");
   if (p_simdata->cond)
     xbt_swag_remove(process, p_simdata->cond->sleeping);
 
-  DEBUG0("Here!");
   xbt_swag_remove(process, simix_global->process_to_run);
-  DEBUG0("Here!");
   xbt_swag_remove(process, simix_global->process_list);
   DEBUG2("%p here! killing %p", simix_global->current_process, process);
   xbt_context_kill(process->simdata->context);
 
-  DEBUG0("Here!");
   if (process == SIMIX_process_self()) {
     /* I just killed myself */
-    DEBUG0("Here!");
     xbt_context_yield();
   }
-  DEBUG0("Here!");
 }
 
 /**
@@ -271,8 +264,10 @@ smx_process_t SIMIX_process_self(void)
 /**
  * \brief Suspend the process.
  *
- * This functions suspend the process by suspending the action on which it was waiting for the completion.
- *     \param process SIMIX process
+ * This functions suspend the process by suspending the action on
+ * which it was waiting for the completion.
+ *
+ * \param process SIMIX process
  */
 void SIMIX_process_suspend(smx_process_t process)
 {
@@ -297,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 {
@@ -312,10 +307,9 @@ 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_condition_to_action(dummy, cond);
     SIMIX_register_action_to_condition(dummy, cond);
     __SIMIX_cond_wait(cond);
     //SIMIX_action_destroy(dummy);
@@ -356,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;