X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02ae829468d448fedc59be33dfd8b6d829b77ad6..2cc8ea0d3fabf1676e26e7361de7c45d09d5a2b6:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 4a8b163795..e4672f482d 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -203,8 +203,8 @@ int find_model_description(s_surf_model_description_t * table,
     strcat(name_list, ", ");
     strcat(name_list, table[i].name);
   }
-  xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name,
-              name_list);
+  xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list);
+  return -1;
 }
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
@@ -251,15 +251,15 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
         value = 0.0;
       if (value < min) {
         min = value;
-        DEBUG2("Updating min (value) with %p: %f", action, min);
+        XBT_DEBUG("Updating min (value) with %p: %f", action, min);
       }
     }
     if ((action->max_duration >= 0) && (action->max_duration < min)) {
       min = action->max_duration;
-      DEBUG2("Updating min (duration) with %p: %f", action, min);
+      XBT_DEBUG("Updating min (duration) with %p: %f", action, min);
     }
   }
-  DEBUG1("min value : %f", min);
+  XBT_DEBUG("min value : %f", min);
 
 #undef VARIABLE
   return min;
@@ -284,6 +284,24 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
 
 void surf_init(int *argc, char **argv)
 {
+	XBT_DEBUG("Create all Libs");
+	host_lib = xbt_lib_new();
+	link_lib = xbt_lib_new();
+	as_router_lib = xbt_lib_new();
+
+	XBT_DEBUG("ADD ROUTING LEVEL");
+	ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
+	ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,free);
+
+	XBT_DEBUG("ADD SURF LEVELS");
+	SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,free);
+	SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,free);
+	SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,free);
+
+	XBT_DEBUG("ADD COORD LEVEL");
+	COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
+	COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,free);
+
   /* Connect our log channels: that must be done manually under windows */
   XBT_LOG_CONNECT(surf_cpu, surf);
   XBT_LOG_CONNECT(surf_kernel, surf);
@@ -309,6 +327,7 @@ void surf_init(int *argc, char **argv)
     history = tmgr_history_new();
 
   surf_config_init(argc, argv);
+  surf_action_init();
   if (MC_IS_ENABLED)
     MC_memory_init();
 }
@@ -362,6 +381,7 @@ void surf_exit(void)
     tmgr_history_free(history);
     history = NULL;
   }
+  surf_action_exit();
 
   if (surf_path)
     xbt_dynar_free(&surf_path);
@@ -370,6 +390,10 @@ void surf_exit(void)
   surf_parse_lex_destroy();
   surf_parse_free_callbacks();
   NOW = 0;                      /* Just in case the user plans to restart the simulation afterward */
+  // Exit the LIB host_lib
+  xbt_lib_free(&host_lib);
+  xbt_lib_free(&link_lib);
+  xbt_lib_free(&as_router_lib);
 }
 
 void surf_presolve(void)
@@ -381,7 +405,7 @@ void surf_presolve(void)
   surf_model_t model = NULL;
   unsigned int iter;
 
-  DEBUG0
+  XBT_DEBUG
       ("First Run! Let's \"purge\" events and put models in the right state");
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
     if (next_event_date > NOW)
@@ -414,37 +438,37 @@ double surf_solve(double max_date)
     min = max_date - NOW;
   }
 
-  DEBUG0("Looking for next action end");
+  XBT_DEBUG("Looking for next action end");
   xbt_dynar_foreach(model_list, iter, model) {
-    DEBUG1("Running for Resource [%s]", model->name);
+    XBT_DEBUG("Running for Resource [%s]", model->name);
     model_next_action_end = model->model_private->share_resources(NOW);
-    DEBUG2("Resource [%s] : next action end = %f",
+    XBT_DEBUG("Resource [%s] : next action end = %f",
            model->name, model_next_action_end);
     if (((min < 0.0) || (model_next_action_end < min))
         && (model_next_action_end >= 0.0))
       min = model_next_action_end;
   }
-  DEBUG1("Next action end : %f", min);
+  XBT_DEBUG("Next action end : %f", min);
 
-  DEBUG0("Looking for next event");
+  XBT_DEBUG("Looking for next event");
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
-    DEBUG1("Next TRACE event : %f", next_event_date);
+    XBT_DEBUG("Next TRACE event : %f", next_event_date);
     if ((min != -1.0) && (next_event_date > NOW + min))
       break;
-    DEBUG0("Updating models");
+    XBT_DEBUG("Updating models");
     while ((event =
             tmgr_history_get_next_event_leq(history, next_event_date,
                                             &value,
                                             (void **) &resource))) {
       if (resource->model->model_private->resource_used(resource)) {
         min = next_event_date - NOW;
-        DEBUG1
+        XBT_DEBUG
             ("This event will modify model state. Next event set to %f",
              min);
       }
       /* update state of model_obj according to new value. Does not touch lmm.
          It will be modified if needed when updating actions */
-      DEBUG2("Calling update_resource_state for resource %s with min %lf",
+      XBT_DEBUG("Calling update_resource_state for resource %s with min %lf",
              resource->model->name, min);
       resource->model->model_private->update_resource_state(resource,
                                                             event, value,
@@ -459,13 +483,17 @@ double surf_solve(double max_date)
   if (min < 0.0)
     return -1.0;
 
-  DEBUG1("Duration set to %f", min);
+  XBT_DEBUG("Duration set to %f", min);
 
   NOW = NOW + min;
 
   xbt_dynar_foreach(model_list, iter, model)
       model->model_private->update_actions_state(NOW, min);
 
+#ifdef HAVE_TRACING
+  TRACE_paje_dump_buffer (0);
+#endif
+
   return min;
 }