A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill popping_{enum,generated}
[simgrid.git]
/
src
/
plugins
/
host_dvfs.cpp
diff --git
a/src/plugins/host_dvfs.cpp
b/src/plugins/host_dvfs.cpp
index c51a26d08007182ca3896f6f44fe2c04b8f41ede..db1af095e7cdf670f2cb53005c6afc6076f1fdf1 100644
(file)
--- a/
src/plugins/host_dvfs.cpp
+++ b/
src/plugins/host_dvfs.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-202
2
. 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. */
/* 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. */
@@
-13,7
+13,7
@@
#include "src/internal_config.h" // HAVE_SMPI
#include "src/kernel/activity/CommImpl.hpp"
#include "src/internal_config.h" // HAVE_SMPI
#include "src/kernel/activity/CommImpl.hpp"
-#include "src/
surf/network_interface
.hpp"
+#include "src/
kernel/resource/StandardLinkImpl
.hpp"
#if HAVE_SMPI
#include "src/smpi/include/smpi_request.hpp"
#include "src/smpi/plugins/ampi/ampi.hpp"
#if HAVE_SMPI
#include "src/smpi/include/smpi_request.hpp"
#include "src/smpi/plugins/ampi/ampi.hpp"
@@
-63,7
+63,7
@@
static simgrid::config::Flag<int>
*/
*/
-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 {
namespace simgrid {
namespace plugin {
@@
-295,15
+295,18
@@
public:
task_id = 0;
}
});
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();
});
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()
// 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,
}
});
// FIXME I think that this fires at the same time for all hosts, so when the src sends something,
@@
-441,5
+444,5
@@
void sg_host_dvfs_plugin_init()
sg_host_load_plugin_init();
sg_host_load_plugin_init();
- simgrid::s4u::Host::on_creation
.connect
(&on_host_added);
+ simgrid::s4u::Host::on_creation
_cb
(&on_host_added);
}
}