move resource_used to the private part

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 8d6ce0c..27dfe04 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -118,11 +118,13 @@ xbt_heap_float_t surf_solve(void)
       min = resource_next_action_end;
   }
 
       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))) {
   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.
        min = next_event_date-NOW;
       }
       /* update state of resource_obj according to new value. Does not touch lmm.


@@ -132,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);
   }
   xbt_dynar_foreach (resource_list,i,resource) {
     resource->common_private->update_actions_state(NOW, min);
   }