-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2019. 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/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "src/surf/trace_mgr.hpp"
+#include "src/kernel/resource/profile/trace_mgr.hpp"
#include <list>
* @brief Create a Cpu
*
* @param host The host that will have this CPU
- * @param speedPerPstate Processor speed (in Flops) of each pstate. This ignores any potential external load coming from a trace.
+ * @param speed_per_pstate Processor speed (in Flops) of each pstate.
+ * This ignores any potential external load coming from a trace.
* @param core The number of core of this Cpu
*/
virtual Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) = 0;
Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, std::vector<double> * speedPerPstate,
int core);
+ Cpu(const Cpu&) = delete;
+ Cpu& operator=(const Cpu&) = delete;
~Cpu();
/**
* @brief Execute some quantity of computation on more than one core
*
* @param size The value of the processing amount (in flop) needed to process
- * @param requestedCores The desired amount of cores. Must be >= 1
+ * @param requested_cores The desired amount of cores. Must be >= 1
* @return The CpuAction corresponding to the processing
*/
virtual simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) = 0;
/*< @brief Setup the trace file with availability events (peak speed changes due to external load).
* Trace must contain relative values (ratio between 0 and 1)
*/
- virtual void set_speed_trace(tmgr_trace_t trace);
+ virtual void set_speed_profile(kernel::profile::Profile* profile);
protected:
Metric speed_ = {1.0, 0, nullptr};
class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action {
public:
/** @brief Signal emitted when the action state changes (ready/running/done, etc)
- * Signature: `void(CpuAction *action)`
+ * Signature: `void(CpuAction *action, simgrid::kernel::resource::Action::State previous)`
*/
- static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> on_state_change;
+ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::kernel::resource::Action::State)> on_state_change;
/** @brief Signal emitted when the action share changes (amount of flops it gets)
* Signature: `void(CpuAction *action)`
*/
- static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> onShareChange;
+ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> on_share_change;
CpuAction(simgrid::kernel::resource::Model * model, double cost, bool failed) : Action(model, cost, failed) {}
CpuAction(simgrid::kernel::resource::Model * model, double cost, bool failed, kernel::lmm::Variable* var)