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

tests/ImageBufferTest.cpp

@@ -4,6 +4,7 @@
 #include <catch2/catch_all.hpp>
 
 #include "../common/ImageBuffer.h"
+#include "../common/ZeroCopyReturnValue.h"
 
 TEST_CASE("ImageBuffer_Location size") {
     ImageBuffer buf(2*1024*1024);
@@ -39,11 +40,28 @@ TEST_CASE("ImageBuffer") {
     ZeroCopyReturnValue *ret4 = buf_ctrl.GetImageSlot();
     REQUIRE(ret4 == nullptr);
 
+    REQUIRE(buf_ctrl.GetStatus().preparation_slots == 4);
+    REQUIRE(buf_ctrl.GetStatus().sending_slots == 0);
+    REQUIRE(buf_ctrl.GetStatus().available_slots == 0);
+
+    ret0->ReadyToSend();
+    ret1->ReadyToSend();
+    REQUIRE(buf_ctrl.GetStatus().preparation_slots == 2);
+    REQUIRE(buf_ctrl.GetStatus().sending_slots == 2);
+    REQUIRE(buf_ctrl.GetStatus().available_slots == 0);
+
+    ret2->ReadyToSend();
+    ret3->ReadyToSend();
+
+    REQUIRE(buf_ctrl.GetStatus().preparation_slots == 0);
+    REQUIRE(buf_ctrl.GetStatus().sending_slots == 4);
+    REQUIRE(buf_ctrl.GetStatus().available_slots == 0);
     ret0->release();
     ret1->release();
     ret2->release();
     ret3->release();
 
+    REQUIRE(buf_ctrl.GetStatus().available_slots == 4);
     REQUIRE(buf_ctrl.GetAvailSlots() == 4);
 
     REQUIRE(buf_ctrl.CheckIfBufferReturned(std::chrono::microseconds(1)));
@@ -113,17 +131,20 @@ TEST_CASE("ImageBuffer_Counter") {
     ZeroCopyReturnValue *ret0 = buf_ctrl.GetImageSlot();
     REQUIRE(ret0 != nullptr);
     ret0->SetImageNumber(0);
-    ret0->release();
+    ret0->ReadyToSend();
 
     auto cnt_3 = buf_ctrl.GetStatus().current_counter;
 
     ZeroCopyReturnValue *ret1 = buf_ctrl.GetImageSlot();
     REQUIRE(ret1 != nullptr);
     ret1->SetImageNumber(1);
-    ret1->release();
+    ret1->ReadyToSend();
 
     auto cnt_4 = buf_ctrl.GetStatus().current_counter;
 
+    ret0->release();
+    ret1->release();
+
     REQUIRE(buf_ctrl.Finalize(std::chrono::microseconds(1)));
     auto cnt_5 = buf_ctrl.GetStatus().current_counter;
 
@@ -139,9 +160,6 @@ TEST_CASE("ImageBuffer_Counter") {
     CHECK(cnt_4 != cnt_5);
 }
 
-
-
-
 TEST_CASE("ImageBuffer_Preview_Access_GetImage_MaxImage") {
     DiffractionExperiment experiment(DetJF(18,3,8,36));
 
@@ -204,7 +222,6 @@ TEST_CASE("ImageBuffer_Restart") {
     REQUIRE(buf_ctrl.GetAvailSlots() == 4);
     REQUIRE(buf_ctrl.GetStatus().images_in_the_buffer.empty());
 
-
     ret0 = buf_ctrl.GetImageSlot();
     REQUIRE(ret0 != nullptr);
     ret0->SetImageNumber(0);