Skip to content

Commit 883464c

Browse files
davidrohrBenedikt Volkel
authored andcommitted
DPL: Improve some signpost messages
(cherry picked from commit 2ca79e0)
1 parent 988cb72 commit 883464c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Framework/Core/src/DataRelayer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void DataRelayer::pruneCache(TimesliceSlot slot, OnDropCallback onDrop)
372372
bool anyDropped = std::any_of(dropped.begin(), dropped.end(), [](auto& m) { return m.size(); });
373373
if (anyDropped) {
374374
O2_SIGNPOST_ID_GENERATE(aid, data_relayer);
375-
O2_SIGNPOST_EVENT_EMIT(data_relayer, aid, "pruneCache", "Dropping stuff from slot %zu %zu", slot.index, oldestPossibleTimeslice.timeslice.value);
375+
O2_SIGNPOST_EVENT_EMIT(data_relayer, aid, "pruneCache", "Dropping stuff from slot %zu with timeslice %zu", slot.index, oldestPossibleTimeslice.timeslice.value);
376376
onDrop(slot, dropped, oldestPossibleTimeslice);
377377
}
378378
}

Framework/Core/src/TimesliceIndex.cxx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// or submit itself to any jurisdiction.
1111
#include "Framework/TimesliceIndex.h"
1212
#include "Framework/Signpost.h"
13+
#include <fairmq/Channel.h>
1314

1415
O2_DECLARE_DYNAMIC_LOG(timeslice_index);
1516

@@ -162,11 +163,11 @@ TimesliceIndex::OldestInputInfo TimesliceIndex::setOldestPossibleInput(Timeslice
162163
}
163164
}
164165
if (changed && mOldestPossibleInput.timeslice.value != result.timeslice.value) {
165-
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "setOldestPossibleInput", "Success: Oldest possible input is %zu due to channel %d",
166-
result.timeslice.value, result.channel.value);
166+
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "setOldestPossibleInput", "Success (channel %d): Oldest possible input is %zu due to channel %d",
167+
channel.value, result.timeslice.value, result.channel.value);
167168
} else if (mOldestPossibleInput.timeslice.value != result.timeslice.value) {
168-
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "setOldestPossibleInput", "Oldest possible input updated from timestamp: %zu --> %zu",
169-
mOldestPossibleInput.timeslice.value, result.timeslice.value);
169+
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "setOldestPossibleInput", "channel %d: Oldest possible input updated from timestamp: %zu --> %zu",
170+
channel.value, mOldestPossibleInput.timeslice.value, result.timeslice.value);
170171
} else {
171172
O2_SIGNPOST_EVENT_EMIT(timeslice_index, tid, "setOldestPossibleInput", "No change in oldest possible input");
172173
}

0 commit comments

Comments
 (0)