From 65d91b8681160875850a5c243e977280e7bf817c Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Fri, 21 Nov 2014 14:47:12 +0100 Subject: [PATCH] bugfix: incorrect buffer size config --- fairmq/examples/req-rep/runExampleClient.cxx | 1 + fairmq/examples/req-rep/runExampleServer.cxx | 1 + fairmq/run/runBinSink.cxx | 2 +- fairmq/run/runBuffer.cxx | 2 +- fairmq/run/runProtoSink.cxx | 2 +- fairmq/run/runProxy.cxx | 2 +- fairmq/run/runSplitter.cxx | 4 ++-- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fairmq/examples/req-rep/runExampleClient.cxx b/fairmq/examples/req-rep/runExampleClient.cxx index f95d14b4..0499ed19 100644 --- a/fairmq/examples/req-rep/runExampleClient.cxx +++ b/fairmq/examples/req-rep/runExampleClient.cxx @@ -119,6 +119,7 @@ int main(int argc, char** argv) client.SetProperty(FairMQExampleClient::OutputSocketType, "req", 0); client.SetProperty(FairMQExampleClient::OutputSndBufSize, 10000, 0); + client.SetProperty(FairMQExampleClient::OutputRcvBufSize, 10000, 0); client.SetProperty(FairMQExampleClient::OutputMethod, "connect", 0); client.SetProperty(FairMQExampleClient::OutputAddress, "tcp://localhost:5005", 0); diff --git a/fairmq/examples/req-rep/runExampleServer.cxx b/fairmq/examples/req-rep/runExampleServer.cxx index 3c8bc310..4e0d1ffd 100644 --- a/fairmq/examples/req-rep/runExampleServer.cxx +++ b/fairmq/examples/req-rep/runExampleServer.cxx @@ -72,6 +72,7 @@ int main(int argc, char** argv) server.SetProperty(FairMQExampleServer::InputSocketType, "rep", 0); server.SetProperty(FairMQExampleServer::InputSndBufSize, 10000, 0); + server.SetProperty(FairMQExampleServer::InputRcvBufSize, 10000, 0); server.SetProperty(FairMQExampleServer::InputMethod, "bind", 0); server.SetProperty(FairMQExampleServer::InputAddress, "tcp://*:5005", 0); diff --git a/fairmq/run/runBinSink.cxx b/fairmq/run/runBinSink.cxx index dcd7f79e..9fbd308a 100644 --- a/fairmq/run/runBinSink.cxx +++ b/fairmq/run/runBinSink.cxx @@ -144,7 +144,7 @@ int main(int argc, char** argv) sink.ChangeState(FairMQBinSink::INIT); sink.SetProperty(FairMQBinSink::InputSocketType, options.inputSocketType); - sink.SetProperty(FairMQBinSink::InputSndBufSize, options.inputBufSize); + sink.SetProperty(FairMQBinSink::InputRcvBufSize, options.inputBufSize); sink.SetProperty(FairMQBinSink::InputMethod, options.inputMethod); sink.SetProperty(FairMQBinSink::InputAddress, options.inputAddress); diff --git a/fairmq/run/runBuffer.cxx b/fairmq/run/runBuffer.cxx index 928cab01..0c2475f7 100644 --- a/fairmq/run/runBuffer.cxx +++ b/fairmq/run/runBuffer.cxx @@ -164,7 +164,7 @@ int main(int argc, char** argv) buffer.ChangeState(FairMQBuffer::INIT); buffer.SetProperty(FairMQBuffer::InputSocketType, options.inputSocketType); - buffer.SetProperty(FairMQBuffer::InputSndBufSize, options.inputBufSize); + buffer.SetProperty(FairMQBuffer::InputRcvBufSize, options.inputBufSize); buffer.SetProperty(FairMQBuffer::InputMethod, options.inputMethod); buffer.SetProperty(FairMQBuffer::InputAddress, options.inputAddress); diff --git a/fairmq/run/runProtoSink.cxx b/fairmq/run/runProtoSink.cxx index f40635ee..6b99f526 100644 --- a/fairmq/run/runProtoSink.cxx +++ b/fairmq/run/runProtoSink.cxx @@ -144,7 +144,7 @@ int main(int argc, char** argv) sink.ChangeState(FairMQProtoSink::INIT); sink.SetProperty(FairMQProtoSink::InputSocketType, options.inputSocketType); - sink.SetProperty(FairMQProtoSink::InputSndBufSize, options.inputBufSize); + sink.SetProperty(FairMQProtoSink::InputRcvBufSize, options.inputBufSize); sink.SetProperty(FairMQProtoSink::InputMethod, options.inputMethod); sink.SetProperty(FairMQProtoSink::InputAddress, options.inputAddress); diff --git a/fairmq/run/runProxy.cxx b/fairmq/run/runProxy.cxx index 434274fa..640d65b4 100644 --- a/fairmq/run/runProxy.cxx +++ b/fairmq/run/runProxy.cxx @@ -164,7 +164,7 @@ int main(int argc, char** argv) proxy.ChangeState(FairMQProxy::INIT); proxy.SetProperty(FairMQProxy::InputSocketType, options.inputSocketType); - proxy.SetProperty(FairMQProxy::InputSndBufSize, options.inputBufSize); + proxy.SetProperty(FairMQProxy::InputRcvBufSize, options.inputBufSize); proxy.SetProperty(FairMQProxy::InputMethod, options.inputMethod); proxy.SetProperty(FairMQProxy::InputAddress, options.inputAddress); diff --git a/fairmq/run/runSplitter.cxx b/fairmq/run/runSplitter.cxx index 8a28655b..932eb27b 100644 --- a/fairmq/run/runSplitter.cxx +++ b/fairmq/run/runSplitter.cxx @@ -169,14 +169,14 @@ int main(int argc, char** argv) splitter.ChangeState(FairMQSplitter::INIT); splitter.SetProperty(FairMQSplitter::InputSocketType, options.inputSocketType); - splitter.SetProperty(FairMQSplitter::InputSndBufSize, options.inputBufSize); + splitter.SetProperty(FairMQSplitter::InputRcvBufSize, options.inputBufSize); splitter.SetProperty(FairMQSplitter::InputMethod, options.inputMethod); splitter.SetProperty(FairMQSplitter::InputAddress, options.inputAddress); for (int i = 0; i < options.numOutputs; ++i) { splitter.SetProperty(FairMQSplitter::OutputSocketType, options.outputSocketType.at(i), i); - splitter.SetProperty(FairMQSplitter::OutputRcvBufSize, options.outputBufSize.at(i), i); + splitter.SetProperty(FairMQSplitter::OutputSndBufSize, options.outputBufSize.at(i), i); splitter.SetProperty(FairMQSplitter::OutputMethod, options.outputMethod.at(i), i); splitter.SetProperty(FairMQSplitter::OutputAddress, options.outputAddress.at(i), i); }