Changeset 6fee21 for src/base/timer.cpp

Timestamp:

May 2, 2012, 1:36:51 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

49f8653

Parents:

759a6a

Message:

Timer::PrintGlobal is now less vulnerable to different processes having different sets of timing entities.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1781 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/base/timer.cpp (modified) (1 diff)

src/base/timer.cpp

@@ -177 +177 @@
   comm.PrintStringOnce("Running times (global):");
 
-  for (iter=Timer::td.begin(); iter!=Timer::td.end(); ++iter) {
-    std::strcpy(name, iter->first.c_str());
-    MPI_Bcast(name, 80, MPI_CHAR, 0, MPI_COMM_WORLD);
-    MPI_Gather(&Timer::td[name].duration, 1, MPI_DOUBLE, times, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
-    MPI_Gather(&Timer::td[name].total, 1, MPI_INT, calls, 1, MPI_INT, 0, MPI_COMM_WORLD);
-
-    if (rank == 0) {
-      int min_calls, max_calls;
-      vmg_float avg_calls;
-      vmg_float min_duration, max_duration, avg_duration;
-      int rank_min_calls, rank_max_calls, rank_min_duration, rank_max_duration;
-
-      min_duration = min(times, size, rank_min_duration);
-      max_duration = max(times, size, rank_max_duration);
-      avg_duration = avg(times, size);
-      min_calls = min(calls, size, rank_min_calls);
-      max_calls = max(calls, size, rank_max_calls);
-      avg_calls = avg(calls, size);
-
-      comm.PrintStringOnce("  %s: %e s (%d)", iter->first.c_str(), iter->second.duration, iter->second.total);
-      comm.PrintStringOnce("    Min: %e s @ %d", min_duration, rank_min_duration);
-      comm.PrintStringOnce("    Max: %e s @ %d", max_duration, rank_max_duration);
-      comm.PrintStringOnce("    Avg: %e s", avg_duration);
-      comm.PrintStringOnce("    Min calls: %d @ %d", min_calls, rank_min_calls);
-      comm.PrintStringOnce("    Max calls: %d @ %d", max_calls, rank_max_calls);
-      comm.PrintStringOnce("    Avg calls: %f", avg_calls);
+  int timer_size = Timer::td.size();
+  MPI_Bcast(timer_size, 1, MPI_INT, 0, MPI_COMM_WORLD);
+
+  if (rank == 0) {
+      for (iter=Timer::td.begin(); iter!=Timer::td.end(); ++iter) {
+        std::strcpy(name, iter->first.c_str());
+        MPI_Bcast(name, 80, MPI_CHAR, 0, MPI_COMM_WORLD);
+        MPI_Gather(&Timer::td[name].duration, 1, MPI_DOUBLE, times, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
+        MPI_Gather(&Timer::td[name].total, 1, MPI_INT, calls, 1, MPI_INT, 0, MPI_COMM_WORLD);
+
+        int min_calls, max_calls;
+        vmg_float avg_calls;
+        vmg_float min_duration, max_duration, avg_duration;
+        int rank_min_calls, rank_max_calls, rank_min_duration, rank_max_duration;
+
+        min_duration = min(times, size, rank_min_duration);
+        max_duration = max(times, size, rank_max_duration);
+        avg_duration = avg(times, size);
+        min_calls = min(calls, size, rank_min_calls);
+        max_calls = max(calls, size, rank_max_calls);
+        avg_calls = avg(calls, size);
+
+        comm.PrintStringOnce("  %s: %e s (%d)", iter->first.c_str(), iter->second.duration, iter->second.total);
+        comm.PrintStringOnce("    Min: %e s @ %d", min_duration, rank_min_duration);
+        comm.PrintStringOnce("    Max: %e s @ %d", max_duration, rank_max_duration);
+        comm.PrintStringOnce("    Avg: %e s", avg_duration);
+        comm.PrintStringOnce("    Min calls: %d @ %d", min_calls, rank_min_calls);
+        comm.PrintStringOnce("    Max calls: %d @ %d", max_calls, rank_max_calls);
+        comm.PrintStringOnce("    Avg calls: %f", avg_calls);
+    }
+  }else {
+    for (int i=0; i<timer_size; ++i) {
+      MPI_Bcast(name, 80, MPI_CHAR, 0, MPI_COMM_WORLD);
+      MPI_Gather(&Timer::td[name].duration, 1, MPI_DOUBLE, times, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
+      MPI_Gather(&Timer::td[name].total, 1, MPI_INT, calls, 1, MPI_INT, 0, MPI_COMM_WORLD);
     }
   }