X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2a013c0e4ca407feeb7b3d0e85abba7acae2532..8cf6e30af8de6686461b6b1b52ba578df01de985:/src/simix/smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index fcb5469858..85d2dfa15a 100644
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -7,61 +7,8 @@
 #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"
-#include "xbt/base.h"
-#include "xbt/fifo.h"
-#include "xbt/swag.h"
-#include "xbt/dict.h"
-#include "xbt/mallocator.h"
-#include "xbt/config.h"
-#include "xbt/xbt_os_time.h"
-#include "xbt/function_types.h"
-#include "src/xbt/ex_interface.h"
-#include "src/instr/instr_private.h"
-#include "smx_host_private.h"
-#include "smx_io_private.h"
-#include "smx_network_private.h"
-#include "popping_private.h"
-#include "smx_synchro_private.h"
-
 #include <signal.h>
-#include "src/simix/ActorImpl.hpp"
-
-#ifdef __cplusplus
-
-#include <simgrid/simix.hpp>
-
-namespace simgrid {
-namespace simix {
-
-/* This allows Java to hijack the context factory (Java induces factories of factory :) */
-typedef ContextFactory* (*ContextFactoryInitializer)(void);
-XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer;
-
-XBT_PRIVATE ContextFactory* thread_factory();
-XBT_PRIVATE ContextFactory* sysv_factory();
-XBT_PRIVATE ContextFactory* raw_factory();
-XBT_PRIVATE ContextFactory* boost_factory();
-
-}
-}
-
-typedef simgrid::simix::ContextFactory *smx_context_factory_t;
-
-#else
-
-typedef struct s_smx_context_factory *smx_context_factory_t;
-
-#endif
+#include "src/kernel/context/Context.hpp"
 
 /********************************** Simix Global ******************************/
 
@@ -75,7 +22,7 @@ public:
   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;
+  smx_actor_t maestro_process = nullptr;
 
   // Maps function names to actor code:
   std::unordered_map<std::string, simgrid::simix::ActorCodeFactory> registered_functions;
@@ -100,15 +47,13 @@ SG_BEGIN_DECL()
 
 XBT_PUBLIC_DATA(std::unique_ptr<simgrid::simix::Global>) 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 */ \
+  smx_actor_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
   xbt_ex e(XBT_THROW_POINT, msg); \
   e.category = cat; \
   e.value = val; \
@@ -121,59 +66,7 @@ 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(
-  std::function<void()> code,
-  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
-
-/** @brief Executes all the processes to run (in parallel if possible). */
-static inline void SIMIX_context_runall(void)
-{
-  if (!xbt_dynar_is_empty(simix_global->process_to_run))
-    simix_global->context_factory->run_all();
-}
-
-/** @brief returns the current running context */
-static inline smx_context_t SIMIX_context_self(void)
-{
-  if (simix_global && simix_global->context_factory)
-    return simix_global->context_factory->self();
-  else
-    return nullptr;
-}
-
-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);
-
-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()
 
-XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name);
-
 #endif