Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
move resource_used to the private part
[simgrid.git] / src / surf / surf.c
index 5be1d87..27dfe04 100644 (file)
@@ -59,6 +59,28 @@ void surf_init(void)
   if(!maxmin_system) maxmin_system = lmm_system_new();
 }
 
+void surf_finalize(void)
+{ 
+  int i;
+  surf_resource_t resource = NULL;
+
+  xbt_dynar_foreach (resource_list,i,resource) {
+    resource->common_private->finalize();
+  }
+
+  if(maxmin_system) {
+    lmm_system_free(maxmin_system);
+    maxmin_system = NULL;
+  }
+  if(history) {
+    tmgr_history_free(history);
+    history = NULL;
+  }
+  if(resource_list) xbt_dynar_free(&resource_list);
+
+  tmgr_finalize();
+}
+
 xbt_heap_float_t surf_solve(void)
 {
   static int first_run = 1;
@@ -92,15 +114,17 @@ xbt_heap_float_t surf_solve(void)
 
   xbt_dynar_foreach (resource_list,i,resource) {
     resource_next_action_end = resource->common_private->share_resources(NOW);
-    if((min<0) || (resource_next_action_end<min)) 
+    if(((min<0.0) || (resource_next_action_end<min)) && (resource_next_action_end>=0.0))
       min = resource_next_action_end;
   }
 
+  if(min<0.0) return 0.0;
+
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
     if(next_event_date > NOW+min) break;
     while ((event=tmgr_history_get_next_event_leq(history, next_event_date,
                                                  &value, (void **) &resource_obj))) {
-      if(resource_obj->resource->common_public->resource_used(resource_obj)) {
+      if(resource_obj->resource->common_private->resource_used(resource_obj)) {
        min = next_event_date-NOW;
       }
       /* update state of resource_obj according to new value. Does not touch lmm.
@@ -110,6 +134,7 @@ xbt_heap_float_t surf_solve(void)
     }
   }
 
+
   xbt_dynar_foreach (resource_list,i,resource) {
     resource->common_private->update_actions_state(NOW, min);
   }