Minor changes for fixing dp_intensity at java level - Lucas, don't waste your time...

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index d2ded06..157cbe2 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -208,7 +208,6 @@ s_surf_model_description_t surf_new_model_description[] = {
 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 */
@@ -547,6 +546,7 @@ void surf_presolve(void)
 
 double surf_solve(double max_date)
 {
+                 
   min = -1.0; /* duration */
   double next_event_date = -1.0;
   double model_next_action_end = -1.0;
@@ -567,22 +567,10 @@ 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_invoke);
-#else
-    xbt_die("Asked to run in parallel, but no thread at hand...");
-#endif
+  /* sequential version */
+  xbt_dynar_foreach(model_list_invoke, iter, model) {
+    surf_share_resources(model);
   }
-  else {
-    /* sequential version */
-    xbt_dynar_foreach(model_list_invoke, iter, model) {
-      surf_share_resources(model);
-    }
-  }
-
   unsigned i;
   for (i = 0; i < xbt_dynar_length(model_list_invoke); i++) {
     if ((min < 0.0 || surf_mins[i] < min)
@@ -655,19 +643,10 @@ double surf_solve(double max_date)
   XBT_DEBUG("Duration set to %f", min);
 
   NOW = 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 {
-    /* FIXME: model_list or model_list_invoke? revisit here later */
-    /* sequential version */
-    xbt_dynar_foreach(model_list, iter, model) {
-      surf_update_actions_state(model);
-    }
+  /* FIXME: model_list or model_list_invoke? revisit here later */
+  /* sequential version */
+  xbt_dynar_foreach(model_list, iter, model) {
+    surf_update_actions_state(model);
   }
 
 #ifdef HAVE_TRACING
@@ -700,44 +679,6 @@ static void surf_update_actions_state(surf_model_t model)
   model->model_private->update_actions_state(model, 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;
-}
-
 /* This function is a pimple that we ought to fix. But it won't be easy.
  *
  * The surf_solve() function does properly return the set of actions that changed.