s/__SIMIX_display_process_status/SIMIX_display_process_status/

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 2effb01..98aca67 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -44,38 +44,43 @@ void SIMIX_global_init(int *argc, char **argv)
 }
 
 /* Debug purpose, incomplete */
-void __SIMIX_display_process_status(void)
+void SIMIX_display_process_status(void)
 {
    smx_process_t process = NULL;
    xbt_fifo_item_t item = NULL;
         smx_action_t act;
    int nbprocess=xbt_swag_size(simix_global->process_list);
    
-   INFO1("SIMIX: %d processes are still running, waiting for something.",
+   INFO1("%d processes are still running, waiting for something.",
         nbprocess);
    /*  List the process and their state */
-   INFO0("SIMIX: <process> on <host>: <status>.");
+   INFO0("Legend of the following listing: \"<process> on <host>: <status>.\"");
    xbt_swag_foreach(process, simix_global->process_list) {
       smx_simdata_process_t p_simdata = (smx_simdata_process_t) process->simdata;
      // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata;
-      char *who;
+      char *who, *who2;
        
-      asprintf(&who,"SIMIX:  %s on %s: %s",
+      asprintf(&who,"%s on %s: %s",
               process->name,
-                               p_simdata->host->name,
+              p_simdata->s_host->name,
               (process->simdata->blocked)?"[BLOCKED] "
               :((process->simdata->suspended)?"[SUSPENDED] ":""));
-                       if (p_simdata->mutex) {
-                               DEBUG1("Block on a mutex: %s", who);                    
-                       }
-                       else if (p_simdata->cond) {
-                               DEBUG1("Block on a condition: %s", who);
-                               DEBUG0("Waiting actions:");
-                               xbt_fifo_foreach(p_simdata->cond->actions,item, act, smx_action_t) {
-                                       DEBUG1("\t %s", act->name);
-                               }
-                       }
-                       else DEBUG1("Unknown block status: %s", who);
+      
+      if (p_simdata->mutex) {
+        who2=bprintf("%s Blocked on mutex %p",who,p_simdata->mutex);
+        free(who); who=who2;
+      } else if (p_simdata->cond) {
+        who2=bprintf("%s Blocked on condition %p; Waiting for the following actions:",who,p_simdata->cond);
+        free(who); who=who2;
+        xbt_fifo_foreach(p_simdata->cond->actions,item, act, smx_action_t) {
+           who2=bprintf("%s '%s'",who,act->name);
+           free(who); who=who2;
+        }
+      } else {
+        who2=bprintf("%s Blocked in an unknown status (please report this bug)",who);
+        free(who); who=who2;
+      }
+      INFO1("%s.",who);
       free(who);
    }
 }
@@ -86,7 +91,7 @@ void __SIMIX_display_process_status(void)
 static void _XBT_CALL inthandler(int ignored)
 {
    INFO0("CTRL-C pressed. Displaying status and bailing out");
-   __SIMIX_display_process_status();
+   SIMIX_display_process_status();
    exit(1);
 }
 
@@ -121,7 +126,7 @@ void __SIMIX_main(void)
                        xbt_fifo_foreach(smx_action->cond_list,_cursor,cond,smx_cond_t) {
                                xbt_swag_foreach(process,cond->sleeping) {
                                        DEBUG2("\t preparing to wake up %s on %s",           
-                                                       process->name,  process->simdata->host->name);
+                                                       process->name,  process->simdata->s_host->name);
                                }
                                SIMIX_cond_broadcast(cond);
                                /* remove conditional from action */
@@ -136,7 +141,7 @@ void __SIMIX_main(void)
                        xbt_fifo_foreach(smx_action->cond_list,_cursor,cond,smx_cond_t) {
                                xbt_swag_foreach(process,cond->sleeping) {
                                        DEBUG2("\t preparing to wake up %s on %s",           
-                                                       process->name,  process->simdata->host->name);
+                                                       process->name,  process->simdata->s_host->name);
                                }
                                SIMIX_cond_broadcast(cond);
                                /* remove conditional from action */
@@ -180,7 +185,6 @@ void SIMIX_clean(void)
   smx_host_t h = NULL;
   smx_process_t p = NULL;
 
-
   while((p=xbt_swag_extract(simix_global->process_list))) {
     SIMIX_process_kill(p);
   }
@@ -238,7 +242,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
        while ((process = xbt_swag_extract(simix_global->process_to_run))) {
                DEBUG2("Scheduling %s on %s",        
                                process->name,
-                               process->simdata->host->name);
+                               process->simdata->s_host->name);
                simix_global->current_process = process;
                xbt_context_schedule(process->simdata->context);
                /*       fflush(NULL); */
@@ -269,7 +273,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
                while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
                        DEBUG2("got %p %p", fun, arg);
                        if(fun==SIMIX_process_create) {
-                               process_arg_t args = arg;
+                               smx_process_arg_t args = arg;
                                DEBUG2("Launching %s on %s", args->name, args->hostname);
                                process = SIMIX_process_create(args->name, args->code, 
                                                args->data, args->hostname,
@@ -284,7 +288,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
                        if(fun==SIMIX_process_kill) {
                                process = arg;
                                DEBUG2("Killing %s on %s", process->name, 
-                                               process->simdata->host->name);
+                                               process->simdata->s_host->name);
                                SIMIX_process_kill(process);
                        }
                }
@@ -312,7 +316,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
 /*                     INFO0("Congratulations ! Simulation terminated : all processes are over"); */
                } else {
                        INFO0("Oops ! Deadlock or code not perfectly clean.");
-                       __SIMIX_display_process_status();
+                       SIMIX_display_process_status();
                        if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
                                        XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
                                DEBUG0("Aborting!");