Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge

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

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 9515444..e5e48ce 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -11,6 +11,7 @@
 #include "xbt/swag.h"
 #include "private.h"
 #include "simix/context.h"
 #include "xbt/swag.h"
 #include "private.h"
 #include "simix/context.h"

+#include "gras_config.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mecanism");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mecanism");


@@ -18,8 +19,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
 smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
 int smx_context_stack_size = 128 * 1024;
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
 smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
 int smx_context_stack_size = 128 * 1024;

+
+#ifdef CONTEXT_THREADS
+__thread smx_context_t smx_current_context;
+#else

 smx_context_t smx_current_context;
 smx_context_t smx_current_context;

-static int smx_parallel_contexts;
+#endif
+
+static int smx_parallel_contexts = 1;
+static int smx_parallel_threshold = 1;

 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.


@@ -32,9 +40,22 @@ void SIMIX_context_mod_init(void)
       (*smx_factory_initializer_to_use)(&(simix_global->context_factory));
     }
     else { /* use the factory specified by --cfg=contexts/factory:value */
       (*smx_factory_initializer_to_use)(&(simix_global->context_factory));
     }
     else { /* use the factory specified by --cfg=contexts/factory:value */

-      if (smx_context_factory_name == NULL || !strcmp(smx_context_factory_name, "ucontext")) {
+
+      if (smx_context_factory_name == NULL) {
+        /* use the default factory */
+#ifdef CONTEXT_UCONTEXT
+        SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+#else
+        SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
+#endif
+      }
+      else if (!strcmp(smx_context_factory_name, "ucontext")) {

         /* use ucontext */
         /* use ucontext */

+#ifdef CONTEXT_UCONTEXT

         SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
         SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);

+#else
+        xbt_die("The ontext factory 'ucontext' unavailable on your system");
+#endif

       }
       else if (!strcmp(smx_context_factory_name, "thread")) {
        /* use os threads (either pthreads or windows ones) */
       }
       else if (!strcmp(smx_context_factory_name, "thread")) {
        /* use os threads (either pthreads or windows ones) */


@@ -76,9 +97,16 @@ void SIMIX_context_mod_exit(void)
  *
  * \param nb_threads the number of threads to use
  */
  *
  * \param nb_threads the number of threads to use
  */

-void SIMIX_context_set_nthreads(int nb_threads) {
+XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads) {
+
+  xbt_assert(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads);
+
+  if (nb_threads > 1) {
+#ifndef CONTEXT_THREADS
+    THROWF(arg_error, 0, "No thread support for parallel context execution");
+#endif
+  }

 
 

-  xbt_assert1(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads);

   smx_parallel_contexts = nb_threads;
 }
 
   smx_parallel_contexts = nb_threads;
 }
 


@@ -87,7 +115,7 @@ void SIMIX_context_set_nthreads(int nb_threads) {
  * for the user contexts.
  * \return the number of threads (1 means no parallelism)
  */
  * for the user contexts.
  * \return the number of threads (1 means no parallelism)
  */

-int SIMIX_context_get_nthreads() {
+XBT_INLINE int SIMIX_context_get_nthreads(void) {

   return smx_parallel_contexts;
 }
 
   return smx_parallel_contexts;
 }
 


@@ -96,7 +124,33 @@ int SIMIX_context_get_nthreads() {
  * for the user contexts.
  * \return 1 if parallelism is used
  */
  * for the user contexts.
  * \return 1 if parallelism is used
  */

-int SIMIX_context_is_parallel() {
+XBT_INLINE int SIMIX_context_is_parallel(void) {

   return smx_parallel_contexts > 1;
 }
 
   return smx_parallel_contexts > 1;
 }
 

+/**
+ * \brief Sets the threshold above which user processes are run in parallel.
+ *
+ * If the number of threads is set to 1, there is no parallelism and this
+ * threshold has no effect.
+ *
+ * \param threshold when the number of user processes ready to run is above
+ * this threshold, they are run in parallel
+ */
+XBT_INLINE void SIMIX_context_set_parallel_threshold(int threshold) {
+  smx_parallel_threshold = threshold;
+}
+
+/**
+ * \brief Returns the threshold above which user processes are run in parallel.
+ *
+ * If the number of threads is set to 1, there is no parallelism and this
+ * threshold has no effect.
+ *
+ * \return when the number of user processes ready to run is above
+ * this threshold, they are run in parallel
+ */
+XBT_INLINE int SIMIX_context_get_parallel_threshold(void) {
+  return smx_parallel_threshold;
+}
+