Skip to content

Commit 1e60096

Browse files
authored
DPL: use detail level for messages which come during initialisation (#8806)
They should be minimal and non repetitive, so it simplifies debugging to not exclude them.
1 parent 1830b03 commit 1e60096

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

Framework/Core/src/DataProcessingDevice.cxx

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -455,17 +455,17 @@ void DataProcessingDevice::initPollers()
455455
(channelName.rfind("from_internal-dpl-aod", 0) != 0) &&
456456
(channelName.rfind("from_internal-dpl-ccdb-backend", 0) != 0) &&
457457
(channelName.rfind("from_internal-dpl-injected", 0)) != 0) {
458-
LOGP(debug, "{} is an internal channel. Skipping as no input will come from there.", channelName);
458+
LOGP(detail, "{} is an internal channel. Skipping as no input will come from there.", channelName);
459459
continue;
460460
}
461461
// We only watch receiving sockets.
462462
if (channelName.rfind("from_" + mSpec.name + "_", 0) == 0) {
463-
LOGP(debug, "{} is to send data. Not polling.", channelName);
463+
LOGP(detail, "{} is to send data. Not polling.", channelName);
464464
continue;
465465
}
466466

467467
if (channelName.rfind("from_") != 0) {
468-
LOGP(info, "{} is not a DPL socket. Not polling.", channelName);
468+
LOGP(detail, "{} is not a DPL socket. Not polling.", channelName);
469469
continue;
470470
}
471471

@@ -479,7 +479,7 @@ void DataProcessingDevice::initPollers()
479479
LOG(error) << "Cannot get file descriptor for channel." << channelName;
480480
continue;
481481
}
482-
LOGP(debug, "Polling socket for {}", channelName);
482+
LOGP(detail, "Polling socket for {}", channelName);
483483
auto* pCtx = (PollerContext*)malloc(sizeof(PollerContext));
484484
pCtx->name = strdup(channelName.c_str());
485485
pCtx->loop = mState.loop;
@@ -493,7 +493,7 @@ void DataProcessingDevice::initPollers()
493493
poller->data = pCtx;
494494
uv_poll_init(mState.loop, poller, zmq_fd);
495495
if (channelName.rfind("from_") != 0) {
496-
LOGP(debug, "{} is an out of band channel.", channelName);
496+
LOGP(detail, "{} is an out of band channel.", channelName);
497497
mState.activeOutOfBandPollers.push_back(poller);
498498
} else {
499499
mState.activeInputPollers.push_back(poller);
@@ -509,11 +509,11 @@ void DataProcessingDevice::initPollers()
509509
mDeviceContext.exitTransitionTimeout = 0;
510510
for (auto& [channelName, channel] : fChannels) {
511511
if (channelName.rfind(mSpec.channelPrefix + "from_internal-dpl", 0) == 0) {
512-
LOGP(debug, "{} is an internal channel. Not polling.", channelName);
512+
LOGP(detail, "{} is an internal channel. Not polling.", channelName);
513513
continue;
514514
}
515515
if (channelName.rfind(mSpec.channelPrefix + "from_" + mSpec.name + "_", 0) == 0) {
516-
LOGP(debug, "{} is an out of band channel. Not polling for output.", channelName);
516+
LOGP(detail, "{} is an out of band channel. Not polling for output.", channelName);
517517
continue;
518518
}
519519
// We assume there is always a ZeroMQ socket behind.
@@ -526,7 +526,7 @@ void DataProcessingDevice::initPollers()
526526
LOGP(error, "Cannot get file descriptor for channel {}", channelName);
527527
continue;
528528
}
529-
LOG(debug) << "Polling socket for " << channel[0].GetName();
529+
LOG(detail) << "Polling socket for " << channel[0].GetName();
530530
// FIXME: leak
531531
auto* pCtx = (PollerContext*)malloc(sizeof(PollerContext));
532532
pCtx->name = strdup(channelName.c_str());
@@ -573,12 +573,15 @@ void DataProcessingDevice::startPollers()
573573

574574
void DataProcessingDevice::stopPollers()
575575
{
576+
LOGP(detail, "Stopping {} input pollers", mState.activeInputPollers.size());
576577
for (auto& poller : mState.activeInputPollers) {
577578
uv_poll_stop(poller);
578579
}
580+
LOGP(detail, "Stopping {} out of band pollers", mState.activeOutOfBandPollers.size());
579581
for (auto& poller : mState.activeOutOfBandPollers) {
580582
uv_poll_stop(poller);
581583
}
584+
LOGP(detail, "Stopping {} output pollers", mState.activeOutOfBandPollers.size());
582585
for (auto& poller : mState.activeOutputPollers) {
583586
uv_poll_stop(poller);
584587
}
@@ -623,11 +626,11 @@ void DataProcessingDevice::InitTask()
623626
&pendingRegionInfos = mPendingRegionInfos,
624627
&regionInfoMutex = mRegionInfoMutex](FairMQRegionInfo info) {
625628
std::lock_guard<std::mutex> lock(regionInfoMutex);
626-
LOG(debug) << ">>> Region info event" << info.event;
627-
LOG(debug) << "id: " << info.id;
628-
LOG(debug) << "ptr: " << info.ptr;
629-
LOG(debug) << "size: " << info.size;
630-
LOG(debug) << "flags: " << info.flags;
629+
LOG(detail) << ">>> Region info event" << info.event;
630+
LOG(detail) << "id: " << info.id;
631+
LOG(detail) << "ptr: " << info.ptr;
632+
LOG(detail) << "size: " << info.size;
633+
LOG(detail) << "flags: " << info.flags;
631634
context.expectedRegionCallbacks -= 1;
632635
pendingRegionInfos.push_back(info);
633636
// We always want to handle these on the main loop

0 commit comments

Comments
 (0)