From ccca4225d40ed68b7e3ec34265f678744f4d881e Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 19 Jan 2021 12:59:50 +0100
Subject: [PATCH] Change bind and connect socket helper functions to take
 string

---
 core-buffer/include/BufferUtils.hpp    | 9 +++++++--
 core-buffer/src/BufferUtils.cpp        | 8 ++++----
 jf-buffer-writer/src/main.cpp          | 3 ++-
 jf-udp-recv/src/main.cpp               | 2 +-
 sf-stream/src/ZmqPulseSyncReceiver.cpp | 2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/core-buffer/include/BufferUtils.hpp b/core-buffer/include/BufferUtils.hpp
index bb09dea..18a3fe5 100644
--- a/core-buffer/include/BufferUtils.hpp
+++ b/core-buffer/include/BufferUtils.hpp
@@ -36,9 +36,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);
 }
diff --git a/core-buffer/src/BufferUtils.cpp b/core-buffer/src/BufferUtils.cpp
index 4e861df..147d4e8 100644
--- a/core-buffer/src/BufferUtils.cpp
+++ b/core-buffer/src/BufferUtils.cpp
@@ -69,11 +69,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) {
@@ -102,11 +102,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);
 
diff --git a/jf-buffer-writer/src/main.cpp b/jf-buffer-writer/src/main.cpp
index e1eb961..cd65986 100644
--- a/jf-buffer-writer/src/main.cpp
+++ b/jf-buffer-writer/src/main.cpp
@@ -39,7 +39,8 @@ int main (int argc, char *argv[]) {
     BufferStats stats(config.detector_name, module_id, STATS_MODULO);
 
     auto ctx = zmq_ctx_new();
-    auto socket = connect_socket(ctx, config.detector_name, module_id);
+    auto socket = connect_socket(
+            ctx, config.detector_name, to_string(module_id));
 
     auto file_buff = new BufferBinaryFormat();
     uint64_t pulse_id;
diff --git a/jf-udp-recv/src/main.cpp b/jf-udp-recv/src/main.cpp
index 49668a1..2194b80 100644
--- a/jf-udp-recv/src/main.cpp
+++ b/jf-udp-recv/src/main.cpp
@@ -36,7 +36,7 @@ int main (int argc, char *argv[]) {
     FrameStats stats(config.detector_name, module_id, STATS_MODULO);
 
     auto ctx = zmq_ctx_new();
-    auto socket = bind_socket(ctx, config.detector_name, module_id);
+    auto socket = bind_socket(ctx, config.detector_name, to_string(module_id));
 
     ModuleFrame meta;
     char* data = new char[MODULE_N_BYTES];
diff --git a/sf-stream/src/ZmqPulseSyncReceiver.cpp b/sf-stream/src/ZmqPulseSyncReceiver.cpp
index ead65ee..96221f3 100644
--- a/sf-stream/src/ZmqPulseSyncReceiver.cpp
+++ b/sf-stream/src/ZmqPulseSyncReceiver.cpp
@@ -27,7 +27,7 @@ ZmqPulseSyncReceiver::ZmqPulseSyncReceiver(
 
     for (int i=0; i<n_modules_; i++) {
         sockets_.push_back(
-                BufferUtils::connect_socket(ctx_, detector_name, i));
+                BufferUtils::connect_socket(ctx_, detector_name, to_string(i)));
     }
 }