You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/07/12 17:40:03 UTC
svn commit: r1145635 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES
STATUS iocore/dns/DNS.cc iocore/eventsystem/I_Lock.h
Author: igalic
Date: Tue Jul 12 15:40:03 2011
New Revision: 1145635
URL: http://svn.apache.org/viewvc?rev=1145635&view=rev
Log:
backport TS-833
Modified:
trafficserver/traffic/branches/3.0.x/ (props changed)
trafficserver/traffic/branches/3.0.x/CHANGES
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/iocore/dns/DNS.cc
trafficserver/traffic/branches/3.0.x/iocore/eventsystem/I_Lock.h
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 15:40:03 2011
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
/trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137844,1137846
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137844,1137846,1144096,1144746
Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1145635&r1=1145634&r2=1145635&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Tue Jul 12 15:40:03 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.1
+ *) [TS-833] Continuation::handleEvent deadbeef fix. This fixes most of the
+ dns related crashes
+
*) [TS-828]: Various memory leaks and uninitialized values.
Author: William Bardwell
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1145635&r1=1145634&r2=1145635&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Tue Jul 12 15:40:03 2011
@@ -61,13 +61,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-860
+1: zwoop, igalic
- * DNS: Continuation::handleEvent deadbeef fix. Will fix most of the dns
- related crashes
- Trunk patch: http://svn.apache.org/viewvc?rev=1144096&view=rev
- http://svn.apache.org/viewvc?rev=1144746&view=rev
- Jira: https://issues.apache.org/jira/browse/TS-833
- +1: zym, igalic, zwoop
-
* Management: cop Crash, InactivityCop::check_inactivity, event=2, UnixNet.cc:57
Trunk patch: http://svn.apache.org/viewvc?rev=1144094&view=rev
Jira: https://issues.apache.org/jira/browse/TS-834
Modified: trafficserver/traffic/branches/3.0.x/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/iocore/dns/DNS.cc?rev=1145635&r1=1145634&r2=1145635&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/branches/3.0.x/iocore/dns/DNS.cc Tue Jul 12 15:40:03 2011
@@ -986,7 +986,7 @@ DNSProcessor::getby(const char *x, int l
DNSEntry *e = dnsEntryAllocator.alloc();
e->retries = dns_retries;
e->init(x, len, type, cont, adnsH, timeout);
- MUTEX_TRY_LOCK(lock, e->mutex, thread);
+ MUTEX_TRY_LOCK(lock, e->mutex, this_ethread());
if (!lock)
thread->schedule_imm(e);
else
Modified: trafficserver/traffic/branches/3.0.x/iocore/eventsystem/I_Lock.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/iocore/eventsystem/I_Lock.h?rev=1145635&r1=1145634&r2=1145635&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/iocore/eventsystem/I_Lock.h (original)
+++ trafficserver/traffic/branches/3.0.x/iocore/eventsystem/I_Lock.h Tue Jul 12 15:40:03 2011
@@ -383,6 +383,7 @@ Mutex_trylock(
{
ink_assert(t != 0);
+ ink_debug_assert(t == (EThread*)this_thread());
if (m->thread_holding != t) {
if (!ink_mutex_try_acquire(&m->the_mutex)) {
#ifdef DEBUG