reduce the coupling between main lib and java binding

[simgrid.git] / src / simix / smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 3b42c82..59638fa 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -11,10 +11,6 @@
 #include "xbt/swag.h"
 #include "private.h"
 
-#ifdef HAVE_LUA
-#include <lauxlib.h>
-#endif
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mecanism");
 
@@ -32,17 +28,12 @@ void SIMIX_context_mod_init(void)
     if (factory_initializer_to_use) {
       (*factory_initializer_to_use)(&(simix_global->context_factory));
     } else {
-#ifdef CONTEXT_THREADS
-      /* context switch based os thread */
+#ifdef CONTEXT_THREADS /* Use os threads (either pthreads or windows ones) */
       SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
-#elif defined(CONTEXT_UCONTEXT)
-      /* context switch based ucontext */
+#elif defined(CONTEXT_UCONTEXT) /* use ucontext */
       SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
-#elif defined(_XBT_WIN32)
-      /* context switch based windows */
 #else
-      /* context switch is not allowed on Windows */
-#error ERROR [__FILE__, line __LINE__]: no context based implementation specified.
+#error ERROR [__FILE__, line __LINE__]: no context implementation specified.
 #endif
     }
   }
@@ -93,15 +84,7 @@ int SIMIX_context_select_factory(const char *name)
 
   /* init the desired factory */
   smx_context_factory_t * factory = &simix_global->context_factory;
-  if (!strcmp(name, "java"))
-#ifdef HAVE_JAVA
-    SIMIX_ctx_java_factory_init(factory);
-#else
-    THROW0(not_found_error, 0,
-           "Factory 'Java' does not exist: Java support was not compiled in the SimGrid library");
-#endif                          /* HAVE_JAVA */
-
-  else if (!strcmp(name, "thread"))
+  if (!strcmp(name, "thread"))
 #ifdef CONTEXT_THREADS
     SIMIX_ctx_thread_factory_init(factory);
 #else
@@ -116,14 +99,6 @@ int SIMIX_context_select_factory(const char *name)
     THROW0(not_found_error, 0,
            "Factory 'sysv' does not exist: no System V thread support under Windows");
 #endif
-  else if (!strcmp(name, "lua"))
-#ifdef HAVE_LUA
-    SIMIX_ctx_lua_factory_init(factory);
-#else
-
-    THROW0(not_found_error, 0,
-           "Factory 'lua' does not exist: Lua support was not compiled in the SimGrid library");
-#endif                          /* HAVE_LUA */
 
   else
     THROW1(not_found_error, 0, "Factory '%s' does not exist", name);