You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2015/01/27 20:24:30 UTC
[1/3] trafficserver git commit: TS-3330: Several broken stats
Repository: trafficserver
Updated Branches:
refs/heads/master 37f0fd013 -> e89dc276f
TS-3330: Several broken stats
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bf213732
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bf213732
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bf213732
Branch: refs/heads/master
Commit: bf213732cf98ccf1b53750e3fdc57230144c1e41
Parents: 9a9c451
Author: Brian Geffon <br...@apache.org>
Authored: Tue Jan 27 11:23:21 2015 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Jan 27 11:23:21 2015 -0800
----------------------------------------------------------------------
iocore/net/P_Net.h | 3 ---
iocore/net/SSLNetVConnection.cc | 6 +++---
iocore/net/UnixNetVConnection.cc | 13 +++++++------
3 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf213732/iocore/net/P_Net.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_Net.h b/iocore/net/P_Net.h
index 8dfa309..cb838f3 100644
--- a/iocore/net/P_Net.h
+++ b/iocore/net/P_Net.h
@@ -63,9 +63,6 @@ extern RecRawStatBlock *net_rsb;
#define SSL_HANDSHAKE_WANT_ACCEPT 8
#define SSL_HANDSHAKE_WANT_CONNECT 9
-#define NET_DEBUG_COUNT_DYN_STAT(_x, _y) \
-RecIncrRawStatCount(net_rsb, mutex->thread_holding, (int)_x, _y)
-
#define NET_INCREMENT_DYN_STAT(_x) \
RecIncrRawStatSum(net_rsb, mutex->thread_holding, (int)_x, 1)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf213732/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 91ae8e7..235257a 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -328,7 +328,7 @@ SSLNetVConnection::read_raw_data()
} else {
r = socketManager.readv(this->con.fd, &tiovec[0], niov);
}
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_read_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_read_stat);
total_read += rattempted;
} while (rattempted && r == rattempted && total_read < toread);
@@ -343,7 +343,7 @@ SSLNetVConnection::read_raw_data()
if (r <= 0) {
if (r == -EAGAIN || r == -ENOTCONN) {
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_read_nodata_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_read_nodata_stat);
return r;
}
@@ -702,7 +702,7 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, i
}
Debug("ssl", "SSLNetVConnection::loadBufferAndCallWrite,Number of bytes written=%" PRId64" , total=%" PRId64"", r, total_written);
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_write_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_write_stat);
} while (r == l && total_written < towrite && b);
if (r > 0) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf213732/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 0319c8e..873751b 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -268,7 +268,7 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
} else {
r = socketManager.readv(vc->con.fd, &tiovec[0], niov);
}
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_read_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_read_stat);
total_read += rattempted;
} while (rattempted && r == rattempted && total_read < toread);
@@ -283,7 +283,7 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
if (r <= 0) {
if (r == -EAGAIN || r == -ENOTCONN) {
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_read_nodata_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_read_nodata_stat);
vc->read.triggered = 0;
nh->read_ready_list.remove(vc);
return;
@@ -349,8 +349,9 @@ write_to_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
{
ProxyMutex *mutex = thread->mutex;
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_writetonet_stat, 1);
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_writetonet_afterpoll_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_writetonet_stat);
+ NET_INCREMENT_DYN_STAT(net_calls_to_writetonet_afterpoll_stat);
+
write_to_net_io(nh, vc, thread);
}
@@ -458,7 +459,7 @@ write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
// check for errors
if (r <= 0) { // if the socket was not ready,add to WaitList
if (r == -EAGAIN || r == -ENOTCONN) {
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_write_nodata_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_write_nodata_stat);
if((needs & EVENTIO_WRITE) == EVENTIO_WRITE) {
vc->write.triggered = 0;
nh->write_ready_list.remove(vc);
@@ -898,7 +899,7 @@ UnixNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted,
else
r = socketManager.writev(con.fd, &tiovec[0], niov);
ProxyMutex *mutex = thread->mutex;
- NET_DEBUG_COUNT_DYN_STAT(net_calls_to_write_stat, 1);
+ NET_INCREMENT_DYN_STAT(net_calls_to_write_stat);
} while (r == wattempted && total_written < towrite);
needs |= EVENTIO_WRITE;
[3/3] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e89dc276
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e89dc276
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e89dc276
Branch: refs/heads/master
Commit: e89dc276f14992adc64978a8c361a017d874f2e7
Parents: 30606a9 37f0fd0
Author: Brian Geffon <br...@apache.org>
Authored: Tue Jan 27 11:24:21 2015 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Jan 27 11:24:21 2015 -0800
----------------------------------------------------------------------
proxy/http/HttpTransact.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] trafficserver git commit: TS-3330: update changes
Posted by br...@apache.org.
TS-3330: update changes
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/30606a91
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/30606a91
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/30606a91
Branch: refs/heads/master
Commit: 30606a9106b15132c04744e0d268b040e444cead
Parents: bf21373
Author: Brian Geffon <br...@apache.org>
Authored: Tue Jan 27 11:23:59 2015 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Jan 27 11:23:59 2015 -0800
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/30606a91/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 60592d4..ea15c58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3330] Several broken stats
+
*) [TS-3326] apply proxy.config.http.send_http11_requests when hostdb is
skipped.