Convert message_type to enum class.

diff --git a/messages.cpp b/messages.cpp
index 70e2236198839f8d53a56b918483646658b7fe66..e20c4cac306c95c8fb0557ccf8937579b924f25a 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 CTRL:
+    case message_type::CTRL:

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

-    case DATA:
+    case message_type::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:


@@ -30,22 +30,22 @@ std::string message::to_string()
 {
     std::ostringstream oss;
     switch (type) {
 {
     std::ostringstream oss;
     switch (type) {

-    case CTRL:
+    case message_type::CTRL:

         oss << "CTRL: " << amount << " (info)";
         if (opt::bookkeeping)
             oss << "; " << credit << " (credit)";
         break;
         oss << "CTRL: " << amount << " (info)";
         if (opt::bookkeeping)
             oss << "; " << credit << " (credit)";
         break;

-    case DATA:
+    case message_type::DATA:

         oss << "DATA: " << amount << " (load)";
         break;
         oss << "DATA: " << amount << " (load)";
         break;

-    case CTRL_CLOSE:
+    case message_type::CTRL_CLOSE:

         oss << "CTRL_CLOSE";
         break;
         oss << "CTRL_CLOSE";
         break;

-    case DATA_CLOSE:
+    case message_type::DATA_CLOSE:

         oss << "DATA_CLOSE";
         break;
     default:
         oss << "DATA_CLOSE";
         break;
     default:

-        oss << "UNKNOWN MESSAGE TYPE: " << type;
+        oss << "UNKNOWN MESSAGE TYPE: " << static_cast<int>(type);

         break;
     }
     return oss.str();
         break;
     }
     return oss.str();

diff --git a/messages.h b/messages.h
index 925047dbbe4e214737ff24f6e9e18a81beb9f29b..02859c975c05089442b8182b65978454ca1bf4e3 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -10,7 +10,7 @@
 
 class message {
 public:
 
 class message {
 public:

-    enum message_type { CTRL, DATA, CTRL_CLOSE, DATA_CLOSE };
+    enum class 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 811804fa81558253c282b3975751673e4d98f1da..76082c5742f8f9a819ba95fb20ce689ffa981fdc 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -389,7 +389,8 @@ 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::CTRL, info_to_send, debt_to_send);
+        message* msg =
+            new message(message::message_type::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);
     }


@@ -436,7 +437,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::DATA, amount);
+        message* msg = new message(message::message_type::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;


@@ -445,12 +446,14 @@ void process::data_send(neighbor& nb)
 
 void process::ctrl_close(neighbor& nb)
 {
 
 void process::ctrl_close(neighbor& nb)
 {

-    comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));
+    comm.ctrl_send(nb.get_ctrl_mbox(),
+                   new message(message::message_type::CTRL_CLOSE, 0.0));

 }
 
 void process::data_close(neighbor& nb)
 {
 }
 
 void process::data_close(neighbor& nb)
 {

-    comm.data_send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0));
+    comm.data_send(nb.get_data_mbox(),
+                   new message(message::message_type::DATA_CLOSE, 0.0));

 }
 
 void process::ctrl_receive(double timeout)
 }
 
 void process::ctrl_receive(double timeout)


@@ -460,7 +463,7 @@ void process::ctrl_receive(double timeout)
 
     XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout);
     while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) {
 
     XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout);
     while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) {

-        if (msg->get_type() != message::CTRL_CLOSE)
+        if (msg->get_type() != message::message_type::CTRL_CLOSE)

             add_ctrl_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;
             add_ctrl_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;


@@ -474,7 +477,7 @@ void process::data_receive(double timeout)
 
     XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout);
     while (data_close_pending && comm.data_recv(msg, from, timeout)) {
 
     XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout);
     while (data_close_pending && comm.data_recv(msg, from, timeout)) {

-        if (msg->get_type() != message::DATA_CLOSE)
+        if (msg->get_type() != message::message_type::DATA_CLOSE)

             add_data_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;
             add_data_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;


@@ -484,7 +487,7 @@ void process::data_receive(double timeout)
 void process::handle_message(message* msg, msg_host_t from)
 {
     switch (msg->get_type()) {
 void process::handle_message(message* msg, msg_host_t from)
 {
     switch (msg->get_type()) {

-    case message::CTRL: {
+    case message::message_type::CTRL: {

         neighbor* n = rev_neigh[from];
         n->set_load(msg->get_amount() + n->get_to_send());
         if (opt::bookkeeping) {
         neighbor* n = rev_neigh[from];
         n->set_load(msg->get_amount() + n->get_to_send());
         if (opt::bookkeeping) {


@@ -494,18 +497,18 @@ void process::handle_message(message* msg, msg_host_t from)
         }
         break;
     }
         }
         break;
     }

-    case message::DATA: {
+    case message::message_type::DATA: {

         neighbor* n = rev_neigh[from];
         double ld = msg->get_amount();
         received_load += ld;
         n->set_credit(n->get_credit() - ld);
         break;
     }
         neighbor* n = rev_neigh[from];
         double ld = msg->get_amount();
         received_load += ld;
         n->set_credit(n->get_credit() - ld);
         break;
     }

-    case message::CTRL_CLOSE:
+    case message::message_type::CTRL_CLOSE:

         ctrl_close_pending--;
         close_received = true;
         break;
         ctrl_close_pending--;
         close_received = true;
         break;

-    case message::DATA_CLOSE:
+    case message::message_type::DATA_CLOSE:

         data_close_pending--;
         close_received = true;
         break;
         data_close_pending--;
         close_received = true;
         break;