save final incorrect changes

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 8386f55..0b46803 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -120,8 +120,8 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
   snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
   counter++;
 
   snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
   counter++;
 

-  new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "topology", key);
-  new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "topology", key);
+  StartLinkEvent(SIMIX_get_clock(), father, link_type, src, "topology", key);
+  EndLinkEvent(SIMIX_get_clock(), father, link_type, dst, "topology", key);

 
   XBT_DEBUG ("  linkContainers %s <-> %s", src->name, dst->name);
 }
 
   XBT_DEBUG ("  linkContainers %s <-> %s", src->name, dst->name);
 }


@@ -223,8 +223,8 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link)
     if (latency == nullptr) {
       latency = PJ_type_variable_new("latency", nullptr, container->type);
     }
     if (latency == nullptr) {
       latency = PJ_type_variable_new("latency", nullptr, container->type);
     }

-    new_pajeSetVariable(0, container, bandwidth, bandwidth_value);
-    new_pajeSetVariable(0, container, latency, latency_value);
+    SetVariableEvent(0, container, bandwidth, bandwidth_value);
+    SetVariableEvent(0, container, latency, latency_value);

   }
   if (TRACE_uncategorized()) {
     type_t bandwidth_used = PJ_type_get_or_null("bandwidth_used", container->type);
   }
   if (TRACE_uncategorized()) {
     type_t bandwidth_used = PJ_type_get_or_null("bandwidth_used", container->type);


@@ -246,7 +246,7 @@ void sg_instr_new_host(simgrid::s4u::Host& host)
     }
 
     double current_speed_state = host.speed();
     }
 
     double current_speed_state = host.speed();

-    new_pajeSetVariable (0, container, speed, current_speed_state);
+    SetVariableEvent (0, container, speed, current_speed_state);

   }
   if (TRACE_uncategorized()){
     type_t speed_used = PJ_type_get_or_null ("power_used", container->type);
   }
   if (TRACE_uncategorized()){
     type_t speed_used = PJ_type_get_or_null ("power_used", container->type);

diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp
index a21da8a..d1e986c 100644 (file)
--- a/src/surf/instr_surf.cpp
+++ b/src/surf/instr_surf.cpp
@@ -24,7 +24,7 @@ void TRACE_surf_host_set_speed(double date, const char *resource, double speed)
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
     container_t container = PJ_container_get(resource);
     type_t type = PJ_type_get ("power", container->type);
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
     container_t container = PJ_container_get(resource);
     type_t type = PJ_type_get ("power", container->type);

-    new_pajeSetVariable(date, container, type, speed);
+    SetVariableEvent(date, container, type, speed);

   }
 }
 
   }
 }
 


@@ -33,7 +33,7 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
     container_t container = PJ_container_get(resource);
     type_t type = PJ_type_get ("bandwidth", container->type);
   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
     container_t container = PJ_container_get(resource);
     type_t type = PJ_type_get ("bandwidth", container->type);

-    new_pajeSetVariable(date, container, type, bandwidth);
+    SetVariableEvent(date, container, type, bandwidth);

   }
 }
 
   }
 }