/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "src/instr/instr_private.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Actor.hpp>
+#include <simgrid/s4u/Comm.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Exec.hpp>
+#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/VirtualMachine.hpp>
+#include <xbt/graph.h>
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/kernel/routing/NetZoneImpl.hpp"
-#include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/Comm.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Exec.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/VirtualMachine.hpp"
-#include "src/surf/cpu_interface.hpp"
+#include "src/instr/instr_private.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_interface.hpp"
-#include "src/surf/xml/platf_private.hpp"
-#include "surf/surf.hpp"
-#include "xbt/graph.h"
#include <fstream>
s4u::Host::on_speed_change.connect([](s4u::Host const& host) {
Container::by_name(host.get_name())
->get_variable("speed")
- ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
+ ->set_event(simgrid_get_clock(), host.get_core_count() * host.get_available_speed());
});
s4u::Link::on_creation.connect(on_link_creation);
s4u::Link::on_bandwidth_change.connect([](s4u::Link const& link) {
Container::by_name(link.get_name())
->get_variable("bandwidth")
- ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
+ ->set_event(simgrid_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
});
s4u::NetZone::on_seal.connect([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); });
kernel::routing::NetPoint::on_creation.connect([](kernel::routing::NetPoint const& netpoint) {
s4u::Exec::on_completion.connect([](s4u::Exec const&) {
Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event();
});
- s4u::Comm::on_start.connect([](s4u::Comm const&, bool is_sender) {
- Container::by_name(instr_pid(*s4u::Actor::self()))
- ->get_state("ACTOR_STATE")
- ->push_event(is_sender ? "send" : "receive");
+ s4u::Comm::on_send.connect([](s4u::Comm const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("send");
+ });
+ s4u::Comm::on_recv.connect([](s4u::Comm const&) {
+ Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("receive");
});
s4u::Comm::on_completion.connect([](s4u::Comm const&) {
Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event();