X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d67901dba3dfd8e75f708c329b8144287490077..10ceac5fd14fb0426b5c93bda85676a79b02d0be:/src/simix/smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 5f08cc025a..ab1a6dad23 100644
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -7,6 +7,13 @@
 #ifndef _SIMIX_PRIVATE_H
 #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"
 #include "surf/surf.h"
@@ -20,7 +27,6 @@
 #include "xbt/function_types.h"
 #include "src/xbt/ex_interface.h"
 #include "src/instr/instr_private.h"
-#include "smx_process_private.h"
 #include "smx_host_private.h"
 #include "smx_io_private.h"
 #include "smx_network_private.h"
@@ -28,63 +34,57 @@
 #include "smx_synchro_private.h"
 
 #include <signal.h>
+#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/context/Context.hpp"
 
-#ifdef __cplusplus
-
-#include <simgrid/simix.hpp>
+/********************************** Simix Global ******************************/
 
 namespace simgrid {
 namespace simix {
 
-/* Hack: let msg load directly the right factory
- *
- * This is a factory of factory! How nice is this?
- */
-typedef ContextFactory* (*ContextFactoryInitializer)(void);
-XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer;
+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_actor_t maestro_process = nullptr;
 
-}
-}
+  // Maps function names to actor code:
+  std::unordered_map<std::string, simgrid::simix::ActorCodeFactory> registered_functions;
 
-typedef simgrid::simix::ContextFactory *smx_context_factory_t;
+  // This might be used when no corresponding function name is registered:
+  simgrid::simix::ActorCodeFactory default_function;
 
-#else
+  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 = nullptr;
+  xbt_os_mutex_t mutex = nullptr;
 
-typedef struct s_smx_context_factory *smx_context_factory_t;
+  std::vector<simgrid::xbt::Task<void()>> tasks;
+  std::vector<simgrid::xbt::Task<void()>> tasksTemp;
+};
 
-#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;
-  /** Callback used when killing a SMX_process */
-  void_pfn_smxprocess_t cleanup_process_function;
-
-  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);
+XBT_PUBLIC(void) SIMIX_clean();
 
 /******************************** 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_actor_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 ************************************ */
@@ -93,45 +93,6 @@ typedef struct s_smx_file {
   void* data;                   /**< @brief user data */
 } s_smx_file_t;
 
-XBT_PRIVATE void SIMIX_context_mod_init(void);
-XBT_PRIVATE void SIMIX_context_mod_exit(void);
-
-XBT_PRIVATE smx_context_t SIMIX_context_new(
-  xbt_main_func_t code, int argc, char **argv,
-  void_pfn_smxprocess_t cleanup_func,
-  smx_process_t simix_process);
-
-#ifndef WIN32
-XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
-#endif
-
-/* We are using the bottom of the stack to save some information, like the
- * valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
- * size for the stack. */
-#if HAVE_VALGRIND_H
-# define smx_context_usable_stack_size                                  \
-  (smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */
-#else
-# define smx_context_usable_stack_size smx_context_stack_size
-#endif
-
-XBT_PRIVATE void *SIMIX_context_stack_new(void);
-XBT_PRIVATE void SIMIX_context_stack_delete(void *stack);
-
-XBT_PRIVATE void SIMIX_context_set_current(smx_context_t context);
-XBT_PRIVATE smx_context_t SIMIX_context_get_current(void);
-
-/* ****************************** */
-/* context manipulation functions */
-/* ****************************** */
-
-XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
-
-XBT_PRIVATE void SIMIX_post_create_environment(void);
-
-// FIXME, Dirty hack for SMPI+MSG
-XBT_PRIVATE void SIMIX_process_set_cleanup_function(
-  smx_process_t process, void_pfn_smxprocess_t cleanup);
 
 SG_END_DECL()