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
don't eat the errno of when dlopen fails (but still remove the copied binary)
[simgrid.git]
/
src
/
simix
/
smx_private.h
diff --git
a/src/simix/smx_private.h
b/src/simix/smx_private.h
index
f600d35
..
f10bf4d
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-6,10
+6,12
@@
#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>
+#include <vector>
/********************************** Simix Global ******************************/
/********************************** Simix Global ******************************/
@@
-17,10
+19,12
@@
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;
public:
smx_context_factory_t context_factory = nullptr;
-
xbt_dynar_t process_to_run = nullptr
;
-
xbt_dynar_t process_that_ran = nullptr
;
+
std::vector<smx_actor_t> process_to_run
;
+
std::vector<smx_actor_t> process_that_ran
;
std::map<aid_t, smx_actor_t> process_list;
#if SIMGRID_HAVE_MC
/* MCer cannot read the std::map above in the remote process, so we copy the info it needs in a dynar.
std::map<aid_t, smx_actor_t> process_list;
#if SIMGRID_HAVE_MC
/* MCer cannot read the std::map above in the remote process, so we copy the info it needs in a dynar.
@@
-73,13
+77,6
@@
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;
- void* data; /**< @brief user data */
-} s_smx_file_t;
-
-
SG_END_DECL()
#endif
SG_END_DECL()
#endif