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 some internal C type aliases
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
3809ade
..
6722a2d
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-71,26
+71,8
@@
XBT_PUBLIC(double) surf_get_clock();
*/
XBT_PUBLIC_DATA(std::vector<sg_host_t>) host_that_restart;
*/
XBT_PUBLIC_DATA(std::vector<sg_host_t>) host_that_restart;
-namespace simgrid {
-namespace surf {
-
-extern XBT_PRIVATE simgrid::xbt::signal<void()> surfExitCallbacks;
-}
-}
-
int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
-/***********
- * Classes *
- ***********/
-
-enum heap_action_type{
- LATENCY = 100,
- MAX_DURATION,
- NORMAL,
- NOTSET
-};
-
/**********
* Action *
**********/
/**********
* Action *
**********/
@@
-129,6
+111,14
@@
public:
not_in_the_system /**< Not in the system anymore. Why did you ask ? */
};
not_in_the_system /**< Not in the system anymore. Why did you ask ? */
};
+ enum class SuspendStates {
+ not_suspended = 0, /**< Action currently not suspended **/
+ suspended,
+ sleeping
+ };
+
+ enum class Type { LATENCY = 100, MAX_DURATION, NORMAL, NOTSET };
+
/**
* @brief Action constructor
*
/**
* @brief Action constructor
*
@@
-136,7
+126,7
@@
public:
* @param cost The cost of the Action
* @param failed If the action is impossible (e.g.: execute something on a switched off host)
*/
* @param cost The cost of the Action
* @param failed If the action is impossible (e.g.: execute something on a switched off host)
*/
- Action(simgrid::surf::Model
*
model, double cost, bool failed);
+ Action(simgrid::surf::Model
*
model, double cost, bool failed);
/**
* @brief Action constructor
/**
* @brief Action constructor
@@
-146,7
+136,7
@@
public:
* @param failed If the action is impossible (e.g.: execute something on a switched off host)
* @param var The lmm variable associated to this Action if it is part of a LMM component
*/
* @param failed If the action is impossible (e.g.: execute something on a switched off host)
* @param var The lmm variable associated to this Action if it is part of a LMM component
*/
- Action(simgrid::surf::Model *
model, double cost, bool failed, lmm_variable_t
var);
+ Action(simgrid::surf::Model *
model, double cost, bool failed, kernel::lmm::Variable*
var);
/** @brief Destructor */
virtual ~Action();
/** @brief Destructor */
virtual ~Action();
@@
-239,8
+229,6
@@
public:
/** @brief Get the state set in which the action is */
ActionList* getStateSet() const { return stateSet_; };
/** @brief Get the state set in which the action is */
ActionList* getStateSet() const { return stateSet_; };
- s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr};
-
simgrid::surf::Model* getModel() const { return model_; }
protected:
simgrid::surf::Model* getModel() const { return model_; }
protected:
@@
-261,28
+249,28
@@
private:
void *data_ = nullptr; /**< for your convenience */
/* LMM */
void *data_ = nullptr; /**< for your convenience */
/* LMM */
- double lastUpdate_ = 0;
- double lastValue_ = 0;
-
lmm_variable_t variable_
= nullptr;
-
enum heap_action_type hat_ =
NOTSET;
+ double lastUpdate_
= 0;
+ double lastValue_
= 0;
+
kernel::lmm::Variable* variable_
= nullptr;
+
Action::Type hat_ = Action::Type::
NOTSET;
boost::optional<heap_type::handle_type> heapHandle_ = boost::none;
public:
virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; };
boost::optional<heap_type::handle_type> heapHandle_ = boost::none;
public:
virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; };
- void heapInsert(heap_type
& heap, double key, enum heap_action_t
ype hat);
+ void heapInsert(heap_type
& heap, double key, Action::T
ype hat);
void heapRemove(heap_type& heap);
void heapRemove(heap_type& heap);
- void heapUpdate(heap_type
& heap, double key, enum heap_action_t
ype hat);
+ void heapUpdate(heap_type
& heap, double key, Action::T
ype hat);
void clearHeapHandle() { heapHandle_ = boost::none; }
void clearHeapHandle() { heapHandle_ = boost::none; }
-
lmm_variable_t
getVariable() const { return variable_; }
- void setVariable(
lmm_variable_t
var) { variable_ = var; }
+
kernel::lmm::Variable*
getVariable() const { return variable_; }
+ void setVariable(
kernel::lmm::Variable *
var) { variable_ = var; }
double getLastUpdate() const { return lastUpdate_; }
void refreshLastUpdate() {lastUpdate_ = surf_get_clock();}
double getLastValue() const { return lastValue_; }
void setLastValue(double val) { lastValue_ = val; }
double getLastUpdate() const { return lastUpdate_; }
void refreshLastUpdate() {lastUpdate_ = surf_get_clock();}
double getLastValue() const { return lastValue_; }
void setLastValue(double val) { lastValue_ = val; }
-
enum heap_action_t
ype getHat() const { return hat_; }
+
Action::T
ype getHat() const { return hat_; }
bool is_linked() const { return action_lmm_hook.is_linked(); }
protected:
bool is_linked() const { return action_lmm_hook.is_linked(); }
protected:
-
int suspended_ = 0
;
+
Action::SuspendStates suspended_ = Action::SuspendStates::not_suspended
;
};
typedef Action::ActionList ActionList;
};
typedef Action::ActionList ActionList;
@@
-410,7
+398,7
@@
public:
* @param name The name of the Resource
* @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
*/
* @param name The name of the Resource
* @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
*/
- Resource(Model * model, const std::string& name,
lmm_constraint_t
constraint);
+ Resource(Model * model, const std::string& name,
kernel::lmm::Constraint*
constraint);
virtual ~Resource();
virtual ~Resource();
@@
-435,6
+423,9
@@
public:
/** @brief Check if the current Resource is used (if it currently serves an action) */
virtual bool isUsed()=0;
/** @brief Check if the current Resource is used (if it currently serves an action) */
virtual bool isUsed()=0;
+ /** @brief returns the current load (in flops per second, byte per second or similar) */
+ virtual double getLoad();
+
/** @brief Check if the current Resource is active */
virtual bool isOn() const;
/** @brief Check if the current Resource is shut down */
/** @brief Check if the current Resource is active */
virtual bool isOn() const;
/** @brief Check if the current Resource is shut down */
@@
-451,10
+442,10
@@
private:
public: /* LMM */
/** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */
public: /* LMM */
/** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */
-
lmm_constraint_t
constraint() const;
+
kernel::lmm::Constraint*
constraint() const;
protected:
protected:
- const
lmm_constraint_t
constraint_ = nullptr;
+ const
kernel::lmm::Constraint*
constraint_ = nullptr;
};
}
};
}