Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

add a pointer data type serializer function in the boost serializer add the zmq and nanomsg directories in cmaklists that use the runSimpleMQStateMachine

Browse Source
This commit is contained in:
NicolasWinckler 2015-11-19 16:49:03 +01:00 committed by Florian Uhlig
parent afda64a83d
commit 8f32579984
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fairmq/CMakeLists.txt
View File

@ -144,6 +144,7 @@ Set(FAIRMQHEADERS
devices/BaseSourcePolicy.h devices/BaseSourcePolicy.h
options/FairProgOptionsHelper.h options/FairProgOptionsHelper.h
tools/FairMQTools.h tools/FairMQTools.h
tools/runSimpleMQStateMachine.h
) )
Install(FILES ${FAIRMQHEADERS} DESTINATION include) Install(FILES ${FAIRMQHEADERS} DESTINATION include)

3
fairmq/devices/GenericProcessor.h
View File

@ -131,10 +131,9 @@ class GenericProcessor : public FairMQDevice, public T, public U, public V
{ {
std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage()); std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
++receivedMsgs;
if (inputChannel.Receive(msg) > 0) if (inputChannel.Receive(msg) > 0)
{ {
receivedMsgs++;
// deserialization_type::DeserializeMsg(msg) --> deserialize data of msg and fill output container // deserialization_type::DeserializeMsg(msg) --> deserialize data of msg and fill output container
// proc_task_type::ExecuteTask( ... ) --> process output container // proc_task_type::ExecuteTask( ... ) --> process output container
proc_task_type::ExecuteTask(deserialization_type::DeserializeMsg(msg.get())); proc_task_type::ExecuteTask(deserialization_type::DeserializeMsg(msg.get()));

4
fairmq/tools/runSimpleMQStateMachine.h
View File

@ -18,9 +18,9 @@
/// ZMQ/nmsg (in FairSoft) /// ZMQ/nmsg (in FairSoft)
#ifdef NANOMSG #ifdef NANOMSG
#include "nanomsg/FairMQTransportFactoryNN.h" #include "FairMQTransportFactoryNN.h"
#else #else
#include "zeromq/FairMQTransportFactoryZMQ.h" #include "FairMQTransportFactoryZMQ.h"
#endif #endif
/// FairRoot - FairMQ /// FairRoot - FairMQ