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
plug a memleak in VM
[simgrid.git]
/
src
/
surf
/
cpu_interface.hpp
diff --git
a/src/surf/cpu_interface.hpp
b/src/surf/cpu_interface.hpp
index
380e6b7
..
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_
@@
-148,9
+159,9
@@
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 *
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)`
+ * @details Callback functions have the following signature: `void(CpuAction *action,
simgrid::surf::Action::State
previous)`
*/
*/
- static simgrid::xbt::signal<void(simgrid::surf::CpuAction*,
e_surf_action_state_t
)> onStateChange;
+ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*,
simgrid::surf::Action::State
)> onStateChange;
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
: Action(model, cost, failed) {} //FIXME:DEADCODE?
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
: Action(model, cost, failed) {} //FIXME:DEADCODE?
@@
-160,11
+171,10
@@
public:
/** @brief Set the affinity of the current CpuAction */
virtual void setAffinity(Cpu *cpu, unsigned long mask);
/** @brief Set the affinity of the current CpuAction */
virtual void setAffinity(Cpu *cpu, unsigned long mask);
- void setState(
e_surf_action_state_t state)
;
+ void setState(
simgrid::surf::Action::State state) override
;
- void updateRemainingLazy(double now);
+ void updateRemainingLazy(double now)
override
;
std::list<Cpu*> cpus();
std::list<Cpu*> cpus();
-
};
}
};
}