You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/02/19 03:04:43 UTC
git commit: TS-1115 Fix for debug builds, related to ICC fixes
Updated Branches:
refs/heads/master 03d858fce -> ef63f9f68
TS-1115 Fix for debug builds, related to ICC fixes
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ef63f9f6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ef63f9f6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ef63f9f6
Branch: refs/heads/master
Commit: ef63f9f688b2cdf694d182d8e2fc58412f4cbba4
Parents: 03d858f
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Feb 18 19:04:34 2012 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sat Feb 18 19:04:34 2012 -0700
----------------------------------------------------------------------
iocore/net/P_UDPConnection.h | 5 ++++-
iocore/net/P_UDPPacket.h | 1 -
proxy/UglyLogStubs.cc | 7 -------
3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ef63f9f6/iocore/net/P_UDPConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UDPConnection.h b/iocore/net/P_UDPConnection.h
index 9436073..234383e 100644
--- a/iocore/net/P_UDPConnection.h
+++ b/iocore/net/P_UDPConnection.h
@@ -97,7 +97,10 @@ UDPConnectionInternal::UDPConnectionInternal()
TS_INLINE
UDPConnectionInternal::~UDPConnectionInternal()
{
- udpNet.FreeBandwidth(this);
+ // TODO: This is not necessary, and should be removed with the
+ // elimination of UDP bandwidth limiting (used by long since
+ // removed UDP protocols). See bug TS-1067.
+ // udpNet.FreeBandwidth(this);
continuation = NULL;
mutex = NULL;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ef63f9f6/iocore/net/P_UDPPacket.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UDPPacket.h b/iocore/net/P_UDPPacket.h
index 87dcb23..9c44872 100644
--- a/iocore/net/P_UDPPacket.h
+++ b/iocore/net/P_UDPPacket.h
@@ -34,7 +34,6 @@
#define __P_UDPPPACKET_H_
#include "I_UDPNet.h"
-#include "P_UDPConnection.h"
//#define PACKETQUEUE_IMPL_AS_PQLIST
#define PACKETQUEUE_IMPL_AS_RING
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ef63f9f6/proxy/UglyLogStubs.cc
----------------------------------------------------------------------
diff --git a/proxy/UglyLogStubs.cc b/proxy/UglyLogStubs.cc
index abc7fa4..3e46647 100644
--- a/proxy/UglyLogStubs.cc
+++ b/proxy/UglyLogStubs.cc
@@ -47,13 +47,6 @@ UDPConnection::Release()
ink_release_assert(false);
}
-void
-UDPNetProcessor::FreeBandwidth(Continuation * udpConn)
-{
- NOWARN_UNUSED(udpConn);
- ink_release_assert(false);
-}
-
#include "InkAPIInternal.h"
ConfigUpdateCbTable *global_config_cbs = NULL;