objectifies the Future Event Set of trace events

[simgrid.git] / src / surf / surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 8b71301..ea95db4 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -31,18 +31,17 @@ extern double NOW;
 void surf_presolve(void)
 {
   double next_event_date = -1.0;
-  tmgr_trace_event_t event = NULL;
+  tmgr_trace_iterator_t event = NULL;
   double value = -1.0;
   simgrid::surf::Resource *resource = NULL;
   simgrid::surf::Model *model = NULL;
   unsigned int iter;
 
   XBT_DEBUG ("Consume all trace events occurring before the starting time.");
-  while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+  while ((next_event_date = future_evt_set->next_date()) != -1.0) {
     if (next_event_date > NOW)
       break;
-    while ((event =
-            tmgr_history_get_next_event_leq(history, next_event_date,
+    while ((event = future_evt_set->pop_leq(next_event_date,
                                             &value,
                                             (void **) &resource))) {
       if (value >= 0){
@@ -64,7 +63,7 @@ double surf_solve(double max_date)
   double value = -1.0;
   simgrid::surf::Resource *resource = NULL;
   simgrid::surf::Model *model = NULL;
-  tmgr_trace_event_t event = NULL;
+  tmgr_trace_iterator_t event = NULL;
   unsigned int iter;
 
   if(!host_that_restart)
@@ -94,7 +93,7 @@ double surf_solve(double max_date)
   do {
     XBT_DEBUG("Next TRACE event : %f", next_event_date);
 
-    next_event_date = tmgr_history_next_date(history);
+    next_event_date = future_evt_set->next_date();
 
     if(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you
       if(next_event_date!=-1.0 && surf_min!=-1.0) {
@@ -120,8 +119,7 @@ double surf_solve(double max_date)
     if ((surf_min == -1.0) || (next_event_date > NOW + surf_min)) break;
 
     XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", surf_min, NOW, next_event_date);
-    while ((event =
-            tmgr_history_get_next_event_leq(history, next_event_date,
+    while ((event = future_evt_set->pop_leq(next_event_date,
                                             &value,
                                             (void **) &resource))) {
       if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->getName())) {
@@ -185,22 +183,6 @@ surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
   return res;
 }
 
-surf_action_t surf_model_extract_ready_action_set(surf_model_t model){
-  if (model->getReadyActionSet()->empty())
-       return NULL;
-  surf_action_t res = &model->getReadyActionSet()->front();
-  model->getReadyActionSet()->pop_front();
-  return res;
-}
-
-surf_action_t surf_model_extract_running_action_set(surf_model_t model){
-  if (model->getRunningActionSet()->empty())
-       return NULL;
-  surf_action_t res = &model->getRunningActionSet()->front();
-  model->getRunningActionSet()->pop_front();
-  return res;
-}
-
 int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
@@ -373,22 +355,6 @@ double surf_action_get_remains(surf_action_t action){
   return action->getRemains();
 }
 
-void surf_action_suspend(surf_action_t action){
-  action->suspend();
-}
-
-void surf_action_resume(surf_action_t action){
-  action->resume();
-}
-
-void surf_action_cancel(surf_action_t action){
-  action->cancel();
-}
-
-void surf_action_set_priority(surf_action_t action, double priority){
-  action->setPriority(priority);
-}
-
 void surf_action_set_category(surf_action_t action, const char *category){
   action->setCategory(category);
 }
@@ -419,7 +385,7 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) {
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 double surf_network_action_get_latency_limited(surf_action_t action) {
-  return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
+  return static_cast<simgrid::surf::NetworkAction*>(action)->getLatencyLimited();
 }
 #endif