First step to take care of constraint into storage model

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index a4ef05a..5618234 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -305,6 +305,13 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_route);
 XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
 #endif
 
+static XBT_INLINE void routing_asr_host_free(void *p)
+{
+  network_element_t elm = (network_element_t)p;
+  free(elm->name);
+  xbt_free(elm);
+}
+
 void surf_init(int *argc, char **argv)
 {
   XBT_DEBUG("Create all Libs");
@@ -315,8 +322,8 @@ void surf_init(int *argc, char **argv)
   storage_type_lib = xbt_lib_new();
 
   XBT_DEBUG("ADD ROUTING LEVEL");
-  ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
-  ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_free);
+  ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
+  ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,routing_asr_host_free);
   ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
   ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
   ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free);
@@ -593,14 +600,15 @@ XBT_INLINE double surf_get_clock(void)
 
 static void surf_share_resources(surf_model_t model)
 {
+  double next_action_end = -1.0;
+  int i = __sync_fetch_and_add(&surf_min_index, 1);
   if (strcmp(model->name,"network NS3")) {
     XBT_DEBUG("Running for Resource [%s]", model->name);
-    double next_action_end = model->model_private->share_resources(NOW);
+    next_action_end = model->model_private->share_resources(NOW);
     XBT_DEBUG("Resource [%s] : next action end = %f",
         model->name, next_action_end);
-    int i = __sync_fetch_and_add(&surf_min_index, 1);
-    surf_mins[i] = next_action_end;
   }
+  surf_mins[i] = next_action_end;
 }
 
 static void surf_update_actions_state(surf_model_t model)