X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/47619e4bb47a259821ad1b37cca80a91184fe79c..ba58c8b937ee08fc2b46be62a50b0b3ff0b0104f:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 868354753c..71c2b0edeb 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -11,17 +11,29 @@
 #include "xbt/swag.h"
 #include "private.h"
 
+#ifdef HAVE_LUA
+#include <lua5.1/lauxlib.h>
+#endif
+
+#ifdef HAVE_RUBY
+ void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory);
+#endif 
+ 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mecanism");
 
+const char *xbt_ctx_factory_to_use = NULL;
 
-/**
+/** 
  * This function is call by SIMIX_global_init() to initialize the context module.
  */
+
 void SIMIX_context_mod_init(void)
 {
   if (!simix_global->context_factory) {
   /* select context factory to use to create the context(depends of the macro definitions) */
-
+    if (xbt_ctx_factory_to_use) {
+      SIMIX_context_select_factory(xbt_ctx_factory_to_use);
+    } else {
 #ifdef CONTEXT_THREADS
     /* context switch based os thread */
     SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
@@ -32,6 +44,7 @@ void SIMIX_context_mod_init(void)
     /* context switch is not allowed on Windows */
 #error ERROR [__FILE__, line __LINE__]: no context based implementation specified.
 #endif
+    }
   }
 }
 
@@ -60,6 +73,8 @@ int SIMIX_context_select_factory(const char *name)
      newly selected one, then kill all the processes, exit the context module
      and initialize the new factory.
   */
+  
+
   if (simix_global->context_factory != NULL) {
     if (strcmp(simix_global->context_factory->name, name)){
 
@@ -80,7 +95,9 @@ int SIMIX_context_select_factory(const char *name)
   /* init the desired factory */
   SIMIX_context_init_factory_by_name(&simix_global->context_factory, name);
 
-  __SIMIX_create_maestro_process ();
+  SIMIX_create_maestro_process ();
+
+
   
   return 0;
 }
@@ -91,6 +108,7 @@ int SIMIX_context_select_factory(const char *name)
 void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
                                         const char *name)
 {
+  
   if (!strcmp(name, "java"))
 #ifdef HAVE_JAVA     
     SIMIX_ctx_java_factory_init(factory);
@@ -105,12 +123,26 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
     THROW0(not_found_error, 0, "Factory 'thread' does not exist: thread support was not compiled in the SimGrid library");
 #endif /* CONTEXT_THREADS */
    
-  else if (!strcmp(name, "sysv"))
-#if !defined(WIN32) && !defined(CONTEXT_THREADS)
-    SIMIX_ctx_sysv_factory_init(factory);
+    else if (!strcmp(name, "sysv"))
+  #if !defined(WIN32) && !defined(CONTEXT_THREADS)
+      SIMIX_ctx_sysv_factory_init(factory);
+  #else
+      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 'sysv' does not exist: no System V thread support under Windows");
-#endif   
+
+    THROW0(not_found_error, 0, "Factory 'lua' does not exist: Lua support was not compiled in the SimGrid library");
+#endif /* HAVE_LUA */
+
+    else if (!strcmp(name,"ruby"))
+#ifdef HAVE_RUBY
+    SIMIX_ctx_ruby_factory_init(factory);
+#else
+     THROW0(not_found_error, 0, "Factory 'ruby' does not exist: Ruby support was not compiled in the SimGrid library");
+#endif
   else
     THROW1(not_found_error, 0, "Factory '%s' does not exist", name);
 }