Merge pull request OpenDDS#4807 from mitza-oci/send-buffer-mutex

SingleSendBuffer::pre_clear() needs the lock
sonndinh · Sep 30, 2024 · e132510 · e132510
2 parents 69ae5b3 + 432a1aa
commit e132510
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dds/DCPS/transport/framework/TransportSendBuffer.h b/dds/DCPS/transport/framework/TransportSendBuffer.h
@@ -198,6 +198,7 @@ class OpenDDS_Dcps_Export SingleSendBuffer
 
   void pre_clear()
   {
+    ACE_GUARD(ACE_Thread_Mutex, g, mutex_);
     pre_seq_.clear();
   }
 

diff --git a/dds/DCPS/transport/rtps_udp/RtpsUdpDataLink.cpp b/dds/DCPS/transport/rtps_udp/RtpsUdpDataLink.cpp
@@ -842,9 +842,10 @@ RtpsUdpDataLink::RtpsWriter::pre_stop_helper(TqeVector& to_drop, bool true_stop)
     }
   }
 
+  g2.release();
+
   send_buff_->pre_clear();
 
-  g2.release();
   g.release();
 
   if (stopping_) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -198,6 +198,7 @@ class OpenDDS_Dcps_Export SingleSendBuffer @@
       void pre_clear()
       {
+        ACE_GUARD(ACE_Thread_Mutex, g, mutex_);
         pre_seq_.clear();
       }
@@ Expand Down @@