From 6a623b4b150926197dbd5da15866ea811eb3b1f6 Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Thu, 26 Oct 2023 10:08:20 -0500 Subject: [PATCH] Explicitly set the TRACE_NAME in TLOG calls in several hxx files --- include/iomanager/detail/IOManager.hxx | 12 +++++----- .../network/detail/NetworkSenderModel.hxx | 24 +++++++++++-------- .../queue/detail/QueueSenderModel.hxx | 4 ++-- 3 files changed, 22 insertions(+), 18 deletions(-) mode change 100755 => 100644 include/iomanager/detail/IOManager.hxx diff --git a/include/iomanager/detail/IOManager.hxx b/include/iomanager/detail/IOManager.hxx old mode 100755 new mode 100644 index 31a6b37..493a06d --- a/include/iomanager/detail/IOManager.hxx +++ b/include/iomanager/detail/IOManager.hxx @@ -58,11 +58,11 @@ IOManager::get_receiver(ConnectionId id) if (!m_receivers.count(id)) { if (QueueRegistry::get().has_queue(id.uid, id.data_type)) { // if queue - TLOG() << "Creating QueueReceiverModel for uid " << id.uid << ", datatype " << id.data_type; + TLOG("IOManager") << "Creating QueueReceiverModel for uid " << id.uid << ", datatype " << id.data_type; m_receivers[id] = std::make_shared>(id); } else { - TLOG() << "Creating NetworkReceiverModel for uid " << id.uid << ", datatype " << id.data_type << " in session " - << id.session; + TLOG("IOManager") << "Creating NetworkReceiverModel for uid " << id.uid << ", datatype " << id.data_type + << " in session " << id.session; m_receivers[id] = std::make_shared>(id); } } @@ -98,11 +98,11 @@ IOManager::get_sender(ConnectionId id) if (!m_senders.count(id)) { if (QueueRegistry::get().has_queue(id.uid, id.data_type)) { // if queue - TLOG() << "Creating QueueSenderModel for uid " << id.uid << ", datatype " << id.data_type; + TLOG("IOManager") << "Creating QueueSenderModel for uid " << id.uid << ", datatype " << id.data_type; m_senders[id] = std::make_shared>(id); } else { - TLOG() << "Creating NetworkSenderModel for uid " << id.uid << ", datatype " << id.data_type << " in session " - << id.session; + TLOG("IOManager") << "Creating NetworkSenderModel for uid " << id.uid << ", datatype " << id.data_type + << " in session " << id.session; m_senders[id] = std::make_shared>(id); } } diff --git a/include/iomanager/network/detail/NetworkSenderModel.hxx b/include/iomanager/network/detail/NetworkSenderModel.hxx index d990e26..2ce3d30 100755 --- a/include/iomanager/network/detail/NetworkSenderModel.hxx +++ b/include/iomanager/network/detail/NetworkSenderModel.hxx @@ -17,11 +17,12 @@ template inline NetworkSenderModel::NetworkSenderModel(ConnectionId const& conn_id) : SenderConcept(conn_id) { - TLOG() << "NetworkSenderModel created with DT! Addr: " << static_cast(this) - << ", uid=" << conn_id.uid << ", data_type=" << conn_id.data_type; + TLOG("NetworkSenderModel") << "NetworkSenderModel created with DT! Addr: " << static_cast(this) + << ", uid=" << conn_id.uid << ", data_type=" << conn_id.data_type; get_sender(std::chrono::milliseconds(1000)); if (m_network_sender_ptr == nullptr) { - TLOG() << "Initial connection attempt failed for uid=" << conn_id.uid << ", data_type=" << conn_id.data_type; + TLOG("NetworkSenderModel") << "Initial connection attempt failed for uid=" << conn_id.uid + << ", data_type=" << conn_id.data_type; } } @@ -82,7 +83,7 @@ NetworkSenderModel::get_sender(Sender::timeout_t const& timeout) m_network_sender_ptr = NetworkManager::get().get_sender(this->id()); if (NetworkManager::get().is_pubsub_connection(this->id())) { - TLOG() << "Setting topic to " << this->id().data_type; + TLOG("NetworkSenderModel") << "Setting topic to " << this->id().data_type; m_topic = this->id().data_type; } } catch (ers::Issue const& ex) { @@ -105,13 +106,14 @@ NetworkSenderModel::write_network(MessageType& message, Sender::timeou } auto serialized = dunedaq::serialization::serialize(message, dunedaq::serialization::kMsgPack); - // TLOG() << "Serialized message for network sending: " << serialized.size() << ", topic=" << m_topic << ", this=" + // TLOG("NetworkSenderModel") << "Serialized message for network sending: " << serialized.size() << ", topic=" << + // m_topic << ", this=" // << (void*)this; try { m_network_sender_ptr->send(serialized.data(), serialized.size(), extend_first_timeout(timeout), m_topic); } catch (ipm::SendTimeoutExpired const& ex) { - TLOG() << "Timeout detected, removing sender to re-acquire connection"; + TLOG("NetworkSenderModel") << "Timeout detected, removing sender to re-acquire connection"; NetworkManager::get().remove_sender(this->id()); m_network_sender_ptr = nullptr; throw; @@ -134,18 +136,19 @@ NetworkSenderModel::try_write_network(MessageType& message, Sender::ti std::lock_guard lk(m_send_mutex); get_sender(timeout); if (m_network_sender_ptr == nullptr) { - TLOG() << ConnectionInstanceNotFound(ERS_HERE, this->id().uid); + TLOG("NetworkSenderModel") << ConnectionInstanceNotFound(ERS_HERE, this->id().uid); return false; } auto serialized = dunedaq::serialization::serialize(message, dunedaq::serialization::kMsgPack); - // TLOG() << "Serialized message for network sending: " << serialized.size() << ", topic=" << m_topic << + // TLOG("NetworkSenderModel") << "Serialized message for network sending: " << serialized.size() << ", topic=" << + // m_topic << // ", this=" << (void*)this; auto res = m_network_sender_ptr->send(serialized.data(), serialized.size(), extend_first_timeout(timeout), m_topic, true); if (!res) { - TLOG() << "Timeout detected, removing sender to re-acquire connection"; + TLOG("NetworkSenderModel") << "Timeout detected, removing sender to re-acquire connection"; NetworkManager::get().remove_sender(this->id()); m_network_sender_ptr = nullptr; } @@ -176,7 +179,8 @@ NetworkSenderModel::write_network_with_topic(MessageType& message, } auto serialized = dunedaq::serialization::serialize(message, dunedaq::serialization::kMsgPack); - // TLOG() << "Serialized message for network sending: " << serialized.size() << ", topic=" << m_topic << ", this=" + // TLOG("NetworkSenderModel") << "Serialized message for network sending: " << serialized.size() << ", topic=" << + // m_topic << ", this=" // << (void*)this; try { diff --git a/include/iomanager/queue/detail/QueueSenderModel.hxx b/include/iomanager/queue/detail/QueueSenderModel.hxx index 0cc31ad..f7bec8e 100755 --- a/include/iomanager/queue/detail/QueueSenderModel.hxx +++ b/include/iomanager/queue/detail/QueueSenderModel.hxx @@ -65,9 +65,9 @@ template inline QueueSenderModel::QueueSenderModel(ConnectionId const& request) : SenderConcept(request) { - TLOG() << "QueueSenderModel created with DT! Addr: " << static_cast(this); + TLOG("QueueSenderModel") << "QueueSenderModel created with DT! Addr: " << static_cast(this); m_queue = QueueRegistry::get().get_queue(request.uid); - TLOG() << "QueueSenderModel m_queue=" << static_cast(m_queue.get()); + TLOG("QueueSenderModel") << "QueueSenderModel m_queue=" << static_cast(m_queue.get()); // get queue ref from queueregistry based on conn_id }