X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2e921f7dfe65fd24e5e797fcb37cba28401f9f9..ecb32cd3b952528d41f0163b255c94dfae14f2fe:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 5e5937ffaf..e78088e9ee 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -10,11 +10,12 @@
 #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)");
 
-/* Additional declarations for Windows potability. */
+/* Additional declarations for Windows portability. */
 
 #ifndef MAX_DRIVE
 #define MAX_DRIVE 26
@@ -148,24 +149,16 @@ s_surf_model_description_t surf_network_model_description[] = {
 };
 
 s_surf_model_description_t surf_cpu_model_description[] = {
-  {"Cas01_fullupdate", "CPU classical model time=size/power (Cas01). [Deprecated. Use Cas01 with option --cfg=cpu/optim:Full. The Full option updates all actions at every step, which may be useful for debug.]",
-   surf_cpu_model_init_Cas01},
   {"Cas01",
    "Simplistic CPU model (time=size/power).",
    surf_cpu_model_init_Cas01},
-  {"CpuTI",
-   "CPU classical model time=size/power (Cas01). [Deprecated. Use Cas01 with option --cfg=cpu/optim:TI. The TI optimization is highly optimized when using traces]",
-   surf_cpu_model_init_ti},
   {NULL, NULL,  NULL}      /* this array must be NULL terminated */
 };
 
 s_surf_model_description_t surf_workstation_model_description[] = {
-  {"current_default",
-   "Curent default workstation model (may change with versions of SimGrid). Currently Cas01 and LV08 (with full duplex support) as CPU and Network",
+  {"default",
+   "Default workstation model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)",
    surf_workstation_model_init_current_default},
-  {"CLM03",
-   "Default workstation model, using Cas01 and CM02 as CPU and Network",
-   surf_workstation_model_init_CLM03},
   {"compound",
    "Workstation model that is automatically chosen if you change the network and CPU models",
    surf_workstation_model_init_compound},
@@ -187,6 +180,18 @@ 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 = NULL; /* parallel map on models */
+#endif
+
+static int surf_nthreads = 1;    /* 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 double min;               /* duration determined by surf_solve */
+
+static void surf_share_resources(surf_model_t model);
+static void surf_update_actions_state(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)
 {
@@ -391,6 +396,12 @@ void surf_exit(void)
   }
   surf_action_exit();
 
+#ifdef CONTEXT_THREADS
+  xbt_parmap_destroy(surf_parmap);
+  xbt_free(surf_mins);
+  surf_mins = NULL;
+#endif
+
   xbt_dynar_free(&surf_path);
 
   xbt_lib_free(&host_lib);
@@ -434,7 +445,7 @@ void surf_presolve(void)
 
 double surf_solve(double max_date)
 {
-  double min = -1.0; /* duration */
+  min = -1.0; /* duration */
   double next_event_date = -1.0;
   double model_next_action_end = -1.0;
   double value = -1.0;
@@ -448,19 +459,35 @@ 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 */
+#ifdef CONTEXT_THREADS
+    xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+#endif
+  }
+  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];
     }
   }
 
-  XBT_DEBUG("Min for resources (except NS3) : %f", min);
+  XBT_DEBUG("Min for resources (remember that NS3 dont update that value) : %f", min);
 
   XBT_DEBUG("Looking for next trace event");
 
@@ -485,7 +512,10 @@ double surf_solve(double max_date)
         min = model_next_action_end;
     }
 
-    if (next_event_date == -1.0) break;
+    if (next_event_date == -1.0) {
+    	XBT_DEBUG("no next TRACE event. Stop searching for it");
+    	break;
+    }
 
     if ((min != -1.0) && (next_event_date > NOW + min)) break;
 
@@ -510,18 +540,30 @@ double surf_solve(double max_date)
     }
   } while (1);
 
-  /* FIXME: Moved this test to here to avoid stoping simulation if there are actions running on cpus and all cpus are with availability = 0. 
+  /* FIXME: Moved this test to here to avoid stopping simulation if there are actions running on cpus and all cpus are with availability = 0.
    * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
    * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
-  if (min < 0.0)
+  if (min == -1.0) {
+	XBT_DEBUG("No next event at all. Bail out now.");
     return -1.0;
+  }
 
   XBT_DEBUG("Duration set to %f", min);
 
   NOW = NOW + min;
 
-  xbt_dynar_foreach(model_list, iter, model)
-      model->model_private->update_actions_state(NOW, min);
+  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 */
+    xbt_dynar_foreach(model_list, iter, model) {
+      surf_update_actions_state(model);
+    }
+  }
 
 #ifdef HAVE_TRACING
   TRACE_paje_dump_buffer (0);
@@ -534,3 +576,58 @@ 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;
+  }
+}
+
+static void surf_update_actions_state(surf_model_t model)
+{
+  model->model_private->update_actions_state(NOW, min);
+}
+
+/**
+ * \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) {
+
+  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) {
+#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
+  }
+
+  surf_nthreads = nthreads;
+}