mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-16 01:51:45 +00:00
Update multi-part features (nanomsg) and various fixes
- Implement nanomsg multipart with MessagePack. - Use the MessagePack from FairSoft and handle not found case. - Update splitter, merger and proxy devices to handle multi-part. - Let FairMQParts.At() return pointer reference (can be used for moving). - Add missing const specifier in the message interface. - Add transmit kernel size setting to channels (ZMQ_SNDBUF). - Remove FairMQBuffer device. - Remove old multi-part methods from Tutorial3 example (to be replaced with Parts API). - Make callback mandatory for newMsg(data, size, callback). - Add missing <vector> include in FairMQSocket.
This commit is contained in:
@@ -37,6 +37,13 @@ If(NANOMSG_FOUND)
|
||||
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||
${NANOMSG_INCLUDE_DIR}
|
||||
)
|
||||
If(MSGPACK_FOUND)
|
||||
add_definitions(-DMSGPACK_FOUND)
|
||||
Set(SYSTEM_INCLUDE_DIRECTORIES
|
||||
${SYSTEM_INCLUDE_DIRECTORIES}
|
||||
${MSGPACK_INCLUDE_DIR}
|
||||
)
|
||||
EndIf(MSGPACK_FOUND)
|
||||
EndIf(NANOMSG_FOUND)
|
||||
|
||||
Include_Directories(${INCLUDE_DIRECTORIES})
|
||||
@@ -67,7 +74,6 @@ Set(SRCS
|
||||
|
||||
"devices/FairMQBenchmarkSampler.cxx"
|
||||
"devices/FairMQSink.cxx"
|
||||
"devices/FairMQBuffer.cxx"
|
||||
"devices/FairMQProxy.cxx"
|
||||
"devices/FairMQSplitter.cxx"
|
||||
"devices/FairMQMerger.cxx"
|
||||
@@ -126,6 +132,7 @@ If(NANOMSG_FOUND)
|
||||
Set(DEPENDENCIES
|
||||
${DEPENDENCIES}
|
||||
${NANOMSG_LIBRARY_SHARED}
|
||||
# msgpackc # currently header only
|
||||
)
|
||||
EndIf(NANOMSG_FOUND)
|
||||
|
||||
@@ -136,7 +143,6 @@ GENERATE_LIBRARY()
|
||||
Set(Exe_Names
|
||||
bsampler
|
||||
sink
|
||||
buffer
|
||||
splitter
|
||||
merger
|
||||
proxy
|
||||
@@ -145,7 +151,6 @@ Set(Exe_Names
|
||||
Set(Exe_Source
|
||||
run/runBenchmarkSampler.cxx
|
||||
run/runSink.cxx
|
||||
run/runBuffer.cxx
|
||||
run/runSplitter.cxx
|
||||
run/runMerger.cxx
|
||||
run/runProxy.cxx
|
||||
|
Reference in New Issue
Block a user