Rename process::send() -> process::send_all().

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 80fd618e2e2f2153af4b44269a771d89a41de88b..a0447de98c2f582b4c21dd3adec00597973414a4 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 "misc.h"
 #include "options.h"

+#include "tracing.h"

 
 #include "process.h"
 
 
 #include "process.h"
 


@@ -35,7 +36,7 @@ process::process(int argc, char* argv[])
 
     comp = 0.0;
 
 
     comp = 0.0;
 

-    prev_load_broadcast = -1;   // force sending of load on first send()
+    prev_load_broadcast = -1;   // force sending of load on first send_all()

     expected_load = load;
     total_load_running += load;
     total_load_init += load;
     expected_load = load;
     total_load_running += load;
     total_load_init += load;


@@ -63,6 +64,17 @@ process::process(int argc, char* argv[])
 process::~process()
 {
     total_load_exit += load;
 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()
 }
 
 int process::run()


@@ -97,7 +109,7 @@ int process::run()
         lb_load() = ld;
 
         // send load information, and load (data) if any
         lb_load() = ld;
 
         // send load information, and load (data) if any

-        send();
+        send_all();

         if (load > 0.0) {
             ++comp_iter;
             compute();
         if (load > 0.0) {
             ++comp_iter;
             compute();


@@ -160,16 +172,6 @@ int process::run()
      */
 
     VERB0("Done.");
      */
 
     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;
 }
 
     return 0;
 }
 


@@ -196,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);
     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;
         DEBUG2("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
         comp += flops;


@@ -245,7 +248,7 @@ void process::send1_bookkeeping(neighbor& nb)
         comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
 }
 
         comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
 }
 

-void process::send()
+void process::send_all()

 {
     using std::tr1::bind;
     using std::tr1::placeholders::_1;
 {
     using std::tr1::bind;
     using std::tr1::placeholders::_1;