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
move some content to the SynchroRaw dtor
[simgrid.git]
/
src
/
surf
/
cpu_interface.hpp
diff --git
a/src/surf/cpu_interface.hpp
b/src/surf/cpu_interface.hpp
index
bb4ceec
..
bd42a47
100644
(file)
--- a/
src/surf/cpu_interface.hpp
+++ b/
src/surf/cpu_interface.hpp
@@
-4,8
+4,19
@@
/* 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. */
+#include <list>
+
+#include <xbt/base.h>
+#include <xbt/dynar.h>
+#include <xbt/signal.hpp>
+
+#include <simgrid/forward.h>
+#include <simgrid/s4u/host.hpp>
+
+#include "surf/datatypes.h"
#include "surf_interface.hpp"
#include "maxmin_private.hpp"
#include "surf_interface.hpp"
#include "maxmin_private.hpp"
+#include "trace_mgr.hpp"
#ifndef SURF_CPU_INTERFACE_HPP_
#define SURF_CPU_INTERFACE_HPP_
#ifndef SURF_CPU_INTERFACE_HPP_
#define SURF_CPU_INTERFACE_HPP_
@@
-20,16
+31,7
@@
namespace surf {
class CpuModel;
class Cpu;
class CpuAction;
class CpuModel;
class Cpu;
class CpuAction;
-class CpuPlugin;
-
-/*************
- * Callbacks *
- *************/
-XBT_PUBLIC(std::list<Cpu*>) getActionCpus(CpuAction *action);
-
-/*********
- * Model *
- *********/
+class CpuPlugin;// FIXME:DEADCODE
/** @ingroup SURF_cpu_interface
* @brief SURF cpu model interface class
/** @ingroup SURF_cpu_interface
* @brief SURF cpu model interface class
@@
-43,14
+45,10
@@
public:
* @brief Create a Cpu
*
* @param host The host that will have this CPU
* @brief Create a Cpu
*
* @param host The host that will have this CPU
- * @param speedPeak The peak spead (max speed in Flops when no external load comes from a trace)
- * @param speedTrace Trace variations
+ * @param speedPerPstate 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
* @param core The number of core of this Cpu
- * @param state_trace [TODO]
*/
*/
- virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core,
- tmgr_trace_t state_trace)=0;
+ virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)=0;
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
@@
-73,24
+71,20
@@
public:
* @param model The CpuModel associated to this Cpu
* @param host The host in which this Cpu should be plugged
* @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
* @param model The CpuModel associated to this Cpu
* @param host The host in which this Cpu should be plugged
* @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
- * @param speedPe
akList [TODO]
+ * @param speedPe
rPstate Processor speed (in flop per second) for each pstate
* @param core The number of core of this Cpu
* @param core The number of core of this Cpu
- * @param speedPeak The speed peak of this Cpu in flops (max speed)
*/
*/
- Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
- lmm_constraint_t constraint, xbt_dynar_t speedPeakList, int core, double speedPeak);
+ Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, xbt_dynar_t speedPerPstate, int core);
/**
* @brief Cpu constructor
*
* @param model The CpuModel associated to this Cpu
* @param host The host in which this Cpu should be plugged
/**
* @brief Cpu constructor
*
* @param model The CpuModel associated to this Cpu
* @param host The host in which this Cpu should be plugged
- * @param speedPe
akList [TODO]
+ * @param speedPe
rPstate Processor speed (in flop per second) for each pstate
* @param core The number of core of this Cpu
* @param core The number of core of this Cpu
- * @param speedPeak The speed peak of this Cpu in flops (max speed)
*/
*/
- Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
- xbt_dynar_t speedPeakList, int core, double speedPeak);
+ Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
~Cpu();
~Cpu();
@@
-139,7
+133,7
@@
public:
int coresAmount_ = 1;
simgrid::s4u::Host* host_;
int coresAmount_ = 1;
simgrid::s4u::Host* host_;
- xbt_dynar_t speedPe
akList
_ = NULL; /*< List of supported CPU capacities (pstate related) */
+ xbt_dynar_t speedPe
rPstate
_ = NULL; /*< List of supported CPU capacities (pstate related) */
int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/
/* Note (hypervisor): */
int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/
/* Note (hypervisor): */
@@
-159,35
+153,28
@@
public:
**********/
/** @ingroup SURF_cpu_interface
**********/
/** @ingroup SURF_cpu_interface
- * @brief SURF Cpu action interface class
- * @details A CpuAction represent the execution of code on a Cpu
+ * @brief A CpuAction represents the execution of code on one or several Cpus
*/
XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
public:
*/
XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
public:
-/** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
-
* @details Callback functions have the following signature: `void(CpuAction *action, e_surf_action_state_t
previous)`
- */
- static simgrid::xbt::signal<void(simgrid::surf::CpuAction*,
e_surf_action_state_t
)> onStateChange;
+
/** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
+
* @details Callback functions have the following signature: `void(CpuAction *action, simgrid::surf::Action::State
previous)`
+
*/
+ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*,
simgrid::surf::Action::State
)> onStateChange;
- /** @brief CpuAction constructor */
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
- : Action(model, cost, failed) {} //FIXME:DEADCODE?
-
- /** @brief CpuAction constructor */
+ : Action(model, cost, failed) {} //FIXME:DEADCODE?
CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
-
: Action(model, cost, failed, var) {}
+ : Action(model, cost, failed, var) {}
- /**
- * @brief Set the affinity of the current CpuAction
- * @details [TODO]
- */
+ /** @brief Set the affinity of the current CpuAction */
virtual void setAffinity(Cpu *cpu, unsigned long mask);
virtual void setAffinity(Cpu *cpu, unsigned long mask);
- void setState(e_surf_action_state_t state);
-
- void updateRemainingLazy(double now);
+ void setState(simgrid::surf::Action::State state) override;
+ void updateRemainingLazy(double now) override;
+ std::list<Cpu*> cpus();
};
}
};
}