Cosmetics: rename message types, INFO -> CTRL, and LOAD -> DATA.

diff --git a/communicator.cpp b/communicator.cpp
index e6a47b4a81e3d7e7ec9662e753982931fb5674e2..2ddea5d65c0fdb16b1ec1849ce320681e8d5f2d5 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -55,7 +55,7 @@ msg_comm_t communicator::real_send(const char* dest, message* msg)
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);
     m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);
     TRACE_msg_set_task_category(task,
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);
     m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);
     TRACE_msg_set_task_category(task,

-                                msg->get_type() == message::LOAD ?
+                                msg->get_type() == message::DATA ?

                                 TRACE_CAT_DATA : TRACE_CAT_CTRL);
     return MSG_task_isend(task, dest);
 }
                                 TRACE_CAT_DATA : TRACE_CAT_CTRL);
     return MSG_task_isend(task, dest);
 }

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;

diff --git a/messages.h b/messages.h
index 1906fdf9b5cd87edaa67ddabdcf0c5be1968e4bd..1886301fc1560c835551c6cc7e4774787292df46 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -9,7 +9,7 @@
 
 class message {
 public:
 
 class message {
 public:

-    enum message_type { INFO, LOAD, CTRL_CLOSE, DATA_CLOSE };
+    enum message_type { CTRL, DATA, CTRL_CLOSE, DATA_CLOSE };

 
     message(message_type t, double a, double c = 0.0);
 
 
     message(message_type t, double a, double c = 0.0);
 

diff --git a/process.cpp b/process.cpp
index 491898d4fae320f56be3f20a2931e0d1fc98bda8..11129e44bb3bb0f3ec413249493df4be51431f50 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -297,7 +297,7 @@ void process::ctrl_send(neighbor& nb)
         debt_to_send = 0.0;
     }
     if (info_to_send != prev_load_broadcast || debt_to_send > 0.0) {
         debt_to_send = 0.0;
     }
     if (info_to_send != prev_load_broadcast || debt_to_send > 0.0) {

-        message* msg = new message(message::INFO, info_to_send, debt_to_send);
+        message* msg = new message(message::CTRL, info_to_send, debt_to_send);

         add_ctrl_send_mesg(msg->get_size());
         comm.ctrl_send(nb.get_ctrl_mbox(), msg);
     }
         add_ctrl_send_mesg(msg->get_size());
         comm.ctrl_send(nb.get_ctrl_mbox(), msg);
     }


@@ -329,7 +329,7 @@ void process::data_send(neighbor& nb)
             amount = std::min(load_to_send, opt::max_transfer_amount);
         else
             amount = load_to_send;
             amount = std::min(load_to_send, opt::max_transfer_amount);
         else
             amount = load_to_send;

-        message* msg = new message(message::LOAD, amount);
+        message* msg = new message(message::DATA, amount);

         add_data_send_mesg(msg->get_size());
         comm.data_send(nb.get_data_mbox(), msg);
         load_to_send -= amount;
         add_data_send_mesg(msg->get_size());
         comm.data_send(nb.get_data_mbox(), msg);
         load_to_send -= amount;


@@ -377,13 +377,13 @@ void process::data_receive(double timeout)
 void process::handle_message(message* msg, m_host_t from)
 {
     switch (msg->get_type()) {
 void process::handle_message(message* msg, m_host_t from)
 {
     switch (msg->get_type()) {

-    case message::INFO: {
+    case message::CTRL: {

         neighbor* n = rev_neigh[from];
         n->set_load(msg->get_amount() + n->get_to_send());
         expected_load += msg->get_credit(); // may be 0.0 if !opt::bookkeeping
         break;
     }
         neighbor* n = rev_neigh[from];
         n->set_load(msg->get_amount() + n->get_to_send());
         expected_load += msg->get_credit(); // may be 0.0 if !opt::bookkeeping
         break;
     }

-    case message::LOAD: {
+    case message::DATA: {

         double ld = msg->get_amount();
         real_load += ld;
         if (finalizing)
         double ld = msg->get_amount();
         real_load += ld;
         if (finalizing)