make use of the newly introduced MxN data redistribution and actually

[simgrid.git] / src / surf / surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 36980e1..d48011e 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -135,7 +135,7 @@ s_surf_model_description_t surf_network_model_description[] = {
 #ifdef HAVE_NS3
   {"NS3",
    "Network pseudo-model using the NS3 tcp model instead of an analytic model",
-       surf_network_model_init_NS3},
+  surf_network_model_init_NS3},
 #endif
   {"Reno",
    "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
@@ -525,6 +525,8 @@ double surf_solve(double max_date)
     /* parallel version */
 #ifdef CONTEXT_THREADS
     xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+#else
+    xbt_die("Asked to run in parallel, but no thread at hand...");
 #endif
   }
   else {
@@ -542,7 +544,7 @@ double surf_solve(double max_date)
     }
   }
 
-  XBT_DEBUG("Min for resources (remember that NS3 dont update that value) : %f", min);
+  XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", min);
 
   XBT_DEBUG("Looking for next trace event");
 
@@ -568,8 +570,8 @@ double surf_solve(double max_date)
     }
 
     if (next_event_date == -1.0) {
-       XBT_DEBUG("no next TRACE event. Stop searching for it");
-       break;
+      XBT_DEBUG("no next TRACE event. Stop searching for it");
+      break;
     }
 
     if ((min != -1.0) && (next_event_date > NOW + min)) break;
@@ -599,7 +601,7 @@ double surf_solve(double max_date)
    * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
    * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
   if (min == -1.0) {
-       XBT_DEBUG("No next event at all. Bail out now.");
+  XBT_DEBUG("No next event at all. Bail out now.");
     return -1.0;
   }