restructure zmq socker interface

zmq socket can now return vector of frames. it knows end of transmission with header.data == 0
it can also send vector of frames

examples/zmq_receiver_example.cpp

@@ -1,27 +1,33 @@
-#include "aare/ZmqSocketReceiver.hpp"
+#include "aare/network_io/ZmqSocketReceiver.hpp"
+#include "aare/network_io/defs.hpp"
+
 #include <cassert>
 #include <fmt/core.h>
 #include <string>
+using namespace aare;
 
 int main() {
+    // aare::logger::set_verbosity(aare::logger::DEBUG);
     std::string endpoint = "tcp://localhost:5555";
     aare::ZmqSocketReceiver socket(endpoint);
     socket.connect();
-    char *data = new char[1024 * 1024 * 10];
-    aare::ZmqHeader header;
-
     while (true) {
-        int rc = socket.receive(header, reinterpret_cast<std::byte *>(data));
-        aare::logger::info("Received bytes", rc, "Received header: ", header.to_string());
-        auto *data_int = reinterpret_cast<uint32_t *>(data);
-        for (uint32_t i = 0; i < header.npixelsx; i++) {
-            for (uint32_t j = 0; j < header.npixelsy; j++) {
-                // verify that the sent data is correct
-                assert(data_int[i * header.npixelsy + j] == i + j);
+        std::vector<ZmqFrame> v = socket.receive_n();
+        aare::logger::info("Received ", v.size(), " frames");
+        aare::logger::info("acquisition:", v[0].header.acqIndex);
+        aare::logger::info("Header size:", v[0].header.to_string().size());
+        aare::logger::info("Frame size:", v[0].frame.size());
+        aare::logger::info("Header:", v[0].header.to_string());
+
+        for (ZmqFrame zmq_frame : v) {
+            auto &[header, frame] = zmq_frame;
+            for (int i = 0; i < 1024; i++) {
+                for (int j = 0; j < 1024; j++) {
+                    assert(*(uint32_t *)frame.get(i, j) == (uint32_t)i + j);
+                }
             }
+            aare::logger::info("Frame verified");
         }
-        aare::logger::info("Frame verified");
     }
-    delete[] data;
     return 0;
 }

examples/zmq_sender_example.cpp

@@ -1,13 +1,17 @@
 #include "aare/Frame.hpp"
-#include "aare/ZmqSocketSender.hpp"
+#include "aare/network_io/ZmqHeader.hpp"
+#include "aare/network_io/ZmqSocketSender.hpp"
+#include "aare/network_io/defs.hpp"
 #include "aare/utils/logger.hpp"
 
+#include <ctime> // std::time
 #include <fmt/core.h>
 #include <string>
 #include <unistd.h> // sleep
 using namespace aare;
 
 int main() {
+    std::srand(std::time(nullptr));
     std::string endpoint = "tcp://*:5555";
     aare::ZmqSocketSender socket(endpoint);
     socket.bind();
@@ -23,13 +27,24 @@ int main() {
     header.imageSize = sizeof(uint32_t) * 1024 * 1024;
     header.dynamicRange = 32;
 
-    int i = 0;
-    while (true) {
-        aare::logger::info("Sending frame:", i++);
-        aare::logger::info("Header size:", sizeof(header.to_string()));
-        aare::logger::info("Frame size:", frame.size(), "\n");
+    std::vector<ZmqFrame> zmq_frames;
+    // send two exact frames
 
-        int rc = socket.send(header, frame.data(), frame.size());
+    int acqid = 0;
+    while (true) {
+        zmq_frames.clear();
+        header.acqIndex = acqid++;
+        size_t n_frames = std::rand() % 10 + 1;
+
+        aare::logger::info("acquisition:", header.acqIndex);
+        aare::logger::info("Header size:", header.to_string().size());
+        aare::logger::info("Frame size:", frame.size());
+        aare::logger::info("Number of frames:", n_frames);
+
+        for (size_t i = 0; i < n_frames; i++) {
+            zmq_frames.push_back({header, frame});
+        }
+        size_t rc = socket.send(zmq_frames);
         aare::logger::info("Sent bytes", rc);
         sleep(1);
     }