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
Remove unused method.
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
2496a4b
..
14c92a0
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-10,6
+10,7
@@
#include "src/surf/surf_private.hpp"
#include "surf/surf.hpp"
#include "src/surf/surf_private.hpp"
#include "surf/surf.hpp"
+#include "xbt/heap.h"
#include "xbt/str.h"
#include <boost/intrusive/list.hpp>
#include "xbt/str.h"
#include <boost/intrusive/list.hpp>
@@
-248,7
+249,6
@@
public:
void setLastValue(double val) { lastValue_ = val; }
enum heap_action_type getHat() { return hat_; }
bool is_linked() {return action_lmm_hook.is_linked();}
void setLastValue(double val) { lastValue_ = val; }
enum heap_action_type getHat() { return hat_; }
bool is_linked() {return action_lmm_hook.is_linked();}
- int getIndexHeap() { return indexHeap_; }
protected:
int suspended_ = 0;
};
protected:
int suspended_ = 0;
};
@@
-301,6
+301,10
@@
public:
/** @brief Get Action heap */
xbt_heap_t getActionHeap() {return actionHeap_;}
/** @brief Get Action heap */
xbt_heap_t getActionHeap() {return actionHeap_;}
+ double actionHeapTopDate() const { return xbt_heap_maxkey(actionHeap_); }
+ Action* actionHeapPop() { return static_cast<Action*>(xbt_heap_pop(actionHeap_)); }
+ bool actionHeapIsEmpty() const { return xbt_heap_size(actionHeap_) == 0; }
+
/**
* @brief Share the resources between the actions
*
/**
* @brief Share the resources between the actions
*
@@
-332,7
+336,6
@@
protected:
ActionLmmListPtr modifiedSet_;
lmm_system_t maxminSystem_ = nullptr;
bool selectiveUpdate_;
ActionLmmListPtr modifiedSet_;
lmm_system_t maxminSystem_ = nullptr;
bool selectiveUpdate_;
- xbt_heap_t actionHeap_;
private:
e_UM_t updateMechanism_ = UM_UNDEFINED;
private:
e_UM_t updateMechanism_ = UM_UNDEFINED;
@@
-340,6
+343,7
@@
private:
ActionList* runningActionSet_; /**< Actions in state SURF_ACTION_RUNNING */
ActionList* failedActionSet_; /**< Actions in state SURF_ACTION_FAILED */
ActionList* doneActionSet_; /**< Actions in state SURF_ACTION_DONE */
ActionList* runningActionSet_; /**< Actions in state SURF_ACTION_RUNNING */
ActionList* failedActionSet_; /**< Actions in state SURF_ACTION_FAILED */
ActionList* doneActionSet_; /**< Actions in state SURF_ACTION_DONE */
+ xbt_heap_t actionHeap_;
};
}
};
}