X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2be0e4648c5b7055580df1c265b7c43ee6763a46..97f3dfe883909ad3f75c9fab7aaaf1ddde0cd7f5:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index a3a685c7c0..a4ef05aa17 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
@@ -179,6 +180,25 @@ s_surf_model_description_t surf_optimization_mode_description[] = {
   {NULL, NULL, NULL}      /* this array must be NULL terminated */
 };
 
+s_surf_model_description_t surf_storage_model_description[] = {
+  {"default",
+   "Simplistic storage model.",
+   surf_storage_model_init_default},
+  {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)
 {
@@ -287,19 +307,25 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
 
 void surf_init(int *argc, char **argv)
 {
-	XBT_DEBUG("Create all Libs");
-	host_lib = xbt_lib_new();
-	link_lib = xbt_lib_new();
-	as_router_lib = xbt_lib_new();
-
-	XBT_DEBUG("ADD ROUTING LEVEL");
-	ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
-	ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_free);
-
-	XBT_DEBUG("ADD SURF LEVELS");
-	SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
-	SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
-	SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
+  XBT_DEBUG("Create all Libs");
+  host_lib = xbt_lib_new();
+  link_lib = xbt_lib_new();
+  as_router_lib = xbt_lib_new();
+  storage_lib = xbt_lib_new();
+  storage_type_lib = xbt_lib_new();
+
+  XBT_DEBUG("ADD ROUTING LEVEL");
+  ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
+  ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_free);
+  ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
+  ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
+  ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free);
+
+  XBT_DEBUG("ADD SURF LEVELS");
+  SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+  SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+  SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
+  SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
 
   /* Connect our log channels: that must be done manually under windows */
   XBT_LOG_CONNECT(surf_cpu, surf);
@@ -383,12 +409,19 @@ 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);
   xbt_lib_free(&link_lib);
   xbt_lib_free(&as_router_lib);
-
+  xbt_lib_free(&storage_lib);
+  xbt_lib_free(&storage_type_lib);
 
   tmgr_finalize();
   surf_parse_lex_destroy();
@@ -426,7 +459,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;
@@ -440,15 +473,31 @@ 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];
     }
   }
 
@@ -517,8 +566,18 @@ double surf_solve(double max_date)
 
   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);
@@ -531,3 +590,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;
+}