detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-20 18:57:59 +02:00
Code Issues Actions Packages Releases Activity

fix warnings

Browse Source
This commit is contained in:
Bechir
2024-04-05 16:04:01 +02:00
parent 3c58039502
commit 2f23e4610d
9 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
network_io/src/ZmqSocketReceiver.cpp
View File

@ -29,12 +29,14 @@ void ZmqSocketReceiver::connect() {
zmq_setsockopt(m_socket, ZMQ_SUBSCRIBE, "", 0);
}
int ZmqSocketReceiver::receive(ZmqHeader &header, std::byte *data, bool serialized_header) {
size_t ZmqSocketReceiver::receive(ZmqHeader &header, std::byte *data, bool serialized_header) {
size_t data_bytes_received{};
if (serialized_header)
throw std::runtime_error("Not implemented");
int header_bytes_received = zmq_recv(m_socket, m_header_buffer, m_max_header_size, 0);
size_t header_bytes_received = zmq_recv(m_socket, m_header_buffer, m_max_header_size, 0);
// receive header
m_header_buffer[header_bytes_received] = '\0'; // make sure we zero terminate
@ -61,12 +63,12 @@ int ZmqSocketReceiver::receive(ZmqHeader &header, std::byte *data, bool serializ
return 0; // no data following header
} else {
int data_bytes_received = zmq_recv(m_socket, data, header.imageSize, 0); // TODO! configurable size!!!!
data_bytes_received = zmq_recv(m_socket, data, header.imageSize, 0); // TODO! configurable size!!!!
if (data_bytes_received == -1)
throw std::runtime_error("Got half of a multipart msg!!!");
aare::logger::debug("Bytes: ", data_bytes_received);
}
return 1;
return data_bytes_received + header_bytes_received;
}
} // namespace aare

8
network_io/src/ZmqSocketSender.cpp
View File

@ -9,12 +9,12 @@ ZmqSocketSender::ZmqSocketSender(const std::string &endpoint) { m_endpoint = end
void ZmqSocketSender::bind() {
m_context = zmq_ctx_new();
m_socket = zmq_socket(m_context, ZMQ_PUB);
int rc = zmq_bind(m_socket, m_endpoint.c_str());
size_t rc = zmq_bind(m_socket, m_endpoint.c_str());
assert(rc == 0);
}
int ZmqSocketSender::send(ZmqHeader &header, const std::byte *data, size_t size, bool serialize_header) {
int rc;
size_t ZmqSocketSender::send(ZmqHeader &header, const std::byte *data, size_t size, bool serialize_header) {
size_t rc;
if (serialize_header) {
rc = zmq_send(m_socket, &header, sizeof(ZmqHeader), ZMQ_SNDMORE);
assert(rc == sizeof(ZmqHeader));
@ -24,7 +24,7 @@ int ZmqSocketSender::send(ZmqHeader &header, const std::byte *data, size_t size,
assert(rc == header_str.size());
}
int rc2 = zmq_send(m_socket, data, size, 0);
size_t rc2 = zmq_send(m_socket, data, size, 0);
assert(rc2 == size);
return rc + rc2;
}