Somehow integrate ruby to the library. That's ... crude, but I don't feel like changi...

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

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 49758bf..ac7c324 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -10,9 +10,15 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "private.h"
+#define HAVE_RUBY /* HACK HACK */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smx_context, simix, "Context switching mecanism");
+#ifdef HAVE_RUBY
+extern 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.
@@ -21,7 +27,9 @@ 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 +40,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
+    }
   }
 }
 
@@ -42,10 +51,6 @@ void SIMIX_context_mod_exit(void)
 {
   if (simix_global->context_factory) {
     smx_pfn_context_factory_finalize_t finalize_factory;
-
-    /* if there are living processes then kill them (except maestro) */
-    if(simix_global->process_list != NULL)
-      SIMIX_process_killall();
     
     /* finalize the context factory */
     finalize_factory = simix_global->context_factory->finalize;
@@ -55,35 +60,37 @@ void SIMIX_context_mod_exit(void)
 
 /**
  * This function is used to change the context factory.
- * Warning: it destroy all the existing contexts
+ * Warning: it destroy all the existing processes (even for maestro), and it
+ * will create a new maestro process using the new context factory.
  */
 int SIMIX_context_select_factory(const char *name)
 {
-  /* if a factory is already instantiated (SIMIX_context_mod_init() was called) */
+  /* if a context factory is already instantiated and it is different from the
+     newly selected one, then kill all the processes, exit the context module
+     and initialize the new factory.
+  */
   if (simix_global->context_factory != NULL) {
-    /* if the desired factory is different of the current factory, call SIMIX_context_mod_exit() */
-    if (strcmp(simix_global->context_factory->name, name))
+    if (strcmp(simix_global->context_factory->name, name)){
+
+      SIMIX_process_killall();
+      
+      /* kill maestro process */
+      SIMIX_context_free(simix_global->maestro_process->context);
+      free(simix_global->maestro_process);  
+      simix_global->maestro_process = NULL;
+
       SIMIX_context_mod_exit();
+    }
     else
       /* the same context factory is requested return directly */
       return 0;
   }
-
-  /* get the desired factory */
+  
+  /* init the desired factory */
   SIMIX_context_init_factory_by_name(&simix_global->context_factory, name);
 
-  /* maestro process specialisation */
-  (*(simix_global->context_factory->create_maestro_context)) (&simix_global->maestro_process);
-
-  /* the current process is the process of the maestro */
-  simix_global->current_process = simix_global->maestro_process;
-
-  /* the current context doesn't want to die */
-  simix_global->current_process->iwannadie = 0;
-
-  /* insert the current context in the list of the contexts in use */
-  xbt_swag_insert(simix_global->current_process, simix_global->process_list);
-
+  SIMIX_create_maestro_process ();
+  
   return 0;
 }
 
@@ -107,12 +114,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);
 }