fix(shm): Handle pre-conditions

This commit is contained in:
Dennis Klein 2022-08-15 15:30:15 +02:00 committed by Alexey Rybalchenko
parent de8236491f
commit 904037d9be

View File

@ -11,8 +11,9 @@
#include "Common.h" #include "Common.h"
#include "Manager.h" #include "Manager.h"
#include "Message.h" #include "Message.h"
#include <fairmq/Socket.h> #include <fairmq/Error.h>
#include <fairmq/Message.h> #include <fairmq/Message.h>
#include <fairmq/Socket.h>
#include <fairmq/tools/Strings.h> #include <fairmq/tools/Strings.h>
#include <fairmq/zeromq/Common.h> #include <fairmq/zeromq/Common.h>
@ -125,16 +126,21 @@ class Socket final : public fair::mq::Socket
return zmq::Connect(fSocket, address, fId); return zmq::Connect(fSocket, address, fId);
} }
int64_t Send(MessagePtr& msg, int timeout = -1) override int64_t Send(mq::MessagePtr& msg, int timeout = -1) override
{ {
auto msgPtr = msg.get();
if (!msgPtr) {
return static_cast<int>(TransferCode::error);
}
assertm(dynamic_cast<shmem::Message*>(msgPtr), "given mq::Message is a shmem::Message"); // NOLINT
auto shmMsg = static_cast<shmem::Message*>(msgPtr); // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast)
int flags = 0; int flags = 0;
if (timeout == 0) { if (timeout == 0) {
flags = ZMQ_DONTWAIT; flags = ZMQ_DONTWAIT;
} }
int elapsed = 0; int elapsed = 0;
Message* shmMsg = static_cast<Message*>(msg.get());
while (true) { while (true) {
int nbytes = zmq_send(fSocket, &(shmMsg->fMeta), sizeof(MetaHeader), flags); int nbytes = zmq_send(fSocket, &(shmMsg->fMeta), sizeof(MetaHeader), flags);
if (nbytes > 0) { if (nbytes > 0) {
@ -213,7 +219,12 @@ class Socket final : public fair::mq::Socket
MetaHeader* metas = static_cast<MetaHeader*>(zmqMsg.Data()); MetaHeader* metas = static_cast<MetaHeader*>(zmqMsg.Data());
for (auto& msg : msgVec) { for (auto& msg : msgVec) {
Message* shmMsg = static_cast<Message*>(msg.get()); auto msgPtr = msg.get();
if (!msgPtr) {
return static_cast<int>(TransferCode::error);
}
assertm(dynamic_cast<shmem::Message*>(msgPtr), "given mq::Message is a shmem::Message"); // NOLINT
auto shmMsg = static_cast<shmem::Message*>(msgPtr); // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast)
std::memcpy(metas++, &(shmMsg->fMeta), sizeof(MetaHeader)); std::memcpy(metas++, &(shmMsg->fMeta), sizeof(MetaHeader));
} }