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
code simplification
[simgrid.git]
/
src
/
kernel
/
activity
/
ExecImpl.cpp
diff --git
a/src/kernel/activity/ExecImpl.cpp
b/src/kernel/activity/ExecImpl.cpp
index
aee76bc
..
fb8d2ba
100644
(file)
--- a/
src/kernel/activity/ExecImpl.cpp
+++ b/
src/kernel/activity/ExecImpl.cpp
@@
-6,7
+6,7
@@
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
-#include "src/simix/smx_host_private.h"
+#include "src/simix/smx_host_private.h
pp
"
#include "src/surf/surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
#include "src/surf/surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
@@
-43,10
+43,7
@@
void simgrid::kernel::activity::ExecImpl::resume()
double simgrid::kernel::activity::ExecImpl::remains()
{
double simgrid::kernel::activity::ExecImpl::remains()
{
- if (state == SIMIX_RUNNING)
- return surf_exec->getRemains();
-
- return 0;
+ return surf_exec->getRemains();
}
void simgrid::kernel::activity::ExecImpl::post()
}
void simgrid::kernel::activity::ExecImpl::post()