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
regenerate the simcall code -- sorry for the noisy commit
[simgrid.git]
/
src
/
simix
/
smx_private.h
diff --git
a/src/simix/smx_private.h
b/src/simix/smx_private.h
index
f600d35
..
85d9107
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-6,8
+6,9
@@
#ifndef SIMIX_PRIVATE_H
#define SIMIX_PRIVATE_H
#ifndef SIMIX_PRIVATE_H
#define SIMIX_PRIVATE_H
-#include
<signal.h>
+#include
"simgrid/s4u/Actor.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/kernel/context/Context.hpp"
+#include <signal.h>
#include <map>
#include <map>
@@
-17,6
+18,8
@@
namespace simgrid {
namespace simix {
class Global {
namespace simix {
class Global {
+ friend bool simgrid::s4u::this_actor::isMaestro();
+
public:
smx_context_factory_t context_factory = nullptr;
xbt_dynar_t process_to_run = nullptr;
public:
smx_context_factory_t context_factory = nullptr;
xbt_dynar_t process_to_run = nullptr;
@@
-73,10
+76,8
@@
XBT_PUBLIC(void) SIMIX_clean();
_smx_throw_issuer->exception = std::make_exception_ptr(e); \
} else ((void)0)
_smx_throw_issuer->exception = std::make_exception_ptr(e); \
} else ((void)0)
-/* ******************************** File ************************************ */
typedef struct s_smx_file {
surf_file_t surf_file;
typedef struct s_smx_file {
surf_file_t surf_file;
- void* data; /**< @brief user data */
} s_smx_file_t;
} s_smx_file_t;