You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zy...@apache.org on 2013/04/02 09:37:28 UTC
git commit: TS-1791: remove m_mutex acquire&release to avoid deadlock
Updated Branches:
refs/heads/master 349d11d21 -> 91ba85cac
TS-1791: remove m_mutex acquire&release to avoid deadlock
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/91ba85ca
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/91ba85ca
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/91ba85ca
Branch: refs/heads/master
Commit: 91ba85cac417088567c82bc626b71be64b568355
Parents: 349d11d
Author: Gang Li <qu...@taobao.com>
Authored: Mon Apr 1 16:35:31 2013 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Tue Apr 2 15:36:59 2013 +0800
----------------------------------------------------------------------
CHANGES | 3 +++
proxy/logging/LogBuffer.cc | 4 +---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/91ba85ca/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8a5218a..9883ad7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
Changes with Apache Traffic Server 3.3.2
+ *) [TS-1791] remove m_mutex acquire&release to avoid deadlock in
+ ~LogBufferList(). Author: Gang Li <qu...@taobao.com>.
+
*) [TS-1713] SRV support refine. Now the srv option is able to enable, with
no crash. Be care, the hostdb.storage_size or ostdb.size need check.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/91ba85ca/proxy/logging/LogBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 937247b..5cfab2a 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -764,12 +764,10 @@ LogBufferList::LogBufferList()
LogBufferList::~LogBufferList()
{
LogBuffer *lb;
- ink_mutex_acquire(&m_mutex);
- m_size = 0;
while ((lb = get()) != NULL) {
delete lb;
}
- ink_mutex_release(&m_mutex);
+ m_size = 0;
ink_mutex_destroy(&m_mutex);
}