snake_case s4u::Link

[simgrid.git] / src / instr / instr_platform.cpp

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index 0ac5fd9..5911db5 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -199,10 +199,10 @@ static void instr_link_on_creation(simgrid::s4u::Link& link)
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
     simgrid::instr::VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", "");
     bandwidth->set_calling_container(container);
-    bandwidth->set_event(0, link.bandwidth());
+    bandwidth->set_event(0, link.get_bandwidth());
     simgrid::instr::VariableType* latency = container->type_->by_name_or_create("latency", "");
     latency->set_calling_container(container);
-    latency->set_event(0, link.latency());
+    latency->set_event(0, link.get_latency());
   }
   if (TRACE_uncategorized()) {
     container->type_->by_name_or_create("bandwidth_used", "0.5 0.5 0.5");
@@ -232,11 +232,11 @@ static void instr_host_on_creation(simgrid::s4u::Host& host)
   }
 }
 
-static void instr_host_on_speed_change(simgrid::s4u::Host* host)
+static void instr_host_on_speed_change(simgrid::s4u::Host& host)
 {
-  simgrid::instr::Container::by_name(host->get_cname())
+  simgrid::instr::Container::by_name(host.get_cname())
       ->get_variable("power")
-      ->set_event(surf_get_clock(), host->getCoreCount() * host->get_available_speed());
+      ->set_event(surf_get_clock(), host.getCoreCount() * host.get_available_speed());
 }
 
 static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action,
@@ -264,7 +264,7 @@ static void instr_link_on_bandwidth_change(simgrid::s4u::Link& link)
 {
   simgrid::instr::Container::by_name(link.get_cname())
       ->get_variable("bandwidth")
-      ->set_event(surf_get_clock(), sg_bandwidth_factor * link.bandwidth());
+      ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
 }
 
 static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
@@ -382,8 +382,8 @@ void instr_define_callbacks()
   // properly
   if (TRACE_needs_platform()) {
     simgrid::s4u::on_platform_created.connect(instr_on_platform_created);
-    simgrid::s4u::Host::onCreation.connect(instr_host_on_creation);
-    simgrid::s4u::Host::onSpeedChange.connect(instr_host_on_speed_change);
+    simgrid::s4u::Host::on_creation.connect(instr_host_on_creation);
+    simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change);
     simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
     simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
   }
@@ -403,12 +403,12 @@ void instr_define_callbacks()
   }
 
   if (TRACE_vm_is_enabled()) {
-    simgrid::s4u::Host::onCreation.connect(instr_vm_on_creation);
+    simgrid::s4u::Host::on_creation.connect(instr_vm_on_creation);
     simgrid::s4u::VirtualMachine::on_start.connect(instr_vm_on_start);
     simgrid::s4u::VirtualMachine::on_started.connect(instr_vm_on_started);
     simgrid::s4u::VirtualMachine::on_suspend.connect(instr_vm_on_suspend);
     simgrid::s4u::VirtualMachine::on_resume.connect(instr_vm_on_resume);
-    simgrid::s4u::Host::onDestruction.connect(instr_vm_on_destruction);
+    simgrid::s4u::Host::on_destruction.connect(instr_vm_on_destruction);
   }
 }
 /*