v1.0.0-rc.127 (#34)

This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.124.

* jfjoch_broker: Default EIGER readout time is 20 microseconds
* jfjoch_broker: Multiple improvements regarding performance
* jfjoch_broker: Image buffer allows to track frames in preparation and sending
* jfjoch_broker: Dedicated thread for ZeroMQ transmission to better utilize the image buffer
* jfjoch_broker: Experimental implementation of transmission with raw TCP/IP sockets
* jfjoch_writer: Fixes regarding properly closing files in long data collections
* jfjoch_process: Scale & merge has been significantly improved, but it is not yet integrated into mainstream code

Reviewed-on: #34

image_puller/ZMQImagePuller.cpp

@@ -48,7 +48,7 @@ void ZMQImagePuller::Disconnect() {
 void ZMQImagePuller::PullerThread() {
     while (true) {
         ImagePullerOutput ret;
-        ret.msg = std::make_shared<ZMQMessage>();
+        ret.zmq_msg = std::make_shared<ZMQMessage>();
         bool received = false;
         while (!received) {
             if (disconnect) {
@@ -56,7 +56,7 @@ void ZMQImagePuller::PullerThread() {
                 return;
             }
             try {
-                received = socket.Receive(*ret.msg, false);
+                received = socket.Receive(*ret.zmq_msg, false);
                 if (!received)
                     std::this_thread::sleep_for(std::chrono::milliseconds(1));
             } catch (const JFJochException &e) {
@@ -70,9 +70,9 @@ void ZMQImagePuller::PullerThread() {
 void ZMQImagePuller::CBORThread() {
     auto ret = cbor_fifo.GetBlocking();
 
-    while (ret.msg) {
+    while (ret.zmq_msg) {
         try {
-            ret.cbor = CBORStream2Deserialize(ret.msg->data(), ret.msg->size());
+            ret.cbor = CBORStream2Deserialize(ret.zmq_msg->data(), ret.zmq_msg->size());
             if (ret.cbor->msg_type == CBORImageType::END)
                 logger.Info("Received END");
 
@@ -98,7 +98,7 @@ void ZMQImagePuller::RepubThread() {
     auto ret = repub_fifo.GetBlocking();
     bool repub_active = false;
 
-    while (ret.msg) {
+    while (ret.zmq_msg) {
         try {
             if (ret.cbor->msg_type == CBORImageType::START) {
                 // Start message needs to be cleaned when running republish
@@ -112,7 +112,7 @@ void ZMQImagePuller::RepubThread() {
                     logger.Info("Republish active");
             } else {
                 if (repub_active)
-                    repub_socket->Send(ret.msg->data(), ret.msg->size(), true);
+                    repub_socket->Send(ret.zmq_msg->data(), ret.zmq_msg->size(), true);
             }
         } catch (const JFJochException &e) {
             logger.ErrorException(e);