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
Comply with clang-format rules
[simgrid.git]
/
src
/
kernel
/
resource
/
Action.cpp
diff --git
a/src/kernel/resource/Action.cpp
b/src/kernel/resource/Action.cpp
index
7f6fa06
..
cf86b5c
100644
(file)
--- a/
src/kernel/resource/Action.cpp
+++ b/
src/kernel/resource/Action.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
9
. The SimGrid Team. All rights reserved. */
/* 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. */
@@
-47,8
+47,8
@@
Action::~Action()
void Action::finish(Action::State state)
{
finish_time_ = surf_get_clock();
void Action::finish(Action::State state)
{
finish_time_ = surf_get_clock();
- set_state(state);
set_remains(0);
set_remains(0);
+ set_state(state);
}
Action::State Action::get_state() const
}
Action::State Action::get_state() const
@@
-198,7
+198,8
@@
double Action::get_remains()
void Action::update_max_duration(double delta)
{
void Action::update_max_duration(double delta)
{
- double_update(&max_duration_, delta, sg_surf_precision);
+ if (max_duration_ != NO_MAX_DURATION)
+ double_update(&max_duration_, delta, sg_surf_precision);
}
void Action::update_remains(double delta)
{
}
void Action::update_remains(double delta)
{
@@
-245,5
+246,5
@@
Action* ActionHeap::pop()
}
} // namespace surf
}
} // namespace surf
-} // namespace
simgrid
+} // namespace
kernel
} // namespace simgrid
} // namespace simgrid