merge with current ram_buffer branch

core-buffer/include/BufferUtils.hpp

@@ -51,9 +51,14 @@ namespace BufferUtils
     void create_destination_folder(const std::string& output_file);
 
     void* bind_socket(
-            void* ctx, const std::string& detector_name, const int source_id);
+            void* ctx,
+            const std::string& detector_name,
+            const std::string& stream_name);
+
     void* connect_socket(
-            void* ctx, const std::string& detector_name, const int source_id);
+            void* ctx,
+            const std::string& detector_name,
+            const std::string& stream_name);
 
     DetectorConfig read_json_config(const std::string& filename);
 }

core-buffer/include/RamBuffer.hpp

@@ -30,7 +30,9 @@ public:
                      const uint64_t module_id,
                      ModuleFrame &meta,
                      char *data) const;
-    char* read_image(const uint64_t pulse_id, ImageMetadata &image_meta) const;
+    char* read_image(const uint64_t pulse_id) const;
+    void assemble_image(
+            const uint64_t pulse_id, ImageMetadata &image_meta) const;
 };
 
 

core-buffer/include/buffer_config.hpp

@@ -20,15 +20,17 @@ namespace buffer_config {
     const size_t FOLDER_MOD = 100000;
     // Extension of our file format.
     const std::string FILE_EXTENSION = ".bin";
-    // Number of pulses between each statistics print out.
-    const size_t STATS_MODULO = 100;
+    // Number of pulses between each statistics print out (buffer_writer, stream2vis...)
+    const size_t STATS_MODULO = 1000;
+    // Number of seconds after which statistics is print out (udp_recv)
+    const size_t STATS_TIME = 10;
     // If the RB is empty, how much time to wait before trying to read it again.
     const size_t RB_READ_RETRY_INTERVAL_MS = 5;
     // How many frames to read at once from file.
     const size_t BUFFER_BLOCK_SIZE = 100;
 
 
-    const size_t BUFFER_UDP_N_RECV_MSG = 64;
+    const size_t BUFFER_UDP_N_RECV_MSG = 128;
     // Size of UDP recv buffer
     const int BUFFER_UDP_RCVBUF_N_SLOTS = 100;
     // 8246 bytes for each UDP packet.

core-buffer/src/BufferUtils.cpp

@@ -73,11 +73,11 @@ void BufferUtils::create_destination_folder(const string& output_file)
 }
 
 void* BufferUtils::connect_socket(
-        void* ctx, const string& detector_name, const int source_id)
+        void* ctx, const string& detector_name, const string& stream_name)
 {
     string ipc_address = BUFFER_LIVE_IPC_URL +
                          detector_name + "-" +
-                         to_string(source_id);
+                         stream_name;
 
     void* socket = zmq_socket(ctx, ZMQ_SUB);
     if (socket == nullptr) {
@@ -106,11 +106,11 @@ void* BufferUtils::connect_socket(
 }
 
 void* BufferUtils::bind_socket(
-        void* ctx, const string& detector_name, const int source_id)
+        void* ctx, const string& detector_name, const string& stream_name)
 {
     string ipc_address = BUFFER_LIVE_IPC_URL +
                          detector_name + "-" +
-                         to_string(source_id);
+                         stream_name;
 
     void* socket = zmq_socket(ctx, ZMQ_PUB);
 

core-buffer/src/RamBuffer.cpp

@@ -2,6 +2,7 @@
 #include <fcntl.h>
 #include <cstring>
 #include <stdexcept>
+#include <sstream>
 #include <unistd.h>
 #include "RamBuffer.hpp"
 #include "buffer_config.hpp"
@@ -118,15 +119,12 @@ void RamBuffer::read_frame(
     memcpy(dst_data, src_data, MODULE_N_BYTES);
 }
 
-char* RamBuffer::read_image(const uint64_t pulse_id,
-                            ImageMetadata &image_meta) const
+void RamBuffer::assemble_image(
+        const uint64_t pulse_id, ImageMetadata &image_meta) const
 {
     const size_t slot_n = pulse_id % n_slots_;
-
     ModuleFrame *src_meta = meta_buffer_ + (n_modules_ * slot_n);
 
-    char *src_data = image_buffer_ + (image_bytes_ * slot_n);
-
     auto is_pulse_init = false;
     auto is_good_image = true;
 
@@ -153,7 +151,21 @@ char* RamBuffer::read_image(const uint64_t pulse_id,
                 cout << endl;
             #endif
             if (frame_meta->pulse_id != pulse_id) {
-                throw runtime_error("Wrong pulse_id in ram buffer slot.");
+                stringstream err_msg;
+                err_msg << "[RamBuffer::read_image]";
+                err_msg << " Unexpected pulse_id in ram buffer.";
+                err_msg << " expected=" << pulse_id;
+                err_msg << " got=" << frame_meta->pulse_id;
+
+                for (int i = 0; i < n_modules_; i++) {
+                    ModuleFrame *meta = src_meta + i_module;
+
+                    err_msg << " (module " << i << ", ";
+                    err_msg << meta->pulse_id << "),";
+                }
+                err_msg << endl;
+
+                throw runtime_error(err_msg.str());
             }
 
             image_meta.pulse_id = frame_meta->pulse_id;
@@ -186,7 +198,12 @@ char* RamBuffer::read_image(const uint64_t pulse_id,
         image_meta.frame_index = 0;
         image_meta.daq_rec = 0;
     }
+}
+
+char* RamBuffer::read_image(const uint64_t pulse_id) const
+{
+    const size_t slot_n = pulse_id % n_slots_;
+    char *src_data = image_buffer_ + (image_bytes_ * slot_n);
 
     return src_data;
 }
-

core-buffer/test/CMakeLists.txt

@@ -4,7 +4,5 @@ target_link_libraries(core-buffer-tests
         core-buffer-lib
         external
         rt
-        hdf5
-        hdf5_cpp
         zmq
         gtest)

core-buffer/test/test_RamBuffer.cpp

@@ -29,7 +29,7 @@ TEST(RamBuffer, simple_store)
     }
 
     ImageMetadata image_meta;
-    buffer.read_image(frame_meta.pulse_id, image_meta);
+    buffer.assemble_image(frame_meta.pulse_id, image_meta);
     ASSERT_EQ(image_meta.pulse_id, frame_meta.pulse_id);
     ASSERT_EQ(image_meta.daq_rec, frame_meta.daq_rec);
     ASSERT_EQ(image_meta.frame_index, frame_meta.frame_index);