snake_case s4u::Comm

diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp
index 35d601a..b39f8ba 100644 (file)
--- a/include/simgrid/s4u/Comm.hpp
+++ b/include/simgrid/s4u/Comm.hpp
@@ -83,27 +83,54 @@ public:
   }
 
   /** Sets the maximal communication rate (in byte/sec). Must be done before start */
-  Activity* setRate(double rate);
+  Activity* set_rate(double rate);
 
   /** Specify the data to send */
-  Activity* setSrcData(void* buff);
+  Activity* set_src_data(void* buff);
   /** Specify the size of the data to send */
-  Activity* setSrcDataSize(size_t size);
+  Activity* set_src_data_size(size_t size);
   /** Specify the data to send and its size */
-  Activity* setSrcData(void* buff, size_t size);
+  Activity* set_src_data(void* buff, size_t size);
 
   /** Specify where to receive the data */
-  Activity* setDstData(void** buff);
+  Activity* set_dst_data(void** buff);
   /** Specify the buffer in which the data should be received */
-  Activity* setDstData(void** buff, size_t size);
+  Activity* set_dst_data(void** buff, size_t size);
   /** Retrieve the size of the received data */
-  size_t getDstDataSize();
+  size_t get_dst_data_size();
 
   bool test();
   Activity* cancel();
 
   /** Retrieve the mailbox on which this comm acts */
-  MailboxPtr getMailbox();
+  MailboxPtr get_mailbox();
+
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_rate()") Activity* setRate(double rate) { return set_rate(rate); }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_src_data()") Activity* setSrcData(void* buff)
+  {
+    return set_src_data(buff);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_src_data()") Activity* setSrcData(void* buff, size_t size)
+  {
+    return set_src_data(buff, size);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_src_data_size()") Activity* setSrcDataSize(size_t size)
+  {
+    return set_src_data_size(size);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_dst_data()") Activity* setDstData(void** buff)
+  {
+    return set_dst_data(buff);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_dst_data()") Activity* setDstData(void** buff, size_t size)
+  {
+    return set_dst_data(buff, size);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_dst_data_size()") size_t getDstDataSize()
+  {
+    return get_dst_data_size();
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") MailboxPtr getMailbox() { return get_mailbox(); }
 
 private:
   double rate_        = -1;

diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp
index f06a6d4..2bcaeea 100644 (file)
--- a/src/plugins/vm/VmLiveMigration.cpp
+++ b/src/plugins/vm/VmLiveMigration.cpp
@@ -104,7 +104,7 @@ sg_size_t MigrationTx::sendMigrationData(sg_size_t size, int stage, int stage2_r
   s4u::Activity* comm = nullptr;
   try {
     if (mig_speed > 0)
-      comm = mbox->put_init(msg, size)->setRate(mig_speed)->wait(timeout);
+      comm = mbox->put_init(msg, size)->set_rate(mig_speed)->wait(timeout);
     else
       comm = mbox->put_async(msg, size)->wait();
   } catch (xbt_ex& e) {

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 9e068cc..693f062 100644 (file)
--- a/src/s4u/s4u_comm.cpp
+++ b/src/s4u/s4u_comm.cpp
@@ -25,27 +25,27 @@ Comm::~Comm()
   }
 }
 
-Activity* Comm::setRate(double rate)
+Activity* Comm::set_rate(double rate)
 {
   xbt_assert(state_ == State::inited);
   rate_ = rate;
   return this;
 }
 
-Activity* Comm::setSrcData(void* buff)
+Activity* Comm::set_src_data(void* buff)
 {
   xbt_assert(state_ == State::inited);
   xbt_assert(dstBuff_ == nullptr, "Cannot set the src and dst buffers at the same time");
   srcBuff_ = buff;
   return this;
 }
-Activity* Comm::setSrcDataSize(size_t size)
+Activity* Comm::set_src_data_size(size_t size)
 {
   xbt_assert(state_ == State::inited);
   srcBuffSize_ = size;
   return this;
 }
-Activity* Comm::setSrcData(void* buff, size_t size)
+Activity* Comm::set_src_data(void* buff, size_t size)
 {
   xbt_assert(state_ == State::inited);
 
@@ -54,18 +54,19 @@ Activity* Comm::setSrcData(void* buff, size_t size)
   srcBuffSize_ = size;
   return this;
 }
-Activity* Comm::setDstData(void** buff)
+Activity* Comm::set_dst_data(void** buff)
 {
   xbt_assert(state_ == State::inited);
   xbt_assert(srcBuff_ == nullptr, "Cannot set the src and dst buffers at the same time");
   dstBuff_ = buff;
   return this;
 }
-size_t Comm::getDstDataSize(){
+size_t Comm::get_dst_data_size()
+{
   xbt_assert(state_ == State::finished);
   return dstBuffSize_;
 }
-Activity* Comm::setDstData(void** buff, size_t size)
+Activity* Comm::set_dst_data(void** buff, size_t size)
 {
   xbt_assert(state_ == State::inited);
 
@@ -177,7 +178,7 @@ bool Comm::test()
   return false;
 }
 
-MailboxPtr Comm::getMailbox()
+MailboxPtr Comm::get_mailbox()
 {
   return mailbox_;
 }

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index bdb69d3..b8d0cf1 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -98,7 +98,7 @@ void Mailbox::put(void* payload, uint64_t simulatedSize)
 
   CommPtr c = put_init();
   c->set_remaining(simulatedSize);
-  c->setSrcData(payload);
+  c->set_src_data(payload);
   c->wait();
 }
 /** Blocking send with timeout */
@@ -108,7 +108,7 @@ void Mailbox::put(void* payload, uint64_t simulatedSize, double timeout)
 
   CommPtr c = put_init();
   c->set_remaining(simulatedSize);
-  c->setSrcData(payload);
+  c->set_src_data(payload);
   // c->start() is optional.
   c->wait(timeout);
 }
@@ -123,7 +123,7 @@ s4u::CommPtr Mailbox::get_init()
 s4u::CommPtr Mailbox::get_async(void** data)
 {
   s4u::CommPtr res = get_init();
-  res->setDstData(data, sizeof(*data));
+  res->set_dst_data(data, sizeof(*data));
   res->start();
   return res;
 }
@@ -132,7 +132,7 @@ void* Mailbox::get()
 {
   void* res = nullptr;
   CommPtr c = get_init();
-  c->setDstData(&res, sizeof(res));
+  c->set_dst_data(&res, sizeof(res));
   c->wait();
   return res;
 }
@@ -140,7 +140,7 @@ void* Mailbox::get(double timeout)
 {
   void* res = nullptr;
   CommPtr c = get_init();
-  c->setDstData(&res, sizeof(res));
+  c->set_dst_data(&res, sizeof(res));
   c->wait(timeout);
   return res;
 }