[core] rename syncWithSocket() to syncWithFirstSocket()

Haivision · May 13, 2023 · 4c68203 · 4c68203
1 parent 02351e3
commit 4c68203
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/docs/dev/low-level-info.md b/docs/dev/low-level-info.md
@@ -159,8 +159,6 @@ CRcvQueue::worker_TryAsyncRend_OrStore
                      [IF Responder]
                      {
                          CUDT::makeMePeerOf
-                             [LOCKS m_GroupLock]
-                                 CUDTGroup::syncWithSocket
                              CUDTGroup::find --> [LOCKED m_GroupLock]
                      }
                      debugGroup -- > [LOCKED m_GroupLock]
@@ -189,8 +187,6 @@ CRcvQueue::worker_ProcessConnectionRequest
                      [IF Responder]
                      {
                          CUDT::makeMePeerOf
-                             [LOCKS m_GroupLock]
-                                 CUDTGroup::syncWithSocket
                              CUDTGroup::find --> [LOCKED m_GroupLock]
                      }
                      debugGroup -- > [LOCKED m_GroupLock]

diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -3151,10 +3151,10 @@ bool srt::CUDT::interpretGroup(const int32_t groupdata[], size_t data_size SRT_A
                   log << CONID() << "HS/RSP: group $" << pg->id() << " -> peer $" << pg->peerid()
                       << ", copying characteristic data");
 
-            // The call to syncWithSocket is copying
+            // The call to syncWithFirstSocket is copying
             // some interesting data from the first connected
             // socket. This should be only done for the first successful connection.
-            pg->syncWithSocket(*this, HSD_INITIATOR);
+            pg->syncWithFirstSocket(*this, HSD_INITIATOR);
         }
         // Otherwise the peer id must be the same as existing, otherwise
         // this group is considered already bound to another peer group.
@@ -3269,7 +3269,7 @@ SRTSOCKET srt::CUDT::makeMePeerOf(SRTSOCKET peergroup, SRT_GROUP_TYPE gtp, uint3
 
         gp->set_peerid(peergroup);
         gp->deriveSettings(this);
-        gp->syncWithSocket(s->core(), HSD_RESPONDER);
+        gp->syncWithFirstSocket(s->core(), HSD_RESPONDER);
 
         // This can only happen on a listener (it's only called on a site that is
         // HSD_RESPONDER), so it was a response for a groupwise connection.

diff --git a/srtcore/group.cpp b/srtcore/group.cpp
@@ -771,8 +771,7 @@ SRT_SOCKSTATUS CUDTGroup::getStatus()
     return SRTS_BROKEN;
 }
 
-// [[using locked(m_GroupLock)]];
-void CUDTGroup::syncWithSocket(const CUDT& core, const HandshakeSide side)
+void CUDTGroup::syncWithFirstSocket(const CUDT& core, const HandshakeSide side)
 {
     if (side == HSD_RESPONDER)
     {

diff --git a/srtcore/group.h b/srtcore/group.h
@@ -358,7 +358,7 @@ class CUDTGroup
     /// @param ack The past-the-last-received ACK sequence number
     void readyPackets(srt::CUDT* core, int32_t ack);
 
-    void syncWithSocket(const srt::CUDT& core, const HandshakeSide side);
+    void syncWithFirstSocket(const srt::CUDT& core, const HandshakeSide side);
     int  getGroupData(SRT_SOCKGROUPDATA* pdata, size_t* psize);
     int  getGroupData_LOCKED(SRT_SOCKGROUPDATA* pdata, size_t* psize);