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

common/ZeroCopyReturnValue.cpp

@@ -7,7 +7,7 @@
 #include "ThreadSafeFIFO.h"
 
 ZeroCopyReturnValue::ZeroCopyReturnValue(void *in_ptr, ImageBuffer &in_ctrl, uint32_t in_handle)
-: ptr(in_ptr), handle(in_handle), buf_ctrl(in_ctrl), image_number(-1), payload_size(0),
+: ptr(in_ptr), payload_size(0), image_number(-1), buf_ctrl(in_ctrl), handle(in_handle),
 indexed(false) {
 }
 
@@ -27,8 +27,16 @@ void * ZeroCopyReturnValue::GetImage() const {
     return ptr;
 }
 
-void ZeroCopyReturnValue::release() const {
-    buf_ctrl.ReleaseSlot(handle, image_number, payload_size, indexed);
+void ZeroCopyReturnValue::release() {
+ if (status == ImageBufferEntryStatus::InPreparation)
+     ReadyToSend();
+
+if (status == ImageBufferEntryStatus::Sending) {
+     buf_ctrl.ReleaseSlot(handle);
+} else {
+    throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                          "Trying to send image that is not in preparation");
+}
 }
 
 int64_t ZeroCopyReturnValue::GetImageNumber() const {
@@ -42,3 +50,17 @@ void ZeroCopyReturnValue::SetIndexed(bool input) {
 bool ZeroCopyReturnValue::IsIndexed() const {
     return indexed;
 }
+
+uint32_t ZeroCopyReturnValue::GetHandle() const {
+    return handle;
+}
+
+void ZeroCopyReturnValue::ReadyToSend() {
+    if (status == ImageBufferEntryStatus::InPreparation) {
+        buf_ctrl.ReadyToSend(handle, image_number, payload_size, indexed);
+        status = ImageBufferEntryStatus::Sending;
+    } else {
+        throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                              "Trying to send image that is not in preparation");
+    }
+}