From fbbbb47f9678c0bbfc605b487ac578083f605170 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Thu, 24 Sep 2020 13:06:12 +0200
Subject: [PATCH] Rename zmq pulse receiver

---
 ...PulseReceiver.hpp => ZmqPulseSyncReceiver.hpp} | 12 ++++++------
 ...PulseReceiver.cpp => ZmqPulseSyncReceiver.cpp} |  8 ++++----
 sf-stream/src/main.cpp                            | 15 +++------------
 3 files changed, 13 insertions(+), 22 deletions(-)
 rename sf-stream/include/{ZmqPulseReceiver.hpp => ZmqPulseSyncReceiver.hpp} (58%)
 rename sf-stream/src/{ZmqPulseReceiver.cpp => ZmqPulseSyncReceiver.cpp} (93%)

diff --git a/sf-stream/include/ZmqPulseReceiver.hpp b/sf-stream/include/ZmqPulseSyncReceiver.hpp
similarity index 58%
rename from sf-stream/include/ZmqPulseReceiver.hpp
rename to sf-stream/include/ZmqPulseSyncReceiver.hpp
index 0b79781..aa00035 100644
--- a/sf-stream/include/ZmqPulseReceiver.hpp
+++ b/sf-stream/include/ZmqPulseSyncReceiver.hpp
@@ -1,5 +1,5 @@
-#ifndef SF_DAQ_BUFFER_ZMQPULSERECEIVER_HPP
-#define SF_DAQ_BUFFER_ZMQPULSERECEIVER_HPP
+#ifndef SF_DAQ_BUFFER_ZMQPULSESYNCRECEIVER_HPP
+#define SF_DAQ_BUFFER_ZMQPULSESYNCRECEIVER_HPP
 
 
 #include <cstddef>
@@ -8,7 +8,7 @@
 
 #include "formats.hpp"
 
-class ZmqPulseReceiver {
+class ZmqPulseSyncReceiver {
 
     void* ctx_;
     const int n_modules_;
@@ -16,14 +16,14 @@ class ZmqPulseReceiver {
     std::vector<void*> sockets_;
 
 public:
-    ZmqPulseReceiver(
+    ZmqPulseSyncReceiver(
             void* ctx,
             const std::string& detector_name,
             const int n_modules);
-    ~ZmqPulseReceiver();
+    ~ZmqPulseSyncReceiver();
 
     uint64_t get_next_pulse_id() const;
 };
 
 
-#endif //SF_DAQ_BUFFER_ZMQPULSERECEIVER_HPP
+#endif //SF_DAQ_BUFFER_ZMQPULSESYNCRECEIVER_HPP
diff --git a/sf-stream/src/ZmqPulseReceiver.cpp b/sf-stream/src/ZmqPulseSyncReceiver.cpp
similarity index 93%
rename from sf-stream/src/ZmqPulseReceiver.cpp
rename to sf-stream/src/ZmqPulseSyncReceiver.cpp
index 5d64813..79de2e6 100644
--- a/sf-stream/src/ZmqPulseReceiver.cpp
+++ b/sf-stream/src/ZmqPulseSyncReceiver.cpp
@@ -1,4 +1,4 @@
-#include "ZmqPulseReceiver.hpp"
+#include "ZmqPulseSyncReceiver.hpp"
 #include "BufferUtils.hpp"
 
 #include <zmq.h>
@@ -16,7 +16,7 @@ using namespace buffer_config;
 using namespace stream_config;
 
 
-ZmqPulseReceiver::ZmqPulseReceiver(
+ZmqPulseSyncReceiver::ZmqPulseSyncReceiver(
         void * ctx,
         const string& detector_name,
         const int n_modules) :
@@ -31,14 +31,14 @@ ZmqPulseReceiver::ZmqPulseReceiver(
     }
 }
 
-ZmqPulseReceiver::~ZmqPulseReceiver()
+ZmqPulseSyncReceiver::~ZmqPulseSyncReceiver()
 {
     for (auto& socket:sockets_) {
         zmq_close(socket);
     }
 }
 
-uint64_t ZmqPulseReceiver::get_next_pulse_id() const
+uint64_t ZmqPulseSyncReceiver::get_next_pulse_id() const
 {
     uint64_t pulses[n_modules_];
 
diff --git a/sf-stream/src/main.cpp b/sf-stream/src/main.cpp
index 0c3d500..9a5bcdd 100644
--- a/sf-stream/src/main.cpp
+++ b/sf-stream/src/main.cpp
@@ -1,17 +1,14 @@
 #include <iostream>
 #include <string>
-#include <chrono>
-#include <cstring>
 #include <zmq.h>
 #include <RamBuffer.hpp>
 
 #include "buffer_config.hpp"
 #include "stream_config.hpp"
 #include "ZmqLiveSender.hpp"
-#include "ZmqPulseReceiver.hpp"
+#include "ZmqPulseSyncReceiver.hpp"
 
 using namespace std;
-using namespace chrono;
 using namespace buffer_config;
 using namespace stream_config;
 
@@ -34,15 +31,9 @@ int main (int argc, char *argv[])
     string RECV_IPC_URL = BUFFER_LIVE_IPC_URL + config.DETECTOR_NAME + "-";
 
     auto ctx = zmq_ctx_new();
-    zmq_ctx_set (ctx, ZMQ_IO_THREADS, STREAM_ZMQ_IO_THREADS);
+    zmq_ctx_set(ctx, ZMQ_IO_THREADS, STREAM_ZMQ_IO_THREADS);
 
-    // TODO: This should be passed to the service and not calculated here.
-    vector<string> ipc_urls;
-    for (int i=0; i<config.n_modules; i++) {
-        ipc_urls.push_back(RECV_IPC_URL + to_string(i));
-    }
-
-    ZmqPulseReceiver receiver(ipc_urls, ctx);
+    ZmqPulseSyncReceiver receiver(ctx, config.DETECTOR_NAME, config.n_modules);
     RamBuffer ram_buffer(config.DETECTOR_NAME, config.n_modules);
     ZmqLiveSender sender(ctx, config);