X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/355882f73963f095c76b910edd3faa0928143fdc..fed4ee0e44358963b1d0c65f88b78f201b46f9f7:/src/simix/smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 5ec6c24d11..495736193e 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -66,8 +66,7 @@ void SIMIX_global_init(int *argc, char **argv)
     simix_global = xbt_new0(s_smx_global_t, 1);
 
     simix_global->host = xbt_dict_new();
-    simix_global->process_to_run =
-        xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
+    simix_global->process_to_run = xbt_dynar_new(sizeof(void *), NULL);
     simix_global->process_list =
         xbt_swag_new(xbt_swag_offset(proc, process_hookup));
     simix_global->process_to_destroy =
@@ -84,6 +83,7 @@ void SIMIX_global_init(int *argc, char **argv)
     simix_global->latency_limited_dict = xbt_dict_new();
 #endif
 
+    surf_init(argc, argv);      /* Initialize SURF structures */
     SIMIX_context_mod_init();
     SIMIX_create_maestro_process();
 
@@ -99,7 +99,6 @@ void SIMIX_global_init(int *argc, char **argv)
 
     /* Prepare to display some more info when dying on Ctrl-C pressing */
     signal(SIGINT, inthandler);
-    surf_init(argc, argv);      /* Initialize SURF structures */
   }
   if (!simix_timers) {
     simix_timers = xbt_heap_new(8, &free);
@@ -124,7 +123,7 @@ void SIMIX_clean(void)
 
   xbt_heap_free(simix_timers);
   /* Free the remaining data structures */
-  xbt_swag_free(simix_global->process_to_run);
+  xbt_dynar_free(&simix_global->process_to_run);
   xbt_swag_free(simix_global->process_to_destroy);
   xbt_swag_free(simix_global->process_list);
   simix_global->process_list = NULL;
@@ -180,13 +179,14 @@ void SIMIX_run(void)
 
   do {
     do {
-      DEBUG0("New Schedule Round");
+      DEBUG1("New Schedule Round; size(queue)=%lu",
+          xbt_dynar_length(simix_global->process_to_run));
       SIMIX_context_runall(simix_global->process_to_run);
       while ((req = SIMIX_request_pop())) {
         DEBUG1("Handling request %p", req);
         SIMIX_request_pre(req);
       }
-    } while (xbt_swag_size(simix_global->process_to_run));
+    } while (xbt_dynar_length(simix_global->process_to_run));
 
     time = surf_solve(SIMIX_timer_next());
 
@@ -215,6 +215,12 @@ void SIMIX_run(void)
     }
   } while (time != -1.0);
 
+  if (xbt_swag_size(simix_global->process_list) != 0) {
+
+    WARN0("Oops ! Deadlock or code not perfectly clean.");
+    SIMIX_display_process_status();
+    xbt_abort();
+  }
 }
 
 /**
@@ -288,80 +294,45 @@ void SIMIX_display_process_status(void)
     return;
   }
 
-  /*smx_process_t process = NULL;
-  xbt_fifo_item_t item = NULL;
-  smx_action_t act;*/
+  smx_process_t process = NULL;
   int nbprocess = xbt_swag_size(simix_global->process_list);
 
   INFO1("%d processes are still running, waiting for something.", nbprocess);
   /*  List the process and their state */
-  /* FIXME: reimplement me
   INFO0
     ("Legend of the following listing: \"<process> on <host>: <status>.\"");
   xbt_swag_foreach(process, simix_global->process_list) {
-    char *who, *who2;
-
-    asprintf(&who, "%s on %s: %s",
-             process->name,
-             process->smx_host->name,
-             (process->blocked) ? "[BLOCKED] "
-             : ((process->suspended) ? "[SUSPENDED] " : ""));
 
     if (process->waiting_action) {
-      who2 = bprintf("Waiting for action %p to finish", process->waiting_action);
-    }
 
-    if (process->mutex) {
-      who2 =
-        bprintf("%s Blocked on mutex %p", who,
-                (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
-                process->mutex : (void *) 0xdead);
-      free(who);
-      who = who2;
-    } else if (process->cond) {
-      who2 =
-        bprintf
-        ("%s Blocked on condition %p; Waiting for the following actions:",
-         who,
-         (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
-         process->cond : (void *) 0xdead);
-      free(who);
-      who = who2;
-      xbt_fifo_foreach(process->cond->actions, item, act, smx_action_t) {
-        who2 =
-          bprintf("%s '%s'(%p)", who, act->name,
-                  (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
-                  ? act : (void *) 0xdead);
-        free(who);
-        who = who2;
-      }
-    } else if (process->sem) {
-      who2 =
-        bprintf
-        ("%s Blocked on semaphore %p; Waiting for the following actions:",
-         who,
-         (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
-         process->sem : (void *) 0xdead);
-      free(who);
-      who = who2;
-      xbt_fifo_foreach(process->sem->actions, item, act, smx_action_t) {
-        who2 =
-          bprintf("%s '%s'(%p)", who, act->name,
-                  (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
-                  ? act : (void *) 0xdead);
-        free(who);
-        who = who2;
-      }
+      const char* action_description = "unknown";
+      switch (process->waiting_action->type) {
+
+	case SIMIX_ACTION_EXECUTE:
+	  action_description = "execution";
+	  break;
+
+	case SIMIX_ACTION_PARALLEL_EXECUTE:
+	  action_description = "parallel execution";
+	  break;
+
+	case SIMIX_ACTION_COMMUNICATE:
+	  action_description = "communication";
+	  break;
 
-    } else {
-      who2 =
-        bprintf
-        ("%s Blocked in an unknown status (please report this bug)", who);
-      free(who);
-      who = who2;
+	case SIMIX_ACTION_SLEEP:
+	  action_description = "sleeping";
+	  break;
+
+	case SIMIX_ACTION_SYNCHRO:
+	  action_description = "synchronization";
+	  break;
+
+	case SIMIX_ACTION_IO:
+	  action_description = "I/O";
+	  break;
+      }
+      INFO2("Waiting for %s action %p to finish", action_description, process->waiting_action);
     }
-    INFO1("%s.", who);
-    free(who);
   }
-  */
 }