From 4912bbe38d93c439f890483d5c3ba808b110f686 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Fri, 8 May 2020 14:25:01 +0200 Subject: [PATCH] Adjust settings to new config --- core-buffer/src/LiveRecvModule.cpp | 2 +- sf-buffer/src/sf_buffer.cpp | 2 +- sf-buffer/src/sf_stream.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core-buffer/src/LiveRecvModule.cpp b/core-buffer/src/LiveRecvModule.cpp index cbaabec..58381b5 100644 --- a/core-buffer/src/LiveRecvModule.cpp +++ b/core-buffer/src/LiveRecvModule.cpp @@ -48,7 +48,7 @@ void* LiveRecvModule::connect_socket(size_t module_id) throw runtime_error(zmq_strerror(errno)); } - int rcvhwm = STREAM_RCV_QUEUE_SIZE; + int rcvhwm = STREAM_RCVHWM; if (zmq_setsockopt(sock, ZMQ_RCVHWM, &rcvhwm, sizeof(rcvhwm)) != 0) { throw runtime_error(zmq_strerror(errno)); } diff --git a/sf-buffer/src/sf_buffer.cpp b/sf-buffer/src/sf_buffer.cpp index 539133e..1f23f9e 100644 --- a/sf-buffer/src/sf_buffer.cpp +++ b/sf-buffer/src/sf_buffer.cpp @@ -40,7 +40,7 @@ int main (int argc, char *argv[]) { auto ctx = zmq_ctx_new(); auto socket = zmq_socket(ctx, ZMQ_PUB); - const int sndhwm = BUFFER_LIVE_SEND_HWM; + const int sndhwm = BUFFER_ZMQ_SNDHWM; if (zmq_setsockopt(socket, ZMQ_SNDHWM, &sndhwm, sizeof(sndhwm)) != 0) throw runtime_error(strerror (errno)); diff --git a/sf-buffer/src/sf_stream.cpp b/sf-buffer/src/sf_stream.cpp index 9aecb44..15ce4ec 100644 --- a/sf-buffer/src/sf_stream.cpp +++ b/sf-buffer/src/sf_stream.cpp @@ -45,7 +45,7 @@ int main (int argc, char *argv[]) WRITER_RB_BUFFER_SLOTS); auto ctx = zmq_ctx_new(); - zmq_ctx_set (ctx, ZMQ_IO_THREADS, WRITER_ZMQ_IO_THREADS); + zmq_ctx_set (ctx, ZMQ_IO_THREADS, STREAM_ZMQ_IO_THREADS); string ipc_prefix = "ipc:///tmp/sf-live-"; LiveRecvModule recv_module(queue, n_modules, ctx, ipc_prefix);