Revert "s4u: use size_t for payload size instead of int and double"

This reverts commit 0322a73bb9bb8b3285c6d7fce7e19a40e5025823.

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 67fcbd5..d0c8b54 100644 (file)
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -49,11 +49,11 @@ public:
   e_s4u_activity_state_t getState() {return state_;}
 
   /** Get the remaining amount of work that this Activity entails. When it's 0, it's done. */
-  size_t getRemains();
+  double getRemains();
   /** Set the [remaining] amount of work that this Activity will entail
    *
    * It is forbidden to change the amount of work once the Activity is started */
-  void setRemains(size_t remains);
+  void setRemains(double remains);
 
   /** Put some user data onto the Activity */
   void setUserData(void *data) {userData_=data;}
@@ -63,7 +63,7 @@ public:
 private:
   simgrid::kernel::activity::ActivityImplPtr pimpl_ = nullptr;
   e_s4u_activity_state_t state_ = inited;
-  size_t remains_                                   = 0;
+  double remains_ = 0;
   void *userData_ = nullptr;
 }; // class
 

diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp
index cc2b5c9..f7797dd 100644 (file)
--- a/include/simgrid/s4u/Mailbox.hpp
+++ b/include/simgrid/s4u/Mailbox.hpp
@@ -152,17 +152,14 @@ public:
   /** Creates (but don't start) an emission to that mailbox */
   CommPtr put_init();
   /** Creates (but don't start) an emission to that mailbox */
-  CommPtr put_init(void* payload, size_t simulatedSizeInBytes);
+  CommPtr put_init(void* data, int simulatedByteAmount);
   /** Creates and start an async emission to that mailbox */
-  CommPtr put_async(void* payload, size_t simulatedSizeInBytes);
+  CommPtr put_async(void* data, int simulatedByteAmount);
 
-  /** Blocking emission
-   *
-   * There is no deep-copy of the payload; the pointer is just copied to the receiving actor.
-   */
-  void put(void* payload, size_t simulatedSizeInBytes);
-  /** Blocking emission with timeout */
-  void put(void* payload, size_t simulatedSizeInBytes, double timeout);
+  /** Blocking put */
+  void put(void* payload, double simulatedSize);
+  /** Blocking put with timeout */
+  void put(void* payload, double simulatedSize, double timeout);
 
   /** Creates (but don't start) a reception onto that mailbox */
   CommPtr get_init();

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 0b24366..9f51fd5 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -229,12 +229,12 @@ SG_END_DECL()
 /************************** Comunication simcalls *****************************/
 
 XBT_PUBLIC(void)
-simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff,
+simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff,
                   size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
                   void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout);
 
 XBT_PUBLIC(smx_activity_t)
-simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff,
+simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff,
                    size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
                    void (*clean_fun)(void*), void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data,
                    int detached);

diff --git a/src/s4u/s4u_activity.cpp b/src/s4u/s4u_activity.cpp
index a9d29bd..157010d 100644 (file)
--- a/src/s4u/s4u_activity.cpp
+++ b/src/s4u/s4u_activity.cpp
@@ -15,8 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity,s4u,"S4U activities");
 namespace simgrid {
 namespace s4u {
 
-void Activity::setRemains(size_t remains)
-{
+void Activity::setRemains(double remains) {
   xbt_assert(state_ == inited, "Cannot change the remaining amount of work once the Activity is started");
   remains_ = remains;
 }

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index 1d28d1a..b29cfcd 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -73,7 +73,7 @@ CommPtr Mailbox::put_init()
   res->mailbox_ = this;
   return res;
 }
-s4u::CommPtr Mailbox::put_init(void* data, size_t simulatedSize)
+s4u::CommPtr Mailbox::put_init(void* data, int simulatedSize)
 {
   s4u::CommPtr res = put_init();
   res->setRemains(simulatedSize);
@@ -81,13 +81,13 @@ s4u::CommPtr Mailbox::put_init(void* data, size_t simulatedSize)
   res->srcBuffSize_ = sizeof(void*);
   return res;
 }
-s4u::CommPtr Mailbox::put_async(void* data, size_t simulatedSize)
+s4u::CommPtr Mailbox::put_async(void* data, int simulatedSize)
 {
   s4u::CommPtr res = put_init(data, simulatedSize);
   res->start();
   return res;
 }
-void Mailbox::put(void* payload, size_t simulatedSize)
+void Mailbox::put(void* payload, double simulatedSize)
 {
   CommPtr c = put_init();
   c->setRemains(simulatedSize);
@@ -95,7 +95,7 @@ void Mailbox::put(void* payload, size_t simulatedSize)
   c->wait();
 }
 /** Blocking send with timeout */
-void Mailbox::put(void* payload, size_t simulatedSize, double timeout)
+void Mailbox::put(void* payload, double simulatedSize, double timeout)
 {
   CommPtr c = put_init();
   c->setRemains(simulatedSize);

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 47b9266..fa7ef5b 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -307,7 +307,7 @@ e_smx_state_t simcall_process_sleep(double duration)
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff,
+void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff,
                        size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
                        void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout)
 {
@@ -335,7 +335,7 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size,
 /**
  * \ingroup simix_comm_management
  */
-smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff,
+smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff,
                                   size_t src_buff_size,
                                   int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
                                   void (*clean_fun)(void*), void (*copy_data_fun)(smx_activity_t, void*, size_t),