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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 27437956b3..b84d48d9d1 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -17,17 +17,6 @@ SIMIX_Global_t simix_global = NULL;
 
 /********************************* SIMIX **************************************/
 
-/** 
- * \brief Initialize some SIMIX internal data.
- *
- * \param argc Argc
- * \param argv Argv
- */
-void SIMIX_global_init_args(int *argc, char **argv)
-{
-  SIMIX_global_init(argc,argv);
-}
-
 /**
  * \brief Initialize some SIMIX internal data.
  *
@@ -62,31 +51,36 @@ void __SIMIX_display_process_status(void)
 	 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->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);
    }
 }
@@ -279,10 +273,10 @@ 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_with_arguments) {
-				process_arg_t args = arg;
+			if(fun==SIMIX_process_create) {
+				smx_process_arg_t args = arg;
 				DEBUG2("Launching %s on %s", args->name, args->hostname);
-				process = SIMIX_process_create_with_arguments(args->name, args->code, 
+				process = SIMIX_process_create(args->name, args->code, 
 						args->data, args->hostname,
 						args->argc,args->argv,NULL);
 				if(args->kill_time > SIMIX_get_clock()) {
@@ -320,7 +314,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
 
 	if (elapsed_time == -1) {
 		if (xbt_swag_size(simix_global->process_list) == 0) {
-			INFO0("Congratulations ! Simulation terminated : all processes are over");
+/* 			INFO0("Congratulations ! Simulation terminated : all processes are over"); */
 		} else {
 			INFO0("Oops ! Deadlock or code not perfectly clean.");
 			__SIMIX_display_process_status();