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 assert on hot path.
[simgrid.git]
/
include
/
simgrid
/
simix.hpp
diff --git
a/include/simgrid/simix.hpp
b/include/simgrid/simix.hpp
index
172ebe9
..
ed5e128
100644
(file)
--- a/
include/simgrid/simix.hpp
+++ b/
include/simgrid/simix.hpp
@@
-63,7
+63,6
@@
typename std::result_of<F()>::type kernelImmediate(F&& code)
typedef typename std::result_of<F()>::type R;
simgrid::xbt::Result<R> result;
simcall_run_kernel([&]{
typedef typename std::result_of<F()>::type R;
simgrid::xbt::Result<R> result;
simcall_run_kernel([&]{
- xbt_assert(SIMIX_is_maestro(), "Not in maestro");
simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
});
return result.get();
simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
});
return result.get();
@@
-77,7
+76,7
@@
typedef std::function<void()> ActorCode;
// Create ActorCode based on argv:
typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
// Create ActorCode based on argv:
typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
-XBT_PUBLIC void register
F
unction(const char* name, ActorCodeFactory factory);
+XBT_PUBLIC void register
_f
unction(const char* name, ActorCodeFactory factory);
/** These functions will be called when we detect a deadlock: any remaining process is locked on an action
*
/** These functions will be called when we detect a deadlock: any remaining process is locked on an action
*