very preliminary cleanups in the contextes

[simgrid.git] / src / kernel / context / Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index cfd5b41..eab87f8 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -35,8 +35,6 @@
 #include <signal.h>
 #include "src/simix/ActorImpl.hpp"
 
 #include <signal.h>
 #include "src/simix/ActorImpl.hpp"
 

-#ifdef __cplusplus
-

 #include <simgrid/simix.hpp>
 
 namespace simgrid {
 #include <simgrid/simix.hpp>
 
 namespace simgrid {


@@ -44,7 +42,6 @@ namespace kernel {
 namespace context {
 
   class Context;
 namespace context {
 
   class Context;

-  class ContextFactory;

 
   XBT_PUBLIC_CLASS ContextFactory {
   private:
 
   XBT_PUBLIC_CLASS ContextFactory {
   private:


@@ -150,12 +147,6 @@ XBT_PRIVATE ContextFactory* boost_factory();
 
 typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
 
 
 typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
 

-#else
-
-typedef struct s_smx_context_factory *smx_context_factory_t;
-
-#endif
-

 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 
 


@@ -184,7 +175,7 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
 /** @brief Executes all the processes to run (in parallel if possible). */
 XBT_PRIVATE void SIMIX_context_runall(void);
 /** @brief returns the current running context */
 /** @brief Executes all the processes to run (in parallel if possible). */
 XBT_PRIVATE void SIMIX_context_runall(void);
 /** @brief returns the current running context */

-XBT_PRIVATE smx_context_t SIMIX_context_self(void);
+XBT_PUBLIC(smx_context_t) SIMIX_context_self(void); // public because it's used in simgrid-java

 
 XBT_PRIVATE void *SIMIX_context_stack_new(void);
 XBT_PRIVATE void SIMIX_context_stack_delete(void *stack);
 
 XBT_PRIVATE void *SIMIX_context_stack_new(void);
 XBT_PRIVATE void SIMIX_context_stack_delete(void *stack);


@@ -196,9 +187,6 @@ XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
 
 XBT_PRIVATE void SIMIX_post_create_environment(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);
 SG_END_DECL()
 
 XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name);