From 8f325799841369c4c8b78413109e27cf531edbf9 Mon Sep 17 00:00:00 2001 From: NicolasWinckler Date: Thu, 19 Nov 2015 16:49:03 +0100 Subject: [PATCH] add a pointer data type serializer function in the boost serializer add the zmq and nanomsg directories in cmaklists that use the runSimpleMQStateMachine --- fairmq/CMakeLists.txt | 1 + fairmq/devices/GenericProcessor.h | 3 +-- fairmq/tools/runSimpleMQStateMachine.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt index 5786a4c3..20909f98 100644 --- a/fairmq/CMakeLists.txt +++ b/fairmq/CMakeLists.txt @@ -144,6 +144,7 @@ Set(FAIRMQHEADERS devices/BaseSourcePolicy.h options/FairProgOptionsHelper.h tools/FairMQTools.h + tools/runSimpleMQStateMachine.h ) Install(FILES ${FAIRMQHEADERS} DESTINATION include) diff --git a/fairmq/devices/GenericProcessor.h b/fairmq/devices/GenericProcessor.h index aab94d32..1ee97aeb 100644 --- a/fairmq/devices/GenericProcessor.h +++ b/fairmq/devices/GenericProcessor.h @@ -131,10 +131,9 @@ class GenericProcessor : public FairMQDevice, public T, public U, public V { std::unique_ptr msg(fTransportFactory->CreateMessage()); - ++receivedMsgs; - if (inputChannel.Receive(msg) > 0) { + receivedMsgs++; // deserialization_type::DeserializeMsg(msg) --> deserialize data of msg and fill output container // proc_task_type::ExecuteTask( ... ) --> process output container proc_task_type::ExecuteTask(deserialization_type::DeserializeMsg(msg.get())); diff --git a/fairmq/tools/runSimpleMQStateMachine.h b/fairmq/tools/runSimpleMQStateMachine.h index 712fd706..27f69f6b 100644 --- a/fairmq/tools/runSimpleMQStateMachine.h +++ b/fairmq/tools/runSimpleMQStateMachine.h @@ -18,9 +18,9 @@ /// ZMQ/nmsg (in FairSoft) #ifdef NANOMSG -#include "nanomsg/FairMQTransportFactoryNN.h" +#include "FairMQTransportFactoryNN.h" #else -#include "zeromq/FairMQTransportFactoryZMQ.h" +#include "FairMQTransportFactoryZMQ.h" #endif /// FairRoot - FairMQ