TS-1067 Remove more stats counting that is not needed anymore
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7779ba62 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7779ba62 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7779ba62 Branch: refs/heads/master Commit: 7779ba629d8d62264fd06a4b57039f645eee2ca6 Parents: 39483b1 Author: Leif Hedstrom <[email protected]> Authored: Tue Mar 26 14:38:37 2013 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Tue Apr 2 13:52:33 2013 -0600 ---------------------------------------------------------------------- iocore/net/P_UDPConnection.h | 23 +---------------------- iocore/net/UnixUDPNet.cc | 13 ------------- 2 files changed, 1 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7779ba62/iocore/net/P_UDPConnection.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_UDPConnection.h b/iocore/net/P_UDPConnection.h index aacea6d..7cc7c33 100644 --- a/iocore/net/P_UDPConnection.h +++ b/iocore/net/P_UDPConnection.h @@ -60,38 +60,17 @@ public: // the same as the lastSentPktStartTime. uint64_t lastSentPktStartTime; uint64_t lastPktStartTime; - int32_t pipe_class; - uint32_t nBytesDone; - uint32_t nBytesTodo; - // flow rate in Bytes per sec. - double flowRateBps; - double avgPktSize; - int64_t allocedbps; - - //this class is abstract }; TS_INLINE UDPConnectionInternal::UDPConnectionInternal() - : continuation(NULL) - , recvActive(0) - , refcount(0) - , fd(-1) - , binding_valid(0) - , tobedestroyed(0) - , nBytesDone(0) - , nBytesTodo(0) + : continuation(NULL), recvActive(0), refcount(0), fd(-1), binding_valid(0), tobedestroyed(0) { sendGenerationNum = 0; lastSentPktTSSeqNum = -1; lastSentPktStartTime = 0; lastPktStartTime = 0; - pipe_class = 0; - flowRateBps = 0.0; - avgPktSize = 0.0; - allocedbps = 0; memset(&binding, 0, sizeof binding); - //SET_HANDLER(&BaseUDPConnection::callbackHandler); } TS_INLINE http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7779ba62/iocore/net/UnixUDPNet.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixUDPNet.cc b/iocore/net/UnixUDPNet.cc index fc94acc..c1e839d 100644 --- a/iocore/net/UnixUDPNet.cc +++ b/iocore/net/UnixUDPNet.cc @@ -696,18 +696,9 @@ UDPQueue::service(UDPNetHandler * nh) minPktSpacing = 0.0; pktSendTime = p->delivery_time; p->pktSendStartTime = MAX(MAX(now, pktSendTime), p->delivery_time); - if (p->conn->flowRateBps > 25600.0) - Debug("udpnet-pkt", "Pkt size = %.1lf now = %" PRId64 ", send = %" PRId64 ", del = %" PRId64 ", Delay delta = %" PRId64 "; delta = %" PRId64 "", - p->conn->avgPktSize, - now, pktSendTime, p->delivery_time, - ink_hrtime_to_msec(p->pktSendStartTime - now), - ink_hrtime_to_msec(p->pktSendStartTime - p->conn->lastPktStartTime)); - - p->conn->avgPktSize = ((4.0 * p->conn->avgPktSize) / 5.0) + (pktSize / 5.0); } p->conn->lastPktStartTime = p->pktSendStartTime; p->delivery_time = p->pktSendStartTime; - p->conn->nBytesTodo += pktLen; g_udp_bytesPending += pktLen; G_inkPipeInfo.addPacket(p, now); @@ -754,8 +745,6 @@ UDPQueue::SendPackets() while ((p = reliabilityPktQueue.dequeue()) != NULL) { pktLen = p->getPktLength(); g_udp_bytesPending -= pktLen; - - p->conn->nBytesTodo -= pktLen; p->conn->nBytesDone += pktLen; if (p->conn->shouldDestroy()) @@ -783,8 +772,6 @@ sendPackets: pktLen = p->getPktLength(); g_udp_bytesPending -= pktLen; - p->conn->nBytesTodo -= pktLen; - p->conn->nBytesDone += pktLen; if (p->conn->shouldDestroy()) goto next_pkt; if (p->conn->GetSendGenerationNumber() != p->reqGenerationNum)
