Move configuration closer to writer

core-buffer/include/buffer_config.hpp

@@ -24,6 +24,8 @@ namespace core_buffer {
     const size_t STATS_MODULO = 100;
     // 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;
@@ -45,14 +47,6 @@ namespace core_buffer {
     const size_t STREAM_RCVHWM = 100;
     // Size of buffer between the receiving and sending part.
     const int STREAM_FASTQUEUE_SLOTS = 5;
-
-
-    // How many frames to read at once from file.
-    const size_t BUFFER_BLOCK_SIZE = 100;
-    // MS to retry reading from the image assembler.
-    const size_t WRITER_IMAGE_ASSEMBLER_RETRY_MS = 5;
-    // Number of slots in the reconstruction buffer.
-    const size_t WRITER_IA_N_SLOTS = 2;
 }
 
 #endif //BUFFERCONFIG_HPP

sf-writer/include/JFH5Writer.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 #include <H5Cpp.h>
-#include "buffer_config.hpp"
+
 #include "formats.hpp"
 
 class JFH5Writer {

sf-writer/include/writer_config.hpp

@@ -0,0 +1,9 @@
+#include <cstddef>
+
+namespace writer_config
+{
+    // MS to retry reading from the image assembler.
+    const size_t WRITER_IMAGE_ASSEMBLER_RETRY_MS = 5;
+    // Number of slots in the reconstruction buffer.
+    const size_t WRITER_IA_N_SLOTS = 2;
+}

sf-writer/src/BufferBinaryReader.cpp

@@ -7,8 +7,11 @@
 #include <fcntl.h>
 
 #include "BufferUtils.hpp"
+#include "writer_config.hpp"
+#include "buffer_config.hpp"
 
 using namespace std;
+using namespace writer_config;
 using namespace core_buffer;
 
 BufferBinaryReader::BufferBinaryReader(
@@ -18,9 +21,7 @@ BufferBinaryReader::BufferBinaryReader(
             channel_name_(channel_name),
             current_input_file_(""),
             input_file_fd_(-1)
-{
-
-}
+{}
 
 BufferBinaryReader::~BufferBinaryReader()
 {

sf-writer/src/ImageAssembler.cpp

@@ -1,7 +1,11 @@
 #include <cstring>
+
 #include "ImageAssembler.hpp"
+#include "writer_config.hpp"
+#include "buffer_config.hpp"
 
 using namespace std;
+using namespace writer_config;
 using namespace core_buffer;
 
 ImageAssembler::ImageAssembler(const size_t n_modules) :

sf-writer/src/JFH5Writer.cpp

@@ -1,8 +1,11 @@
 #include "JFH5Writer.hpp"
+
 #include <sstream>
 #include <cstring>
 #include <hdf5_hl.h>
 
+#include "writer_config.hpp"
+#include "buffer_config.hpp"
 
 //extern "C"
 //{
@@ -11,6 +14,7 @@
 //}
 
 using namespace std;
+using namespace writer_config;
 using namespace core_buffer;
 
 JFH5Writer::JFH5Writer(const std::string& output_file,

sf-writer/src/main.cpp

@@ -2,10 +2,10 @@
 #include <string>
 #include <thread>
 #include <chrono>
-#include <cstring>
 
 #include "date.h"
 #include "zmq.h"
+#include "writer_config.hpp"
 #include "buffer_config.hpp"
 #include "bitshuffle/bitshuffle.h"
 #include "JFH5Writer.hpp"
@@ -13,6 +13,7 @@
 #include "BufferBinaryReader.hpp"
 
 using namespace std;
+using namespace writer_config;
 using namespace core_buffer;
 using namespace chrono;