diff --git a/examples/readout/Sampler.cxx b/examples/readout/Sampler.cxx index ba986d3d..edf5ce91 100644 --- a/examples/readout/Sampler.cxx +++ b/examples/readout/Sampler.cxx @@ -35,28 +35,23 @@ void Sampler::InitTask() fMsgSize = fConfig->GetValue("msg-size"); fMaxIterations = fConfig->GetValue("max-iterations"); - fRegion = FairMQUnmanagedRegionPtr(NewUnmanagedRegionFor("data1", - 0, - 10000000, - [this](void* /*data*/, size_t /*size*/, void* /*hint*/) { // callback to be called when message buffers no longer needed by transport - --fNumUnackedMsgs; - if (fMaxIterations > 0) - { - LOG(debug) << "Received ack"; - } - } - )); + fRegion = FairMQUnmanagedRegionPtr(NewUnmanagedRegion(10000000, + [this](void* /*data*/, size_t /*size*/, void* /*hint*/) { // callback to be called when message buffers no longer needed by transport + --fNumUnackedMsgs; + if (fMaxIterations > 0) + { + LOG(debug) << "Received ack"; + } + })); } bool Sampler::ConditionalRun() { - FairMQMessagePtr msg(NewMessageFor("data1", // channel - 0, // sub-channel - fRegion, // region - fRegion->GetData(), // ptr within region - fMsgSize, // offset from ptr - nullptr // hint - )); + FairMQMessagePtr msg(NewMessage(fRegion, // region + fRegion->GetData(), // ptr within region + fMsgSize, // offset from ptr + nullptr // hint + )); if (Send(msg, "data1", 0) > 0) { diff --git a/examples/readout/fairmq-start-ex-readout.sh.in b/examples/readout/fairmq-start-ex-readout.sh.in index cb576e9f..a55f86ed 100755 --- a/examples/readout/fairmq-start-ex-readout.sh.in +++ b/examples/readout/fairmq-start-ex-readout.sh.in @@ -11,6 +11,7 @@ fi SAMPLER="fairmq-ex-readout-sampler" SAMPLER+=" --id sampler1" SAMPLER+=" --severity debug" +SAMPLER+=" --transport shmem" SAMPLER+=" --msg-size $msgSize" # SAMPLER+=" --rate 10" SAMPLER+=" --channel-config name=data1,type=pair,method=bind,address=tcp://127.0.0.1:7777,transport=shmem" diff --git a/fairmq/FairMQDevice.h b/fairmq/FairMQDevice.h index 0c6ba4f8..b4181e7d 100644 --- a/fairmq/FairMQDevice.h +++ b/fairmq/FairMQDevice.h @@ -227,9 +227,9 @@ class FairMQDevice return GetChannel(channel, index).NewSimpleMessage(data); } - FairMQUnmanagedRegionPtr NewUnmanagedRegion(const size_t size) + FairMQUnmanagedRegionPtr NewUnmanagedRegion(const size_t size, FairMQRegionCallback callback = nullptr) { - return Transport()->CreateUnmanagedRegion(size); + return Transport()->CreateUnmanagedRegion(size, callback); } FairMQUnmanagedRegionPtr NewUnmanagedRegionFor(const std::string& channel, int index, const size_t size, FairMQRegionCallback callback = nullptr)