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 the useless simgrid::surf::surfExitCallbacks callback
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
b69e677
..
fa9aaa2
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-337,7
+337,6
@@
void surf_exit()
delete model;
delete all_existing_models;
delete model;
delete all_existing_models;
- simgrid::surf::surfExitCallbacks();
if (future_evt_set) {
delete future_evt_set;
if (future_evt_set) {
delete future_evt_set;
@@
-413,7
+412,7
@@
double Model::nextOccuringEventLazy(double now)
continue;
/* bogus priority, skip it */
continue;
/* bogus priority, skip it */
- if (action->getPriority() <= 0 || action->getHat()
==
LATENCY)
+ if (action->getPriority() <= 0 || action->getHat()
== Action::Type::
LATENCY)
continue;
action->updateRemainingLazy(now);
continue;
action->updateRemainingLazy(now);
@@
-445,7
+444,7
@@
double Model::nextOccuringEventLazy(double now)
action->getMaxDuration());
if (min > -1) {
action->getMaxDuration());
if (min > -1) {
- action->heapUpdate(actionHeap_, min, max_dur_flag ?
MAX_DURATION :
NORMAL);
+ action->heapUpdate(actionHeap_, min, max_dur_flag ?
Action::Type::MAX_DURATION : Action::Type::
NORMAL);
XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now);
} else
DIE_IMPOSSIBLE;
XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now);
} else
DIE_IMPOSSIBLE;
@@
-755,7
+754,7
@@
bool Action::isSuspended()
* LATENCY = this is a heap entry to warn us when the latency is payed
* MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
*/
* LATENCY = this is a heap entry to warn us when the latency is payed
* MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
*/
-void Action::heapInsert(heap_type& heap, double key,
enum heap_action_t
ype hat)
+void Action::heapInsert(heap_type& heap, double key,
Action::T
ype hat)
{
hat_ = hat;
heapHandle_ = heap.emplace(std::make_pair(key, this));
{
hat_ = hat;
heapHandle_ = heap.emplace(std::make_pair(key, this));
@@
-763,14
+762,14
@@
void Action::heapInsert(heap_type& heap, double key, enum heap_action_type hat)
void Action::heapRemove(heap_type& heap)
{
void Action::heapRemove(heap_type& heap)
{
- hat_ = NOTSET;
+ hat_ =
Action::Type::
NOTSET;
if (heapHandle_) {
heap.erase(*heapHandle_);
clearHeapHandle();
}
}
if (heapHandle_) {
heap.erase(*heapHandle_);
clearHeapHandle();
}
}
-void Action::heapUpdate(heap_type& heap, double key,
enum heap_action_t
ype hat)
+void Action::heapUpdate(heap_type& heap, double key,
Action::T
ype hat)
{
hat_ = hat;
if (heapHandle_) {
{
hat_ = hat;
if (heapHandle_) {