-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved. */
/* 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 <simgrid/plugins/dvfs.h>
#include <simgrid/plugins/load.h>
+#include <simgrid/s4u/Actor.hpp>
+#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/VirtualMachine.hpp>
+#include <xbt/asserts.h>
#include <xbt/config.hpp>
#include "src/internal_config.h" // HAVE_SMPI
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
#if HAVE_SMPI
#include "src/smpi/include/smpi_request.hpp"
#include "src/smpi/plugins/ampi/ampi.hpp"
*/
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_plugin_dvfs, surf, "Logging specific to the SURF HostDvfs plugin");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host_dvfs, kernel, "Logging specific to the HostDvfs plugin");
namespace simgrid {
namespace plugin {
task_id = 0;
}
});
- simgrid::s4u::Exec::on_start.connect([this](simgrid::s4u::Exec const& activity) {
+ simgrid::s4u::Exec::on_start_cb([this](simgrid::s4u::Exec const& activity) {
if (activity.get_host() == get_host())
pre_task();
});
- simgrid::s4u::Exec::on_completion.connect([this](simgrid::s4u::Exec const& activity) {
+ simgrid::s4u::Activity::on_completion_cb([this](simgrid::s4u::Activity const& activity) {
+ const auto* exec = dynamic_cast<simgrid::s4u::Exec const*>(&activity);
+ if (exec == nullptr) // Only Execs are concerned here
+ return;
// For more than one host (not yet supported), we can access the host via
// simcalls_.front()->issuer->get_iface()->get_host()
- if (activity.get_host() == get_host() && iteration_running) {
- comp_timer += activity.get_finish_time() - activity.get_start_time();
+ if (exec->get_host() == get_host() && iteration_running) {
+ comp_timer += exec->get_finish_time() - exec->get_start_time();
}
});
// FIXME I think that this fires at the same time for all hosts, so when the src sends something,
// the dst will be notified even though it didn't even arrive at the recv yet
- simgrid::s4u::Link::on_communicate.connect([this](const kernel::resource::NetworkAction& act) {
- if ((get_host() == &act.get_src() || get_host() == &act.get_dst()) && iteration_running) {
+ kernel::activity::CommImpl::on_start.connect([this](const kernel::activity::CommImpl& comm) {
+ const auto* act = static_cast<kernel::resource::NetworkAction*>(comm.surf_action_);
+ if ((get_host() == &act->get_src() || get_host() == &act->get_dst()) && iteration_running) {
post_task();
}
});
sg_host_load_plugin_init();
- simgrid::s4u::Host::on_creation.connect(&on_host_added);
+ simgrid::s4u::Host::on_creation_cb(&on_host_added);
}