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
Merge branch 'wifi_rate_zero' into 'master'
[simgrid.git]
/
include
/
simgrid
/
simix.hpp
diff --git
a/include/simgrid/simix.hpp
b/include/simgrid/simix.hpp
index
1acd620
..
c990263
100644
(file)
--- a/
include/simgrid/simix.hpp
+++ b/
include/simgrid/simix.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
1
. The SimGrid Team.
+/* Copyright (c) 2007-202
2
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-7,6
+7,7
@@
#ifndef SIMGRID_SIMIX_HPP
#define SIMGRID_SIMIX_HPP
#ifndef SIMGRID_SIMIX_HPP
#define SIMGRID_SIMIX_HPP
+#include <simgrid/s4u/Actor.hpp>
#include <simgrid/simix.h>
#include <xbt/promise.hpp>
#include <xbt/signal.hpp>
#include <simgrid/simix.h>
#include <xbt/promise.hpp>
#include <xbt/signal.hpp>
@@
-46,7
+47,7
@@
template <class F> typename std::result_of_t<F()> simcall(F&& code, SimcallObser
{
// If we are in the maestro, we take the fast path and execute the
// code directly without simcall marshalling/unmarshalling/dispatch:
{
// If we are in the maestro, we take the fast path and execute the
// code directly without simcall marshalling/unmarshalling/dispatch:
- if (
SIMIX_
is_maestro())
+ if (
s4u::Actor::
is_maestro())
return std::forward<F>(code)();
// If we are in the application, pass the code to the maestro which
return std::forward<F>(code)();
// If we are in the application, pass the code to the maestro which
@@
-76,7
+77,7
@@
template <class F> typename std::result_of_t<F()> simcall(F&& code, SimcallObser
*/
template <class F> void simcall_blocking(F&& code, SimcallObserver* observer = nullptr)
{
*/
template <class F> void simcall_blocking(F&& code, SimcallObserver* observer = nullptr)
{
- xbt_assert(not
SIMIX_
is_maestro(), "Cannot execute blocking call in kernel mode");
+ xbt_assert(not
s4u::Actor::
is_maestro(), "Cannot execute blocking call in kernel mode");
// Pass the code to the maestro which executes it for us and reports the result. We use a std::future which
// conveniently handles the success/failure value for us.
// Pass the code to the maestro which executes it for us and reports the result. We use a std::future which
// conveniently handles the success/failure value for us.
@@
-93,16
+94,11
@@
auto simcall_blocking(F&& code, Observer* observer) -> decltype(observer->get_re
}
} // namespace actor
} // namespace kernel
}
} // namespace actor
} // namespace kernel
-} // namespace simgrid
-namespace simgrid {
+
namespace simix {
XBT_PUBLIC void unblock(smx_actor_t process);
namespace simix {
XBT_PUBLIC void unblock(smx_actor_t process);
-// In MC mode, the application sends these pointers to the MC
-xbt_dynar_t simix_global_get_actors_addr();
-xbt_dynar_t simix_global_get_dead_actors_addr();
-
} // namespace simix
} // namespace simgrid
} // namespace simix
} // namespace simgrid