[core] Added a trailing space in CONID()

gou4shi1 · maxsharabayko · commit 229192c8a399 · 2022-09-28T19:31:01.000+02:00
diff --git a/srtcore/api.cpp b/srtcore/api.cpp
@@ -1946,9 +1946,9 @@ void srt::CUDTUnited::deleteGroup_LOCKED(CUDTGroup* g)
 
 int srt::CUDTUnited::close(CUDTSocket* s)
 {
-    HLOGC(smlog.Debug, log << s->core().CONID() << " CLOSE. Acquiring control lock");
+    HLOGC(smlog.Debug, log << s->core().CONID() << "CLOSE. Acquiring control lock");
     ScopedLock socket_cg(s->m_ControlLock);
-    HLOGC(smlog.Debug, log << s->core().CONID() << " CLOSING (removing from listening, closing CUDT)");
+    HLOGC(smlog.Debug, log << s->core().CONID() << "CLOSING (removing from listening, closing CUDT)");
 
     const bool synch_close_snd = s->core().m_config.bSynSending;
 
@@ -1971,7 +1971,7 @@ int srt::CUDTUnited::close(CUDTSocket* s)
         // be unable to bind to this port that the about-to-delete listener
         // is currently occupying (due to blocked slot in the RcvQueue).
 
-        HLOGC(smlog.Debug, log << s->core().CONID() << " CLOSING (removing listener immediately)");
+        HLOGC(smlog.Debug, log << s->core().CONID() << "CLOSING (removing listener immediately)");
         s->core().notListening();
 
         // broadcast all "accept" waiting
@@ -1989,7 +1989,7 @@ int srt::CUDTUnited::close(CUDTSocket* s)
         // synchronize with garbage collection.
         HLOGC(smlog.Debug,
               log << "@" << u << "U::close done. GLOBAL CLOSE: " << s->core().CONID()
-                  << ". Acquiring GLOBAL control lock");
+                  << "Acquiring GLOBAL control lock");
         ScopedLock manager_cg(m_GlobControlLock);
         // since "s" is located before m_GlobControlLock, locate it again in case
         // it became invalid
diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -6094,13 +6094,13 @@ bool srt::CUDT::closeInternal()
     // that has m_bBroken == false or m_bConnected == true.
     // If it is intended to forcefully close the socket, make sure
     // that it's in response to a broken connection.
