GPU Workflow: Fix API usage of fairmq message

Author: davidrohr

GPU/Workflow/src/GPUWorkflowPipeline.cxx

@@ -199,15 +199,17 @@ int32_t GPURecoWorkflowSpec::handlePipeline(ProcessingContext& pc, GPUTrackingIn
     }
 
     size_t prepareBufferSize = sizeof(pipelinePrepareMessage) + ptrsTotal * sizeof(size_t) * 4;
-    std::vector<size_t> messageBuffer(prepareBufferSize / sizeof(size_t));
-    pipelinePrepareMessage& preMessage = *(pipelinePrepareMessage*)messageBuffer.data();
+    fair::mq::MessagePtr payload(device->NewMessage());
+    payload->Rebuild(prepareBufferSize, fair::mq::Alignment(sizeof(size_t)));
+    auto* messageBuffer = (size_t*)payload->GetData();
+    pipelinePrepareMessage& preMessage = *(pipelinePrepareMessage*)messageBuffer;
     preMessage.magicWord = preMessage.MAGIC_WORD;
     preMessage.timeSliceId = tinfo.timeslice;
     preMessage.pointersTotal = ptrsTotal;
     preMessage.flagEndOfStream = false;
     memcpy((void*)&preMessage.tfSettings, (const void*)ptrs.settingsTF, sizeof(preMessage.tfSettings));
 
-    size_t* ptrBuffer = messageBuffer.data() + sizeof(preMessage) / sizeof(size_t);
+    size_t* ptrBuffer = messageBuffer + sizeof(preMessage) / sizeof(size_t);
     size_t ptrsCopied = 0;
     int32_t lastRegion = -1;
     for (uint32_t i = 0; i < GPUTrackingInOutZS::NSECTORS; i++) {
@@ -238,9 +240,7 @@ int32_t GPURecoWorkflowSpec::handlePipeline(ProcessingContext& pc, GPUTrackingIn
     }
 
     auto channel = device->GetChannels().find("gpu-prepare-channel");
-    fair::mq::MessagePtr payload(device->NewMessage());
     LOG(info) << "Sending gpu-reco-workflow prepare message of size " << prepareBufferSize;
-    payload->Rebuild(messageBuffer.data(), prepareBufferSize, nullptr, nullptr);
     channel->second[0].Send(payload);
     return 2;
   }
@@ -255,12 +255,13 @@ void GPURecoWorkflowSpec::handlePipelineEndOfStream(EndOfStreamContext& ec)
   }
   if (mSpecConfig.enableDoublePipeline == 2) {
     auto* device = ec.services().get<RawDeviceService>().device();
-    pipelinePrepareMessage preMessage;
-    preMessage.flagEndOfStream = true;
-    auto channel = device->GetChannels().find("gpu-prepare-channel");
     fair::mq::MessagePtr payload(device->NewMessage());
+    payload->Rebuild(sizeof(pipelinePrepareMessage), fair::mq::Alignment(alignof(pipelinePrepareMessage)));
+    auto* preMessage = (pipelinePrepareMessage*)payload->GetData();
+    new (preMessage) pipelinePrepareMessage;
+    preMessage->flagEndOfStream = true;
+    auto channel = device->GetChannels().find("gpu-prepare-channel");
     LOG(info) << "Sending end-of-stream message over out-of-bands channel";
-    payload->Rebuild(&preMessage, sizeof(preMessage), nullptr, nullptr);
     channel->second[0].Send(payload);
   }
 }