-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2018. 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/load.h"
-#include "simgrid/simix.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-
-#include "simgrid/s4u/Engine.hpp"
-
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <string>
-#include <utility>
-#include <vector>
/** @addtogroup plugin_load
, last_updated(surf_get_clock())
, last_reset(surf_get_clock())
, current_speed(host->getSpeed())
- , current_flops(host->pimpl_cpu->constraint()->get_usage())
+ , current_flops(host->pimpl_cpu->get_constraint()->get_usage())
, theor_max_flops(0)
, was_prev_idle(current_flops == 0)
{
/* Current flop per second computed by the cpu; current_flops = k * pstate_speed_in_flops, k \in {0, 1, ..., cores}
* number of active cores */
- current_flops = host->pimpl_cpu->constraint()->get_usage();
+ current_flops = host->pimpl_cpu->get_constraint()->get_usage();
/* flops == pstate_speed * cores_being_currently_used */
computed_flops += (now - last_updated) * current_flops;
}
/**
- * WARNING: This function does not guarantee that you have the real load at any time;
+ * WARNING: This function does not guarantee that you have the real load at any time
* imagine all actions on your CPU terminate at time t. Your load is then 0. Then
* you query the load (still 0) and then another action starts (still at time t!).
* This means that the load was never really 0 (because the time didn't advance) but
idle_time = 0;
computed_flops = 0;
theor_max_flops = 0;
- current_flops = host->pimpl_cpu->constraint()->get_usage();
+ current_flops = host->pimpl_cpu->get_constraint()->get_usage();
current_speed = host->getSpeed();
was_prev_idle = (current_flops == 0);
}
}
/* This callback is called when an action (computation, idle, ...) terminates */
-static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::surf::Action::State /*previous*/)
+static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::kernel::resource::Action::State /*previous*/)
{
for (simgrid::surf::Cpu* const& cpu : action->cpus()) {
simgrid::s4u::Host* host = cpu->getHost();
}
/* **************************** Public interface *************************** */
-extern "C" {
/** \ingroup plugin_load
* \brief Initializes the HostLoad plugin
host->extension<HostLoad>()->reset();
}
-}