Define class statistics for computing sum, mean, and standard deviation.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 0f535763510940caae9cf9373b36a83b4c1f0694..acd7aed7a9b37c523069dda420331f08c12b1b58 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -11,6 +11,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
 #include "misc.h"
 #include "options.h"
+#include "tracing.h"
 
 #include "process.h"
 
@@ -63,6 +64,17 @@ process::process(int argc, char* argv[])
 process::~process()
 {
     total_load_exit += load;
+    if (opt::bookkeeping) {
+        INFO4("Final load after %d:%d iterations: %g ; expected: %g",
+              lb_iter, comp_iter, load, expected_load);
+    } else {
+        INFO2("Final load after %d iterations: %g",
+              lb_iter, load);
+        if (lb_iter != comp_iter)
+            WARN2("lb_iter (%d) and comp_iter (%d) differ!",
+                  lb_iter, comp_iter);
+    }
+    VERB1("Total computation for this process: %g", comp);
 }
 
 int process::run()
@@ -72,18 +84,13 @@ int process::run()
     VERB0("Starting...");
     comp_iter = lb_iter = 0;
     while (true) {
-        if (opt::min_iter_duration) {
+        double ld = lb_load();
+        if (ld > 0.0) {
             double now = MSG_get_clock();
-            if (now < next_iter_after_date){
-                double delay = next_iter_after_date - now;
-                DEBUG1("sleeping for %g s", delay);
-                MSG_process_sleep(delay);
-            }
+            if (now < next_iter_after_date)
+                MSG_process_sleep(next_iter_after_date - now);
             next_iter_after_date = MSG_get_clock() + opt::min_iter_duration;
-        }
 
-        double ld = lb_load();
-        if (ld > 0.0) {
             ++lb_iter;
 
             if (opt::log_rate && lb_iter % opt::log_rate == 0) {
@@ -165,16 +172,6 @@ int process::run()
      */
 
     VERB0("Done.");
-    if (opt::bookkeeping) {
-        INFO4("Final load after %d:%d iterations: %g ; expected: %g",
-              lb_iter, comp_iter, load, expected_load);
-    } else {
-        INFO2("Final load after %d iterations: %g",
-              lb_iter, load);
-        if (lb_iter != comp_iter)
-            WARN2("lb_iter (%d) and comp_iter (%d) differ!",
-                  lb_iter, comp_iter);
-    }
     return 0;
 }
 
@@ -201,6 +198,7 @@ void process::compute()
     if (load > 0.0) {
         double flops = opt::comp_cost(load);
         m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+        TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
         DEBUG2("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
         comp += flops;