From 32de4886d4237de6d684e070d8100f36c4d2cc21 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Tue, 6 Jul 2021 16:02:29 +0200 Subject: [PATCH] Fix IPC base and URL --- core-buffer/include/buffer_config.hpp | 2 +- core-buffer/src/BufferUtils.cpp | 4 ++-- std-det-writer/src/main.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core-buffer/include/buffer_config.hpp b/core-buffer/include/buffer_config.hpp index c6f64be..ad5b12b 100644 --- a/core-buffer/include/buffer_config.hpp +++ b/core-buffer/include/buffer_config.hpp @@ -36,7 +36,7 @@ namespace buffer_config { // HWM for live stream from buffer. const int BUFFER_ZMQ_RCVHWM = 100; // IPC address of the live stream. - const std::string BUFFER_LIVE_IPC_URL = "ipc:///tmp/sf-live-"; + const std::string IPC_URL_BASE = "ipc:///tmp/std-daq-"; // Number of image slots in ram buffer - 10 seconds should be enough const int RAM_BUFFER_N_SLOTS = 100 * 10; } diff --git a/core-buffer/src/BufferUtils.cpp b/core-buffer/src/BufferUtils.cpp index abe0a3d..2809341 100644 --- a/core-buffer/src/BufferUtils.cpp +++ b/core-buffer/src/BufferUtils.cpp @@ -94,7 +94,7 @@ void BufferUtils::create_destination_folder(const string& output_file) void* BufferUtils::connect_socket( void* ctx, const string& detector_name, const string& stream_name) { - string ipc_address = buffer_config::BUFFER_LIVE_IPC_URL + + string ipc_address = buffer_config::IPC_URL_BASE + detector_name + "-" + stream_name; @@ -127,7 +127,7 @@ void* BufferUtils::connect_socket( void* BufferUtils::bind_socket( void* ctx, const string& detector_name, const string& stream_name) { - string ipc_address = BUFFER_LIVE_IPC_URL + + string ipc_address = IPC_URL_BASE + detector_name + "-" + stream_name; diff --git a/std-det-writer/src/main.cpp b/std-det-writer/src/main.cpp index 2212e7f..d77e64e 100644 --- a/std-det-writer/src/main.cpp +++ b/std-det-writer/src/main.cpp @@ -39,7 +39,7 @@ int main (int argc, char *argv[]) auto ctx = zmq_ctx_new(); zmq_ctx_set(ctx, ZMQ_IO_THREADS, LIVE_ZMQ_IO_THREADS); auto receiver = BufferUtils::connect_socket( - ctx, config.detector_name, "writer-agent"); + ctx, config.detector_name, "writer_agent"); const size_t IMAGE_N_BYTES = 12; RamBuffer image_buffer(config.detector_name + "_assembler",