Use git diff instead of diff-index for setlocalversion.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 811804fa81558253c282b3975751673e4d98f1da..38cec99c39da88882395f5a0ada5eade1b074c34 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -249,7 +249,7 @@ void process::compute_loop()
         idle_duration += MSG_get_clock() - idle_since_date;
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
         idle_duration += MSG_get_clock() - idle_since_date;
         ++comp_iter;
         double flops = opt::comp_cost(real_load);

-        msg_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+        msg_task_t task = MSG_task_create("computation", flops, 0.0, nullptr);

         // MSG_task_set_category(task, TRACE_CAT_COMP);
         XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
         // MSG_task_set_category(task, TRACE_CAT_COMP);
         XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);


@@ -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;