Surf: allow to call share_resources in parallel (never enabled yet)

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 5f5ee04..22563a4 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -682,5 +682,8 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
 
 XBT_PUBLIC(double) get_cpu_power(const char *power);
 
+int surf_get_nthreads(void);
+void surf_set_nthreads(int nthreads);
+
 SG_END_DECL()
 #endif                          /* _SURF_SURF_H */

diff --git a/src/surf/surf.c b/src/surf/surf.c
index a3a685c..a5af424 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -14,7 +14,7 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
 
-/* Additional declarations for Windows potability. */
+/* Additional declarations for Windows portability. */
 
 #ifndef MAX_DRIVE
 #define MAX_DRIVE 26
@@ -179,6 +179,16 @@ s_surf_model_description_t surf_optimization_mode_description[] = {
   {NULL, NULL, NULL}      /* this array must be NULL terminated */
 };
 
+#ifdef CONTEXT_THREADS
+static xbt_parmap_t surf_parmap; /* parallel map for share_resources */
+#endif
+
+static int surf_nthreads;        /* number of threads of the parmap (1 means no parallelism) */
+static double *surf_mins = NULL; /* return value of share_resources for each model */
+static int surf_min_index;       /* current index in surf_mins */
+
+static void surf_share_resources(surf_model_t model);
+
 /** Displays the long description of all registered models, and quit */
 void model_help(const char *category, s_surf_model_description_t * table)
 {
@@ -324,6 +334,7 @@ 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();
@@ -383,6 +394,11 @@ void surf_exit(void)
   }
   surf_action_exit();
 
+#ifdef CONTEXT_THREADS
+  xbt_parmap_destroy(surf_parmap);
+  xbt_free(surf_mins);
+#endif
+
   xbt_dynar_free(&surf_path);
 
   xbt_lib_free(&host_lib);
@@ -440,15 +456,28 @@ double surf_solve(double max_date)
   }
 
   XBT_DEBUG("Looking for next action end for all models except NS3");
-  xbt_dynar_foreach(model_list, iter, model) {
-    if(strcmp(model->name,"network NS3") ){
-      XBT_DEBUG("Running for Resource [%s]", model->name);
-      model_next_action_end = model->model_private->share_resources(NOW);
-      XBT_DEBUG("Resource [%s] : next action end = %f",
-          model->name, model_next_action_end);
-      if (((min < 0.0) || (model_next_action_end < min))
-          && (model_next_action_end >= 0.0))
-        min = model_next_action_end;
+
+  if (surf_mins == NULL) {
+    surf_mins = xbt_new(double, xbt_dynar_length(model_list));
+  }
+  surf_min_index = 0;
+
+  if (surf_get_nthreads() > 1) {
+    /* parallel version */
+    xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+  }
+  else {
+    /* sequential version */
+    xbt_dynar_foreach(model_list, iter, model) {
+      surf_share_resources(model);
+    }
+  }
+
+  unsigned i;
+  for (i = 0; i < xbt_dynar_length(model_list); i++) {
+    if ((min < 0.0 || surf_mins[i] < min)
+        && surf_mins[i] >= 0.0) {
+      min = surf_mins[i];
     }
   }
 
@@ -531,3 +560,43 @@ XBT_INLINE double surf_get_clock(void)
 {
   return NOW;
 }
+
+static void surf_share_resources(surf_model_t model) {
+
+  if (strcmp(model->name,"network NS3")) {
+    XBT_DEBUG("Running for Resource [%s]", model->name);
+    double next_action_end = model->model_private->share_resources(NOW);
+    XBT_DEBUG("Resource [%s] : next action end = %f",
+        model->name, next_action_end);
+    int i = __sync_fetch_and_add(&surf_min_index, 1);
+    surf_mins[i] = next_action_end;
+  }
+}
+
+/**
+ * \brief Returns the number of parallel threads used to update the models.
+ * \return the number of threads (1 means no parallelism)
+ */
+int surf_get_nthreads(void) {
+  return surf_nthreads;
+}
+
+/**
+ * \brief Sets the number of parallel threads used to update the models.
+ *
+ * A value of 1 means no parallelism.
+ *
+ * \param nb_threads the number of threads to use
+ */
+void surf_set_nthreads(int nthreads) {
+
+  xbt_assert(nthreads > 0, "Invalid number of parallel threads: %d", nthreads);
+
+  if (nthreads > 1) {
+#ifndef CONTEXT_THREADS
+    THROWF(arg_error, 0, "Cannot activate parallel threads in Surf: your architecture does not support threads");
+#endif
+  }
+
+  surf_nthreads = nthreads;
+}