X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/648ef671efa341346c38df5f27d10a530119108f..10f23d04cb0a60324df495c7b2e57704b57874b8:/src/simix/smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 5742d2bf78..fc1135fff3 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -153,18 +153,18 @@ void SIMIX_display_process_status(void)
 	     : ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
 
     if (p_simdata->mutex) {
-      who2 = bprintf("%s Blocked on mutex %p", who, p_simdata->mutex);
+      who2 = bprintf("%s Blocked on mutex %p", who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->mutex:(void*)0xdead);
       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);
+	   who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->cond:(void*)0xdead);
       free(who);
       who = who2;
       xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
-	who2 = bprintf("%s '%s'(%p)", who, act->name,act);
+	who2 = bprintf("%s '%s'(%p)", who, act->name,(XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?act:(void*)0xdead);
 	free(who);
 	who = who2;
       }
@@ -313,6 +313,15 @@ double SIMIX_get_clock(void)
   return surf_get_clock();
 }
 
+/**
+ * 	\brief Finish the simulation initialization 
+ * 
+ *      Must be called before the first call to SIMIX_solve()
+ */
+void SIMIX_init(void) {
+    surf_presolve();
+}
+
 /**
  * 	\brief Does a turn of the simulation
  *
@@ -328,16 +337,12 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
   unsigned int iter;
   double elapsed_time = 0.0;
   static int state_modifications = 1;
-  static int first = 1;
 
   xbt_context_empty_trash();
   if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
     DEBUG0("**************************************************");
   }
-  if (first) {
-    surf_solve();		/* Takes traces into account. Returns 0.0 */
-    first = 0;
-  }
+ 
   while ((process = xbt_swag_extract(simix_global->process_to_run))) {
     DEBUG2("Scheduling %s on %s",
 	   process->name, process->simdata->smx_host->name);