Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authoretortilopez <ruben-ezequiel.torti-lopez@inria.fr>
Wed, 22 Oct 2014 13:46:28 +0000 (15:46 +0200)
committeretortilopez <ruben-ezequiel.torti-lopez@inria.fr>
Wed, 22 Oct 2014 13:46:28 +0000 (15:46 +0200)
src/simix/smx_context_raw.c

index 942dc83..3b0a76b 100644 (file)
@@ -28,8 +28,7 @@ static xbt_parmap_t raw_parmap;
 static smx_ctx_raw_t* raw_workers_context;    /* space to save the worker context in each thread */
 static unsigned long raw_threads_working;     /* number of threads that have started their work */
 static xbt_os_thread_key_t raw_worker_id_key; /* thread-specific storage for the thread id */
-#endif
-
+#endif 
 #ifdef ADAPTIVE_THRESHOLD
 #define SCHED_ROUND_LIMIT 5
 xbt_os_timer_t round_time;
@@ -44,13 +43,12 @@ double delta=0;
 double s_par_proc=0,s_seq_proc=0; /*Standard deviation of number of processes computed in par/seq during the current simulation*/
 double avg_par_proc=0,sd_par_proc=0;
 double avg_seq_proc=0,sd_seq_proc=0;
-double par_window=HUGE_VAL,seq_window=0; /*par_window is initially 1<<32*/
+long long par_window=(long long)HUGE_VAL,seq_window=0;
 #endif
 
 static unsigned long raw_process_index = 0;   /* index of the next process to run in the
                                                * list of runnable processes */
 static smx_ctx_raw_t raw_maestro_context;
-
 extern raw_stack_t raw_makecontext(char* malloced_stack, int stack_size,
                                    rawctx_entry_point_t entry_point, void* arg);
 extern void raw_swapcontext(raw_stack_t* old, raw_stack_t new);
@@ -628,13 +626,14 @@ static void smx_ctx_raw_runall(void)
     }
   }
 
+  //XBT_CRITICAL("Thresh: %d", SIMIX_context_get_parallel_threshold());
   if (nb_processes >= SIMIX_context_get_parallel_threshold()) {
     simix_global->context_factory->suspend = smx_ctx_raw_suspend_parallel;
     if(nb_processes < par_window){ 
       par_sched_round++;
-      xbt_os_cputimer_start(round_time);
+      xbt_os_walltimer_start(round_time);
       smx_ctx_raw_runall_parallel();
-      xbt_os_cputimer_stop(round_time);
+      xbt_os_walltimer_stop(round_time);
       par_time += xbt_os_timer_elapsed(round_time);
 
       prev_avg_par_proc = avg_par_proc;
@@ -657,9 +656,9 @@ static void smx_ctx_raw_runall(void)
     simix_global->context_factory->suspend = smx_ctx_raw_suspend_serial;
     if(nb_processes > seq_window){ 
       seq_sched_round++;
-      xbt_os_cputimer_start(round_time);
+      xbt_os_walltimer_start(round_time);
       smx_ctx_raw_runall_serial();
-      xbt_os_cputimer_stop(round_time);
+      xbt_os_walltimer_stop(round_time);
       seq_time += xbt_os_timer_elapsed(round_time);
 
       prev_avg_seq_proc = avg_seq_proc;
@@ -696,13 +695,13 @@ static void smx_ctx_raw_runall(void)
         simix_global->context_factory->suspend = smx_ctx_raw_suspend_parallel;
 
      #ifdef TIME_BENCH_ENTIRE_SRS
-        xbt_os_cputimer_start(timer);
+        xbt_os_walltimer_start(timer);
      #endif
 
         smx_ctx_raw_runall_parallel();
 
      #ifdef TIME_BENCH_ENTIRE_SRS
-        xbt_os_cputimer_stop(timer);
+        xbt_os_walltimer_stop(timer);
         elapsed = xbt_os_timer_elapsed(timer);
      #endif
     } else {
@@ -714,13 +713,13 @@ static void smx_ctx_raw_runall(void)
       #else
 
         #ifdef TIME_BENCH_ENTIRE_SRS
-          xbt_os_cputimer_start(timer);
+          xbt_os_walltimer_start(timer);
         #endif
 
         smx_ctx_raw_runall_serial();
 
         #ifdef TIME_BENCH_ENTIRE_SRS
-          xbt_os_cputimer_stop(timer);
+          xbt_os_walltimer_stop(timer);
           elapsed = xbt_os_timer_elapsed(timer);
         #endif
       #endif