-    HLOGC(smlog.Debug, log << CONID() << " - closing socket:");
+    HLOGC(smlog.Debug, log << CONID() << "closing socket");
 
     if (m_config.Linger.l_onoff != 0)
     {
         const steady_clock::time_point entertime = steady_clock::now();
 
-        HLOGC(smlog.Debug, log << CONID() << " ... (linger)");
+        HLOGC(smlog.Debug, log << CONID() << "... (linger)");
         while (!m_bBroken && m_bConnected && (m_pSndBuffer->getCurrBufSize() > 0) &&
                (steady_clock::now() - entertime < seconds_from(m_config.Linger.l_linger)))
         {
@@ -7726,7 +7726,7 @@ void srt::CUDT::ackDataUpTo(int32_t ack)
     if (acksize < 0)
     {
         LOGC(xtlog.Error,
-             log << CONID() << " ackDataUpTo: IPE: invalid ACK from %" << m_iRcvLastSkipAck << " to %" << ack << " ("
+             log << CONID() << "ackDataUpTo: IPE: invalid ACK from %" << m_iRcvLastSkipAck << " to %" << ack << " ("
                  << acksize << " packets)");
         return;
     }
@@ -7772,7 +7772,7 @@ void srt::CUDT::dropToGroupRecvBase() {
     if (cnt > 0)
     {
         HLOGC(grlog.Debug,
-              log << "dropToGroupRecvBase: " << CONID() << " dropped " << cnt << " packets before ACK: group_recv_base="
+              log << "dropToGroupRecvBase: " << CONID() << "dropped " << cnt << " packets before ACK: group_recv_base="
                   << group_recv_base << " m_iRcvLastSkipAck=" << m_iRcvLastSkipAck
                   << " m_iRcvCurrSeqNo=" << m_iRcvCurrSeqNo << " m_bTsbPd=" << m_bTsbPd);
     }
@@ -8008,7 +8008,7 @@ int srt::CUDT::sendCtrlAck(CPacket& ctrlpkt, int size)
         ctrlpkt.pack(UMSG_ACK, NULL, &ack, size);
         ctrlpkt.m_iID = m_PeerID;
         nbsent = m_pSndQueue->sendto(m_PeerAddr, ctrlpkt);
-        DebugAck("sendCtrl(lite):" + CONID(), local_prevack, ack);
+        DebugAck("sendCtrl(lite): " + CONID(), local_prevack, ack);
         return nbsent;
     }
 
diff --git a/srtcore/core.h b/srtcore/core.h
@@ -288,7 +288,7 @@ class CUDT
     {
 #if ENABLE_LOGGING
         std::ostringstream os;
-        os << "@" << m_SocketID << ":";
+        os << "@" << m_SocketID << ": ";
         return os.str();
 #else
         return "";

Original file line number	Diff line number	Diff line change
`@@ -6094,13 +6094,13 @@ bool srt::CUDT::closeInternal()`
`6094`	`6094`	`// that has m_bBroken == false or m_bConnected == true.`
`6095`	`6095`	`// If it is intended to forcefully close the socket, make sure`
`6096`	`6096`	`// that it's in response to a broken connection.`
`6097`		`- HLOGC(smlog.Debug, log << CONID() << " - closing socket:");`
	`6097`	`+ HLOGC(smlog.Debug, log << CONID() << "closing socket");`
`6098`	`6098`
`6099`	`6099`	`if (m_config.Linger.l_onoff != 0)`
`6100`	`6100`	`{`
`6101`	`6101`	`const steady_clock::time_point entertime = steady_clock::now();`
`6102`	`6102`
`6103`		`- HLOGC(smlog.Debug, log << CONID() << " ... (linger)");`
	`6103`	`+ HLOGC(smlog.Debug, log << CONID() << "... (linger)");`
`6104`	`6104`	`while (!m_bBroken && m_bConnected && (m_pSndBuffer->getCurrBufSize() > 0) &&`
`6105`	`6105`	`(steady_clock::now() - entertime < seconds_from(m_config.Linger.l_linger)))`
`6106`	`6106`	`{`
`@@ -7726,7 +7726,7 @@ void srt::CUDT::ackDataUpTo(int32_t ack)`
`7726`	`7726`	`if (acksize < 0)`
`7727`	`7727`	`{`
`7728`	`7728`	`LOGC(xtlog.Error,`
`7729`		`- log << CONID() << " ackDataUpTo: IPE: invalid ACK from %" << m_iRcvLastSkipAck << " to %" << ack << " ("`
	`7729`	`+ log << CONID() << "ackDataUpTo: IPE: invalid ACK from %" << m_iRcvLastSkipAck << " to %" << ack << " ("`
`7730`	`7730`	`<< acksize << " packets)");`
`7731`	`7731`	`return;`
`7732`	`7732`	`}`
`@@ -7772,7 +7772,7 @@ void srt::CUDT::dropToGroupRecvBase() {`
`7772`	`7772`	`if (cnt > 0)`
`7773`	`7773`	`{`
`7774`	`7774`	`HLOGC(grlog.Debug,`
`7775`		`- log << "dropToGroupRecvBase: " << CONID() << " dropped " << cnt << " packets before ACK: group_recv_base="`
	`7775`	`+ log << "dropToGroupRecvBase: " << CONID() << "dropped " << cnt << " packets before ACK: group_recv_base="`
`7776`	`7776`	`<< group_recv_base << " m_iRcvLastSkipAck=" << m_iRcvLastSkipAck`
`7777`	`7777`	`<< " m_iRcvCurrSeqNo=" << m_iRcvCurrSeqNo << " m_bTsbPd=" << m_bTsbPd);`
`7778`	`7778`	`}`
`@@ -8008,7 +8008,7 @@ int srt::CUDT::sendCtrlAck(CPacket& ctrlpkt, int size)`
`8008`	`8008`	`ctrlpkt.pack(UMSG_ACK, NULL, &ack, size);`
`8009`	`8009`	`ctrlpkt.m_iID = m_PeerID;`
`8010`	`8010`	`nbsent = m_pSndQueue->sendto(m_PeerAddr, ctrlpkt);`
`8011`		`- DebugAck("sendCtrl(lite):" + CONID(), local_prevack, ack);`
	`8011`	`+ DebugAck("sendCtrl(lite): " + CONID(), local_prevack, ack);`
`8012`	`8012`	`return nbsent;`
`8013`	`8013`	`}`
`8014`	`8014`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ class CUDT`
`288`	`288`	`{`
`289`	`289`	`#if ENABLE_LOGGING`
`290`	`290`	`std::ostringstream os;`
`291`		`- os << "@" << m_SocketID << ":";`
	`291`	`+ os << "@" << m_SocketID << ": ";`
`292`	`292`	`return os.str();`
`293`	`293`	`#else`
`294`	`294`	`return "";`