X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9a06d0b06fb32926954b78006bfe7f886aa757a..62dd6184baa87113d6bd7f536ac31196ad162945:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index c3bc15520e..88212467d6 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -10,13 +10,13 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "private.h"
+#include "simix/context.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mecanism");
 
-const char *xbt_ctx_factory_to_use = NULL;
-typedef void (*SIMIX_ctx_factory_initializer_t)(smx_context_factory_t *);
-SIMIX_ctx_factory_initializer_t factory_initializer_to_use = NULL;
+char* smx_context_factory_name = NULL; /* factory name specified by --cfg=simix/context=value */
+smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.
@@ -24,22 +24,26 @@ SIMIX_ctx_factory_initializer_t factory_initializer_to_use = NULL;
 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 (factory_initializer_to_use) {
-      (*factory_initializer_to_use)(&(simix_global->context_factory));
-    } else {
-#ifdef CONTEXT_THREADS
-      /* context switch based os thread */
-      SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
-#elif defined(CONTEXT_UCONTEXT)
-      /* context switch based 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.
-#endif
+    /* select the context factory to use to create the contexts */
+    if (smx_factory_initializer_to_use) {
+      (*smx_factory_initializer_to_use)(&(simix_global->context_factory));
+    }
+    else { /* use the factory specified by --cfg=simix/ctx:value */
+      if (smx_context_factory_name == NULL || !strcmp(smx_context_factory_name, "ucontext")) {
+        /* use ucontext */
+        SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+      }
+      else if (!strcmp(smx_context_factory_name, "thread")) {
+	/* use os threads (either pthreads or windows ones) */
+        SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
+      }
+      else if (!strcmp(smx_context_factory_name, "raw")) {
+	/* use raw contexts */
+	SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
+      }
+      else {
+        xbt_die("Invalid context factory specified");
+      }
     }
   }
 }
@@ -56,71 +60,5 @@ void SIMIX_context_mod_exit(void)
     finalize_factory = simix_global->context_factory->finalize;
     (*finalize_factory) (&simix_global->context_factory);
   }
+  xbt_free(smx_context_factory_name);
 }
-
-/**
- * This function is used to change the context factory.
- * 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 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 (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;
-  }
-
-  /* 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"))
-#ifdef CONTEXT_THREADS
-    SIMIX_ctx_thread_factory_init(factory);
-#else
-    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(_XBT_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
-    THROW1(not_found_error, 0, "Factory '%s' does not exist", name);
-
-
-
-
-  SIMIX_create_maestro_process();
-
-  return 0;
-}
-