Cosmetics: declare condition_t as friend of mutex_t.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 2eed581f2bcab777938f898947112893105b4dca..fd19f6b979657881f082d09e7bc0ea8a480a3ac2 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -14,10 +14,10 @@ message::message(message_type t, double a, double c)
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {

-    case INFO:
+    case CTRL:

         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;
         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;

-    case LOAD:
+    case DATA:

         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:
         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:


@@ -28,7 +28,7 @@ message::message(message_type t, double a, double c)
 
 std::string message::to_string()
 {
 
 std::string message::to_string()
 {

-    static const char* str[DATA_CLOSE + 1] = { "INFO", "LOAD",
+    static const char* str[DATA_CLOSE + 1] = { "CTRL", "DATA",

                                                "CTRL_CLOSE", "DATA_CLOSE" };
     std::ostringstream oss;
     oss << str[type] << ": " << amount;
                                                "CTRL_CLOSE", "DATA_CLOSE" };
     std::ostringstream oss;
     oss << str[type] << ": " << amount;