#2063: Update void* to std::byte* in Payload Envelope

DARMA-tasking · Mar 14, 2024 · 2a8ffcd · 2a8ffcd
1 parent 919688d
commit 2a8ffcd
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/src/vt/group/msg/group_msg.h b/src/vt/group/msg/group_msg.h
@@ -129,13 +129,13 @@ struct GroupListMsg : GroupInfoMsg<GroupMsg<::vt::PayloadMessage>> {
       )
   {
     setPut(
-      in_range->getBound(),
+      reinterpret_cast<const std::byte*>(in_range->getBound()),
       in_range->getSize() * sizeof(RangeType::BoundType)
     );
   }
 
   RangeType getRange() {
-    auto const& ptr = static_cast<RangeType::BoundType*>(getPut());
+    auto const& ptr = reinterpret_cast<RangeType::BoundType*>(getPut());
     return region::ShallowList(ptr, getCount());
   }
 };

diff --git a/src/vt/messaging/active.cc b/src/vt/messaging/active.cc
@@ -1100,7 +1100,7 @@ void ActiveMessenger::finishPendingActiveMsgAsyncRecv(InProgressIRecv* irecv) {
         );
       }
 
-      envelopeSetPutPtrOnly(msg->env, put_ptr);
+      envelopeSetPutPtrOnly(msg->env, reinterpret_cast<std::byte*>(put_ptr));
       put_finished = true;
     } else {
       /*bool const put_delivered = */recvDataMsg(

diff --git a/src/vt/messaging/envelope/payload_envelope.h b/src/vt/messaging/envelope/payload_envelope.h
@@ -50,8 +50,8 @@ namespace vt {
 
 /** \file */
 
-using PutPtrType = void*;
-using PutPtrConstType = void const*;
+using PutPtrType = std::byte*;
+using PutPtrConstType = std::byte const*;
 using PutEnvSizeType = size_t;
 using PutUnderEnvelopeT = EpochTagEnvelope;
 
@@ -64,7 +64,7 @@ using PutUnderEnvelopeT = EpochTagEnvelope;
 template <typename EnvelopeT, typename SizeT>
 struct PutEnvelope {
   using isByteCopyable = std::true_type;
-  using PtrType = void*;
+  using PtrType = std::byte*;
   using EnvSizeType = SizeT;
   using UnderEnvelopeT = EnvelopeT;
 

diff --git a/src/vt/messaging/message/put_message.h b/src/vt/messaging/message/put_message.h
@@ -52,10 +52,10 @@ namespace vt { namespace messaging {
 
 template <typename MessageT>
 struct PutMessageComponent : MessageT {
-  void setPut(void const* const ptr, size_t const size) {
+  void setPut(std::byte const* const ptr, size_t const size) {
     envelopeSetPutPtr(MessageT::env, ptr, size);
   }
-  void* getPut() {
+  std::byte* getPut() {
     return envelopeGetPutPtr(MessageT::env);
   }
   size_t getPutSize() {

diff --git a/tests/unit/active/test_active_bcast_put.cc b/tests/unit/active/test_active_bcast_put.cc
@@ -82,7 +82,7 @@ struct TestActiveBroadcastPut : TestParameterHarnessNode {
       fmt::print("{}: test_handler: cnt={}\n", this_node, handler_count);
     #endif
 
-    auto const ptr = static_cast<int*>(msg->getPut());
+    auto const ptr = reinterpret_cast<int*>(msg->getPut());
     auto const size = msg->getPutSize();
 
     #if DEBUG_TEST_HARNESS_PRINT || 1
@@ -126,7 +126,7 @@ TEST_P(TestActiveBroadcastPut, test_type_safe_active_fn_bcast2) {
       if (my_node == root) {
         for (int i = 0; i < num_msg_sent; i++) {
           auto msg = makeMessage<PutTestMessage>();
-          msg->setPut(put_payload.data(), put_size * sizeof(int));
+          msg->setPut(reinterpret_cast<std::byte*>(put_payload.data()), put_size * sizeof(int));
           theMsg()->broadcastMsg<test_handler>(msg);
         }
       }

diff --git a/tests/unit/active/test_active_send.cc b/tests/unit/active/test_active_send.cc
@@ -94,7 +94,7 @@ struct TestActiveSend : TestParallelHarness {
   }
 
   static void test_handler_small_put(PutTestMessage* msg) {
-    auto ptr = static_cast<int*>(msg->getPut());
+    auto ptr = reinterpret_cast<int*>(msg->getPut());
     auto size = msg->getPutSize();
     #if DEBUG_TEST_HARNESS_PRINT
       auto const& this_node = theContext()->getNode();
@@ -109,7 +109,7 @@ struct TestActiveSend : TestParallelHarness {
   }
 
   static void test_handler_large_put(PutTestMessage* msg) {
-    auto ptr = static_cast<int*>(msg->getPut());
+    auto ptr = reinterpret_cast<int*>(msg->getPut());
     auto size = msg->getPutSize();
     #if DEBUG_TEST_HARNESS_PRINT
       auto const& this_node = theContext()->getNode();
@@ -190,7 +190,7 @@ TEST_F(TestActiveSend, test_type_safe_active_fn_send_small_put) {
   if (my_node == from_node) {
     for (int i = 0; i < num_msg_sent; i++) {
       auto msg = makeMessage<PutTestMessage>();
-      msg->setPut(test_vec.data(), sizeof(int)*test_vec.size());
+      msg->setPut(reinterpret_cast<std::byte*>(test_vec.data()), sizeof(int)*test_vec.size());
       #if DEBUG_TEST_HARNESS_PRINT
         fmt::print("{}: sendMsg: (put) i={}\n", my_node, i);
       #endif
@@ -215,7 +215,7 @@ TEST_F(TestActiveSend, test_type_safe_active_fn_send_large_put) {
   if (my_node == from_node) {
     for (int i = 0; i < num_msg_sent; i++) {
       auto msg = makeMessage<PutTestMessage>();
-      msg->setPut(test_vec_2.data(), sizeof(int)*test_vec_2.size());
+      msg->setPut(reinterpret_cast<std::byte*>(test_vec_2.data()), sizeof(int)*test_vec_2.size());
       #if DEBUG_TEST_HARNESS_PRINT
         fmt::print("{}: sendMsg: (put) i={}\n", my_node, i);
       #endif

diff --git a/tests/unit/active/test_active_send_put.cc b/tests/unit/active/test_active_send_put.cc
@@ -71,7 +71,7 @@ struct TestActiveSendPut : TestParameterHarnessNode {
   }
 
   static void test_handler(PutTestMessage* msg) {
-    auto ptr = static_cast<int*>(msg->getPut());
+    auto ptr = reinterpret_cast<int*>(msg->getPut());
     auto size = msg->getPutSize();
     #if DEBUG_TEST_HARNESS_PRINT
       auto const& this_node = theContext()->getNode();
@@ -109,7 +109,7 @@ TEST_P(TestActiveSendPut, test_active_fn_send_put_param) {
     auto msg = makeMessage<PutTestMessage>(
       static_cast<int>(test_vec_2.size())
     );
-    msg->setPut(test_vec_2.data(), sizeof(int)*test_vec_2.size());
+    msg->setPut(reinterpret_cast<std::byte*>(test_vec_2.data()), sizeof(int)*test_vec_2.size());
     #if DEBUG_TEST_HARNESS_PRINT
       fmt::print("{}: sendMsg: (put) i={}\n", my_node, i);
     #endif