kill smx_private.hpp We already have a smx_private.h

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index dfbf821..9a07ff8 100644 (file)
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -15,7 +15,7 @@
 #include <simgrid/simix.h>
 #include <xbt/xbt_os_thread.h>
 
-#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_private.h"
 
 #include "jmsg.h"
 #include "jmsg_process.h"

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 8d5788d..5020d7d 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -15,7 +15,7 @@
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_process_private.h"
-#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_private.h"
 #include "src/surf/cpu_interface.hpp"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 881a975..78ce58d 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -12,8 +12,6 @@
 #include "src/surf/HostImpl.hpp"
 #include "surf/surf.h" // routing_get_network_element_type FIXME:killme
 
-#include "src/simix/smx_private.hpp"
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
 
 size_t sg_host_count()

diff --git a/src/simix/Context.cpp b/src/simix/Context.cpp
index be5da21..f86acfd 100644 (file)
--- a/src/simix/Context.cpp
+++ b/src/simix/Context.cpp
@@ -14,8 +14,7 @@
 
 #include "mc/mc.h"
 
-#include <src/simix/smx_private.h>
-#include <src/simix/smx_private.hpp>
+#include "src/simix/smx_private.h"
 
 void SIMIX_process_set_cleanup_function(
   smx_process_t process, void_pfn_smxprocess_t cleanup)

diff --git a/src/simix/ContextRaw.cpp b/src/simix/ContextRaw.cpp
index 67ebc54..88d05bf 100644 (file)
--- a/src/simix/ContextRaw.cpp
+++ b/src/simix/ContextRaw.cpp
@@ -23,7 +23,6 @@
 #include "xbt/dynar.h"
 
 #include "smx_private.h"
-#include "smx_private.hpp"
 #include "mc/mc.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);

diff --git a/src/simix/ContextThread.cpp b/src/simix/ContextThread.cpp
index c020d56..49ba1b0 100644 (file)
--- a/src/simix/ContextThread.cpp
+++ b/src/simix/ContextThread.cpp
@@ -14,7 +14,6 @@
 #include "xbt/xbt_os_thread.h"
 #include "src/xbt_modinter.h"       /* prototype of os thread module's init/exit in XBT */
 
-#include "src/simix/smx_private.hpp"
 #include "src/simix/ContextThread.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);

diff --git a/src/simix/ContextUnix.cpp b/src/simix/ContextUnix.cpp
index 8852c73..3d9e4bb 100644 (file)
--- a/src/simix/ContextUnix.cpp
+++ b/src/simix/ContextUnix.cpp
@@ -13,7 +13,6 @@
 
 #include "xbt/parmap.h"
 #include "src/simix/smx_private.h"
-#include "src/simix/smx_private.hpp"
 #include "src/internal_config.h"
 #include "mc/mc.h"
 

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index e052a98..3b36d09 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -21,7 +21,6 @@
 #include "xbt/ex.h"
 #include "mc/mc.h"
 #include "src/simix/smx_host_private.h"
-#include "src/simix/smx_private.hpp"
 
 #include <simgrid/simix.hpp>
 

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 83424f0..7205f47 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -17,7 +17,6 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
-#include "smx_private.hpp"
 #include "simgrid/sg_config.h"
 #include "src/internal_config.h"
 #include "simgrid/modelchecker.h"

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 9b31320..8489bf6 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -12,7 +12,6 @@
 #include "src/surf/storage_interface.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "smx_private.h"
-#include "smx_private.hpp"
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "mc/mc.h"

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 5f08cc0..d038451 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -36,13 +36,15 @@
 namespace simgrid {
 namespace simix {
 
-/* Hack: let msg load directly the right factory
- *
- * This is a factory of factory! How nice is this?
- */
+/* 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();
+
 }
 }
 
@@ -115,23 +117,34 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
 # 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);
 
-/* ****************************** */
-/* 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);
+XBT_PRIVATE void SIMIX_process_set_cleanup_function(smx_process_t process, void_pfn_smxprocess_t cleanup);
 
 SG_END_DECL()
 

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
deleted file mode 100644 (file)
index abea06b..0000000
--- a/src/simix/smx_private.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#ifndef SIMGRID_SIMIX_PRIVATE_HPP
-#define SIMGRID_SIMIX_PRIVATE_HPP
-
-#include <simgrid/simix.hpp>
-#include "smx_private.h"
-#include "src/simix/popping_private.h"
-
-/** @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;
-}
-
-namespace simgrid {
-namespace simix {
-
-XBT_PRIVATE ContextFactory* thread_factory();
-XBT_PRIVATE ContextFactory* sysv_factory();
-XBT_PRIVATE ContextFactory* raw_factory();
-XBT_PRIVATE ContextFactory* boost_factory();
-
-template<class R, class... Args> inline
-R simcall(e_smx_simcall_t call, Args&&... args)
-{
-  smx_process_t self = SIMIX_process_self();
-  marshal(&self->simcall, call, std::forward<Args>(args)...);
-  simcall_call(self);
-  return unmarshal<R>(self->simcall.result);
-}
-
-}
-}
-
-#endif

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index 530d7c9..450d081 100644 (file)
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -12,7 +12,6 @@
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
 #include "src/mc/Client.hpp"
-#include "src/simix/smx_private.hpp"
 #include "src/msg/msg_private.h"
 
 #include "src/simix/SynchroSleep.hpp"

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index 95abdce..b456047 100644 (file)
--- a/src/xbt/parmap.cpp
+++ b/src/xbt/parmap.cpp
@@ -27,7 +27,6 @@
 #include "xbt/xbt_os_thread.h"
 #include "xbt/sysdep.h"
 #include "src/simix/smx_private.h"
-#include "src/simix/smx_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map");
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1ea2fac..2a9c547 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -29,7 +29,6 @@ set(EXTRA_DIST
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
-  src/simix/smx_private.hpp
   src/simix/smx_process_private.h
   src/simix/smx_synchro_private.h
   src/simix/Synchro.h