a little clean up

This commit is contained in:
Alexey Rybalchenko
2014-01-17 12:34:57 +01:00
parent 31d10170f7
commit 3803a3d155
43 changed files with 525 additions and 513 deletions

View File

@@ -1,25 +1,25 @@
/*
* runMerger.cxx
/**
* runNToOneMerger.cxx
*
* Created on: Dec 6, 2012
* Author: dklein
* @since 2012-12-06
* @author D. Klein, A. Rybalchenko
*/
#include <iostream>
#include <csignal>
#include "FairMQLogger.h"
#include "FairMQStandaloneMerger.h"
#include "FairMQMerger.h"
FairMQStandaloneMerger merger;
FairMQMerger merger;
static void s_signal_handler (int signal)
{
std::cout << std::endl << "Caught signal " << signal << std::endl;
merger.ChangeState(FairMQStandaloneMerger::STOP);
merger.ChangeState(FairMQStandaloneMerger::END);
merger.ChangeState(FairMQMerger::STOP);
merger.ChangeState(FairMQMerger::END);
std::cout << "Shutdown complete. Bye!" << std::endl;
exit(1);
@@ -55,23 +55,23 @@ int main(int argc, char** argv)
int i = 1;
merger.SetProperty(FairMQStandaloneMerger::Id, argv[i]);
merger.SetProperty(FairMQMerger::Id, argv[i]);
++i;
int numIoThreads;
std::stringstream(argv[i]) >> numIoThreads;
merger.SetProperty(FairMQStandaloneMerger::NumIoThreads, numIoThreads);
merger.SetProperty(FairMQMerger::NumIoThreads, numIoThreads);
++i;
int numInputs;
std::stringstream(argv[i]) >> numInputs;
merger.SetProperty(FairMQStandaloneMerger::NumInputs, numInputs);
merger.SetProperty(FairMQMerger::NumInputs, numInputs);
++i;
merger.SetProperty(FairMQStandaloneMerger::NumOutputs, 1);
merger.SetProperty(FairMQMerger::NumOutputs, 1);
merger.ChangeState(FairMQStandaloneMerger::INIT);
merger.ChangeState(FairMQMerger::INIT);
int inputSocketType;
@@ -80,15 +80,15 @@ int main(int argc, char** argv)
if (strcmp(argv[i], "pull") == 0) {
inputSocketType = ZMQ_PULL;
}
merger.SetProperty(FairMQStandaloneMerger::InputSocketType, inputSocketType, iInput);
merger.SetProperty(FairMQMerger::InputSocketType, inputSocketType, iInput);
++i;
int inputRcvBufSize;
std::stringstream(argv[i]) >> inputRcvBufSize;
merger.SetProperty(FairMQStandaloneMerger::InputRcvBufSize, inputRcvBufSize, iInput);
merger.SetProperty(FairMQMerger::InputRcvBufSize, inputRcvBufSize, iInput);
++i;
merger.SetProperty(FairMQStandaloneMerger::InputMethod, argv[i], iInput);
merger.SetProperty(FairMQMerger::InputMethod, argv[i], iInput);
++i;
merger.SetProperty(FairMQStandaloneMerger::InputAddress, argv[i], iInput);
merger.SetProperty(FairMQMerger::InputAddress, argv[i], iInput);
++i;
}
@@ -96,28 +96,28 @@ int main(int argc, char** argv)
if (strcmp(argv[i], "push") == 0) {
outputSocketType = ZMQ_PUSH;
}
merger.SetProperty(FairMQStandaloneMerger::OutputSocketType, outputSocketType, 0);
merger.SetProperty(FairMQMerger::OutputSocketType, outputSocketType, 0);
++i;
int outputSndBufSize;
std::stringstream(argv[i]) >> outputSndBufSize;
merger.SetProperty(FairMQStandaloneMerger::OutputSndBufSize, outputSndBufSize, 0);
merger.SetProperty(FairMQMerger::OutputSndBufSize, outputSndBufSize, 0);
++i;
merger.SetProperty(FairMQStandaloneMerger::OutputMethod, argv[i], 0);
merger.SetProperty(FairMQMerger::OutputMethod, argv[i], 0);
++i;
merger.SetProperty(FairMQStandaloneMerger::OutputAddress, argv[i], 0);
merger.SetProperty(FairMQMerger::OutputAddress, argv[i], 0);
++i;
merger.ChangeState(FairMQStandaloneMerger::SETOUTPUT);
merger.ChangeState(FairMQStandaloneMerger::SETINPUT);
merger.ChangeState(FairMQStandaloneMerger::RUN);
merger.ChangeState(FairMQMerger::SETOUTPUT);
merger.ChangeState(FairMQMerger::SETINPUT);
merger.ChangeState(FairMQMerger::RUN);
char ch;
std::cin.get(ch);
merger.ChangeState(FairMQStandaloneMerger::STOP);
merger.ChangeState(FairMQStandaloneMerger::END);
merger.ChangeState(FairMQMerger::STOP);
merger.ChangeState(FairMQMerger::END);
return 0;
}