From 0e99de43ec10a2f793478999e7b092458cc642b9 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Fri, 4 Feb 2022 10:25:03 +0100 Subject: [PATCH] stay with double for payload size (fix 32bit issues? --- src/kernel/actor/SimcallObserver.hpp | 6 +++--- src/s4u/s4u_Comm.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp index a009e6be7f..633f7e3bc4 100644 --- a/src/kernel/actor/SimcallObserver.hpp +++ b/src/kernel/actor/SimcallObserver.hpp @@ -246,7 +246,7 @@ public: class CommIsendSimcall : public ResultingSimcall { activity::MailboxImpl* mbox_; - size_t payload_size_; + double payload_size_; double rate_; unsigned char* src_buff_; size_t src_buff_size_; @@ -258,7 +258,7 @@ public: void (*clean_fun_)(void*); // used to free the synchro in case of problem after a detached send void (*copy_data_fun_)(activity::CommImpl*, void*, size_t); // used to copy data if not default one - CommIsendSimcall(ActorImpl* actor, activity::MailboxImpl* mbox, size_t payload_size, double rate, + CommIsendSimcall(ActorImpl* actor, activity::MailboxImpl* mbox, double payload_size, double rate, unsigned char* src_buff, size_t src_buff_size, bool (*match_fun)(void*, void*, activity::CommImpl*), void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send void (*copy_data_fun)(activity::CommImpl*, void*, size_t), // used to copy data if not default one @@ -288,7 +288,7 @@ public: return SimcallObserver::dot_label(times_considered) + "iSend"; } activity::MailboxImpl* get_mailbox() const { return mbox_; } - size_t get_payload_size() const { return payload_size_; } + double get_payload_size() const { return payload_size_; } double get_rate() const { return rate_; } unsigned char* get_src_buff() const { return src_buff_; } size_t get_src_buff_size() const { return src_buff_size_; } diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index 6ae30c06bc..c77b32a0e8 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -221,7 +221,7 @@ Comm* Comm::start() on_send(*this); kernel::actor::CommIsendSimcall observer{sender_, mailbox_->get_impl(), - static_cast(remains_), + remains_, rate_, static_cast(src_buff_), src_buff_size_, -- 2.20.1