#define _SIMIX_PRIVATE_H
#include <functional>
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
+#include <xbt/functional.hpp>
#include "src/internal_config.h"
#include "simgrid/simix.h"
#endif
-SG_BEGIN_DECL()
-
/********************************** Simix Global ******************************/
-typedef struct s_smx_global {
- smx_context_factory_t context_factory;
- xbt_dynar_t process_to_run;
- xbt_dynar_t process_that_ran;
- xbt_swag_t process_list;
- xbt_swag_t process_to_destroy;
- smx_process_t maestro_process;
- xbt_dict_t registered_functions;
- smx_creation_func_t create_process_function;
- void_pfn_smxprocess_t kill_process_function;
+
+namespace simgrid {
+namespace simix {
+
+class Global {
+public:
+ smx_context_factory_t context_factory = nullptr;
+ xbt_dynar_t process_to_run = nullptr;
+ xbt_dynar_t process_that_ran = nullptr;
+ xbt_swag_t process_list = nullptr;
+ xbt_swag_t process_to_destroy = nullptr;
+ smx_process_t maestro_process = nullptr;
+
+ // Maps function names to actor code:
+ std::unordered_map<std::string, simgrid::simix::ActorCodeFactory> registered_functions;
+
+ // This might be used when no corresponding function name is registered:
+ simgrid::simix::ActorCodeFactory default_function;
+
+ smx_creation_func_t create_process_function = nullptr;
+ void_pfn_smxprocess_t kill_process_function = nullptr;
/** Callback used when killing a SMX_process */
- void_pfn_smxprocess_t cleanup_process_function;
+ void_pfn_smxprocess_t cleanup_process_function = nullptr;
+ xbt_os_mutex_t mutex = nullptr;
+
+ std::vector<simgrid::xbt::Task<void()>> tasks;
+ std::vector<simgrid::xbt::Task<void()>> tasksTemp;
+};
+
+}
+}
+
+SG_BEGIN_DECL()
- xbt_os_mutex_t mutex;
-} s_smx_global_t, *smx_global_t;
+XBT_PUBLIC_DATA(std::unique_ptr<simgrid::simix::Global>) simix_global;
-XBT_PUBLIC_DATA(smx_global_t) simix_global;
extern XBT_PRIVATE unsigned long simix_process_maxpid;
XBT_PUBLIC(void) SIMIX_clean(void);
/******************************** Exceptions *********************************/
/** @brief Ask to the provided simix process to raise the provided exception */
-#define SMX_EXCEPTION(issuer, cat, val, msg) \
- if (1) { \
- smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */\
- THROW_PREPARE(_smx_throw_issuer->running_ctx, (cat), (val), xbt_strdup(msg)); \
- _smx_throw_issuer->doexception = 1; \
+#define SMX_EXCEPTION(issuer, cat, val, msg) \
+ if (1) { \
+ smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
+ xbt_ex e(XBT_THROW_POINT, msg); \
+ e.category = cat; \
+ e.value = val; \
+ _smx_throw_issuer->exception = std::make_exception_ptr(e); \
} else ((void)0)
/* ******************************** File ************************************ */
SG_END_DECL()
+XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name);
+
#endif
