Skip to content

Commit 1b55223

Browse files
committed
Mergers: adapt to new FairMQ API for SendAsync and ReceiveAsync
1 parent 7f5e3eb commit 1b55223

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Utilities/QC/QCMerger/src/MergerDevice.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,13 @@ TObject* MergerDevice::receiveDataObjectFromProducer()
208208
TObject* receivedDataObject;
209209
unique_ptr<FairMQMessage> input(NewMessage());
210210

211-
if ((respondeCode = fChannels.at("data-in").at(0).ReceiveAsync(input)) == -2) {
212-
if ((respondeCode = fChannels.at("data-in").at(0).ReceiveAsync(input)) == -2) {
211+
if ((respondeCode = fChannels.at("data-in").at(0).Receive(input, 0)) == -2) {
212+
if ((respondeCode = fChannels.at("data-in").at(0).Receive(input, 0)) == -2) {
213213
mLastReceiveBufferOverloadTime = clock();
214214
mReceiveBufferOverloaded = true;
215215
LOG(DEBUG) << "Buffer of data-in channel is full. Waiting for free buffer...";
216216

217-
while ((respondeCode = fChannels.at("data-in").at(0).ReceiveAsync(input)) == -2) {
217+
while ((respondeCode = fChannels.at("data-in").at(0).Receive(input, 0)) == -2) {
218218
this_thread::sleep_for(chrono::milliseconds(10));
219219
}
220220

Utilities/QC/QCProducer/src/ProducerDevice.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ int ProducerDevice::getCurrentSecond() const
9999

100100
void ProducerDevice::sendDataToMerger(unique_ptr<FairMQMessage> request)
101101
{
102-
if (fChannels.at("data-out").at(0).SendAsync(request) == -2) {
102+
if (fChannels.at("data-out").at(0).Send(request, 0) == -2) {
103103
mLastBufferOverloadTime = clock();
104104
mBufferOverloaded = true;
105105
LOG(DEBUG) << "Buffer of data-out channel is full. Waiting for free buffer...";
106106

107-
while (fChannels.at("data-out").at(0).SendAsync(request) == -2) {
107+
while (fChannels.at("data-out").at(0).Send(request, 0) == -2) {
108108
this_thread::sleep_for(chrono::milliseconds(10));
109109
}
110110

Utilities/QC/QCViewer/src/ViewerDevice.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ TObject* ViewerDevice::receiveDataObjectFromMerger()
7070
TObject* receivedObject;
7171
unique_ptr<FairMQMessage> request(NewMessage());
7272

73-
if (fChannels.at("data-in").at(0).ReceiveAsync(request) >= 0) {
73+
if (fChannels.at("data-in").at(0).Receive(request, 0) >= 0) {
7474
TMessageWrapper tm(request->GetData(), request->GetSize());
7575
receivedObject = static_cast<TObject*>(tm.ReadObject(tm.GetClass()));
7676
} else {

0 commit comments

Comments
 (0)