Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / surf / surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 2750110..e78088e 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -10,6 +10,7 @@
 #include "xbt/module.h"
 #include "mc/mc.h"
 #include "surf/surf_resource.h"
+#include "xbt/xbt_os_thread.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
@@ -180,7 +181,7 @@ s_surf_model_description_t surf_optimization_mode_description[] = {
 };
 
 #ifdef CONTEXT_THREADS
-static xbt_parmap_t surf_parmap; /* parallel map for share_resources */
+static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
 #endif
 
 static int surf_nthreads = 1;    /* number of threads of the parmap (1 means no parallelism) */
@@ -336,7 +337,6 @@ void surf_init(int *argc, char **argv)
     model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL);
   if (!history)
     history = tmgr_history_new();
-  surf_parmap = xbt_parmap_new(4, XBT_PARMAP_DEFAULT);
 
   surf_config_init(argc, argv);
   surf_action_init();
@@ -399,6 +399,7 @@ void surf_exit(void)
 #ifdef CONTEXT_THREADS
   xbt_parmap_destroy(surf_parmap);
   xbt_free(surf_mins);
+  surf_mins = NULL;
 #endif
 
   xbt_dynar_free(&surf_path);
@@ -464,9 +465,12 @@ double surf_solve(double max_date)
   }
   surf_min_index = 0;
 
+
   if (surf_get_nthreads() > 1) {
     /* parallel version */
+#ifdef CONTEXT_THREADS
     xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+#endif
   }
   else {
     /* sequential version */
@@ -550,7 +554,9 @@ double surf_solve(double max_date)
 
   if (surf_get_nthreads() > 1) {
     /* parallel version */
+#ifdef CONTEXT_THREADS
     xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_update_actions_state, model_list);
+#endif
   }
   else {
     /* sequential version */
@@ -605,10 +611,20 @@ int surf_get_nthreads(void) {
  */
 void surf_set_nthreads(int nthreads) {
 
-  xbt_assert(nthreads > 0, "Invalid number of parallel threads: %d", nthreads);
+  if (nthreads<=0) {
+     nthreads = xbt_os_get_numcores();
+     XBT_INFO("Auto-setting surf/nthreads to %d",nthreads);
+  }
+
+#ifdef CONTEXT_THREADS
+  xbt_parmap_destroy(surf_parmap);
+  surf_parmap = NULL;
+#endif
 
   if (nthreads > 1) {
-#ifndef CONTEXT_THREADS
+#ifdef CONTEXT_THREADS
+    surf_parmap = xbt_parmap_new(nthreads, XBT_PARMAP_DEFAULT);
+#else
     THROWF(arg_error, 0, "Cannot activate parallel threads in Surf: your architecture does not support threads");
 #endif
   }