You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2019/02/07 03:11:18 UTC

[trafficserver] branch quic-latest updated: Remove a mutex for frame transmitter

This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/quic-latest by this push:
     new 57ce5d8  Remove a mutex for frame transmitter
57ce5d8 is described below

commit 57ce5d89416e07174516f4775053ff8cad01114a
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Thu Feb 7 12:09:55 2019 +0900

    Remove a mutex for frame transmitter
    
    We had frame transmitter but it was removed at some point.
---
 iocore/net/P_QUICNetVConnection.h | 1 -
 iocore/net/QUICNetVConnection.cc  | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/iocore/net/P_QUICNetVConnection.h b/iocore/net/P_QUICNetVConnection.h
index 6aac61b..8e74814 100644
--- a/iocore/net/P_QUICNetVConnection.h
+++ b/iocore/net/P_QUICNetVConnection.h
@@ -337,7 +337,6 @@ private:
   QUICConnectionErrorUPtr _state_closing_send_packet();
 
   Ptr<ProxyMutex> _packet_transmitter_mutex;
-  Ptr<ProxyMutex> _frame_transmitter_mutex;
 
   void _init_flow_control_params(const std::shared_ptr<const QUICTransportParameters> &local_tp,
                                  const std::shared_ptr<const QUICTransportParameters> &remote_tp);
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index d5d940d..f7146cc 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -93,7 +93,6 @@ QUICNetVConnection::init(QUICConnectionId peer_cid, QUICConnectionId original_ci
 {
   SET_HANDLER((NetVConnHandler)&QUICNetVConnection::startEvent);
   this->_packet_transmitter_mutex    = new_ProxyMutex();
-  this->_frame_transmitter_mutex     = new_ProxyMutex();
   this->_udp_con                     = udp_con;
   this->_packet_handler              = packet_handler;
   this->_peer_quic_connection_id     = peer_cid;
@@ -119,7 +118,6 @@ QUICNetVConnection::init(QUICConnectionId peer_cid, QUICConnectionId original_ci
 {
   SET_HANDLER((NetVConnHandler)&QUICNetVConnection::acceptEvent);
   this->_packet_transmitter_mutex    = new_ProxyMutex();
-  this->_frame_transmitter_mutex     = new_ProxyMutex();
   this->_udp_con                     = udp_con;
   this->_packet_handler              = packet_handler;
   this->_peer_quic_connection_id     = peer_cid;
@@ -1363,7 +1361,6 @@ QUICNetVConnection::_packetize_frames(QUICEncryptionLevel level, uint64_t max_pa
   QUICFrameUPtr frame(nullptr, nullptr);
 
   SCOPED_MUTEX_LOCK(packet_transmitter_lock, this->_packet_transmitter_mutex, this_ethread());
-  SCOPED_MUTEX_LOCK(frame_transmitter_lock, this->_frame_transmitter_mutex, this_ethread());
   std::vector<QUICFrameInfo> frames;
 
   if (this->_has_ack_only_packet_out) {
@@ -1452,7 +1449,6 @@ void
 QUICNetVConnection::_packetize_closing_frame()
 {
   SCOPED_MUTEX_LOCK(packet_transmitter_lock, this->_packet_transmitter_mutex, this_ethread());
-  SCOPED_MUTEX_LOCK(frame_transmitter_lock, this->_frame_transmitter_mutex, this_ethread());
 
   if (this->_connection_error == nullptr || this->_the_final_packet) {
     return;