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 2014/06/04 19:20:29 UTC
[1/2] git commit: TS-2874 Make some of the SPDY metrics persistent
Repository: trafficserver
Updated Branches:
refs/heads/master 90ff1a790 -> 54db32b2d
TS-2874 Make some of the SPDY metrics persistent
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0e3035ea
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0e3035ea
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0e3035ea
Branch: refs/heads/master
Commit: 0e3035eae5078744a2be5523814a25d705cb5cc8
Parents: 90ff1a7
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Jun 4 08:38:38 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Jun 4 08:38:38 2014 -0600
----------------------------------------------------------------------
CHANGES | 3 +++
proxy/spdy/SpdyClientSession.cc | 1 -
proxy/spdy/SpdyCommon.cc | 8 ++++----
proxy/spdy/SpdyCommon.h | 3 +--
4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 82b3204..1addfe4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2874] Make some of the SPDY metrics persistent, and also fix how we
+ measure transaction time / total streams.
+
*) [TS-2872] Can't set "Send Window" for SPDY/3.1 > 64k. Code mostly
provided by our SPDY brainiac, Geffon.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/proxy/spdy/SpdyClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc
index e69f3bc..8ea8072 100644
--- a/proxy/spdy/SpdyClientSession.cc
+++ b/proxy/spdy/SpdyClientSession.cc
@@ -61,7 +61,6 @@ SpdyRequest::init(SpdyClientSession *sm, int id)
start_time = TShrtime();
SPDY_INCREMENT_THREAD_DYN_STAT(SPDY_STAT_CURRENT_CLIENT_STREAM_COUNT, sm->mutex->thread_holding);
- SPDY_INCREMENT_THREAD_DYN_STAT(SPDY_STAT_TOTAL_CLIENT_STREAM_COUNT, sm->mutex->thread_holding);
}
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/proxy/spdy/SpdyCommon.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCommon.cc b/proxy/spdy/SpdyCommon.cc
index d14263b..db2fdc2 100644
--- a/proxy/spdy/SpdyCommon.cc
+++ b/proxy/spdy/SpdyCommon.cc
@@ -67,11 +67,11 @@ spdy_config_load()
static_cast<int>(SPDY_STAT_CURRENT_CLIENT_SESSION_COUNT), RecRawStatSyncSum);
RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_CURRENT_CLIENT_STREAM_NAME, RECD_INT, RECP_NON_PERSISTENT,
static_cast<int>(SPDY_STAT_CURRENT_CLIENT_STREAM_COUNT), RecRawStatSyncSum);
- RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_STREAM_NAME, RECD_INT, RECP_NON_PERSISTENT,
- static_cast<int>(SPDY_STAT_TOTAL_CLIENT_STREAM_COUNT), RecRawStatSyncSum);
- RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_TRANSACTIONS_TIME_NAME, RECD_INT, RECP_NON_PERSISTENT,
+ RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_STREAM_NAME, RECD_INT, RECP_PERSISTENT,
+ static_cast<int>(SPDY_STAT_TOTAL_TRANSACTIONS_TIME), RecRawStatSyncCount);
+ RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_TRANSACTIONS_TIME_NAME, RECD_INT, RECP_PERSISTENT,
static_cast<int>(SPDY_STAT_TOTAL_TRANSACTIONS_TIME), RecRawStatSyncSum);
- RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_CONNECTION_NAME, RECD_INT, RECP_NON_PERSISTENT,
+ RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_CONNECTION_NAME, RECD_INT, RECP_PERSISTENT,
static_cast<int>(SPDY_STAT_TOTAL_CLIENT_CONNECTION_COUNT), RecRawStatSyncSum);
return 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/proxy/spdy/SpdyCommon.h
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCommon.h b/proxy/spdy/SpdyCommon.h
index 6b17c37..3425ad3 100644
--- a/proxy/spdy/SpdyCommon.h
+++ b/proxy/spdy/SpdyCommon.h
@@ -70,8 +70,7 @@ extern RecRawStatBlock* spdy_rsb;
enum {
SPDY_STAT_CURRENT_CLIENT_SESSION_COUNT, ///< Current # of active SPDY sessions.
SPDY_STAT_CURRENT_CLIENT_STREAM_COUNT, ///< Current # of active SPDY streams.
- SPDY_STAT_TOTAL_CLIENT_STREAM_COUNT, ///< Total number of streams created.
- SPDY_STAT_TOTAL_TRANSACTIONS_TIME, //< Total stream time
+ SPDY_STAT_TOTAL_TRANSACTIONS_TIME, //< Total stream time and streams
SPDY_STAT_TOTAL_CLIENT_CONNECTION_COUNT, //< Total connections running spdy
SPDY_N_STATS ///< Terminal counter, NOT A STAT INDEX.
[2/2] git commit: TS-2875 Change hwloc library env variables from
hwloc_ to HWLOC_
Posted by zw...@apache.org.
TS-2875 Change hwloc library env variables from hwloc_ to HWLOC_
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/54db32b2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/54db32b2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/54db32b2
Branch: refs/heads/master
Commit: 54db32b2daa110403cade8c526606b9b90a62cff
Parents: 0e3035e
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Jun 4 10:07:40 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Jun 4 10:30:26 2014 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
configure.ac | 14 +++++++-------
iocore/aio/Makefile.am | 2 +-
iocore/eventsystem/Makefile.am | 2 +-
lib/ts/Makefile.am | 2 +-
mgmt/Makefile.am | 2 +-
proxy/Makefile.am | 8 ++++----
7 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1addfe4..98805b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2875] Change hwloc library env variables from hwloc_ to HWLOC_.
+
*) [TS-2874] Make some of the SPDY metrics persistent, and also fix how we
measure transaction time / total streams.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 29520c1..8bf3d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1337,7 +1337,7 @@ AC_SUBST(use_linux_native_aio)
use_hwloc=0
AS_IF([test "x$enable_hwloc" = "xyes"], [
# Use pkg-config, because some distros (*cough* Ubuntu) put hwloc in unusual places.
- PKG_CHECK_MODULES([hwloc], [hwloc], [
+ PKG_CHECK_MODULES([HWLOC], [hwloc], [
SAVE_LIBS="$LIBS"
LIBS="-lhwloc"
AC_LANG_PUSH([C++])
@@ -1345,8 +1345,8 @@ AS_IF([test "x$enable_hwloc" = "xyes"], [
AC_LINK_IFELSE([
AC_LANG_PROGRAM([#include <hwloc.h>],[hwloc_topology_t t; hwloc_topology_init(&t); hwloc_get_type_depth(t, HWLOC_OBJ_SOCKET);])],[
use_hwloc=1
- AC_SUBST([hwloc_CFLAGS])
- AC_SUBST([hwloc_LIBS])
+ AC_SUBST([HWLOC_CFLAGS])
+ AC_SUBST([HWLOC_LIBS])
AC_MSG_RESULT([yes])
# Old versions of libhwloc don't have HWLOC_OBJ_PU.
AC_CHECK_DECL(HWLOC_OBJ_PU,
@@ -1356,15 +1356,15 @@ AS_IF([test "x$enable_hwloc" = "xyes"], [
], [
AC_MSG_RESULT([no])
AC_MSG_WARN([hwloc not linkable, try --disable-hwloc])
- AC_SUBST([hwloc_CFLAGS],[""])
- AC_SUBST([hwloc_LIBS],[""])
+ AC_SUBST([HWLOC_CFLAGS],[""])
+ AC_SUBST([HWLOC_LIBS],[""])
])
AC_LANG_POP()
LIBS="$SAVE_LIBS"
], [
AC_MSG_WARN([hwloc not found, try --disable-hwloc])
- AC_SUBST([hwloc_CFLAGS],[""])
- AC_SUBST([hwloc_LIBS],[""])
+ AC_SUBST([HWLOC_CFLAGS],[""])
+ AC_SUBST([HWLOC_LIBS],[""])
])
])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/iocore/aio/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index e2463cd..db25e37 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -56,4 +56,4 @@ test_AIO_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/ts/libtsutil.la \
$(top_builddir)/proxy/shared/libUglyLogStubs.a \
- @LIBTCL@ @hwloc_LIBS@
+ @LIBTCL@ @HWLOC_LIBS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/iocore/eventsystem/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 87c221f..cfa77e1 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -90,7 +90,7 @@ test_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/ts/libtsutil.la \
$(top_builddir)/proxy/shared/libUglyLogStubs.a \
- @LIBTCL@ @hwloc_LIBS@
+ @LIBTCL@ @HWLOC_LIBS@
test_Buffer_SOURCES = \
test_Buffer.cc
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/lib/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 31a0fff..73b04ad 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -30,7 +30,7 @@ lib_LTLIBRARIES = libtsutil.la
libtsutil_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
libtsutil_la_LIBADD = \
- @hwloc_LIBS@ \
+ @HWLOC_LIBS@ \
@LIBOBJS@ \
@LIBPCRE@ \
@OPENSSL_LIBS@ \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index 0493e85..a2622f9 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -103,7 +103,7 @@ traffic_manager_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/proxy/shared/liberror.a \
$(top_builddir)/proxy/shared/libdiagsconfig.a \
- @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @hwloc_LIBS@ \
+ @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ \
-lm
# Must do it this way or the dependencies aren't detected.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 739840a..e40c8e9 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -218,7 +218,7 @@ traffic_server_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(which_libts) \
$(LUAJIT:%=$(top_builddir)/lib/luajit/src/%) \
- @hwloc_LIBS@ \
+ @HWLOC_LIBS@ \
@LIBPCRE@ \
@OPENSSL_LIBS@ \
@LIBTCL@ \
@@ -250,7 +250,7 @@ traffic_logcat_LDADD = \
$(top_builddir)/lib/records/librecprocess.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/ts/libtsutil.la \
- @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
+ @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \
@LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm
traffic_logstats_SOURCES = logstats.cc
@@ -266,7 +266,7 @@ traffic_logstats_LDADD = \
$(top_builddir)/lib/records/librecprocess.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/ts/libtsutil.la \
- @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
+ @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \
@LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm
traffic_sac_SOURCES = \
@@ -322,7 +322,7 @@ traffic_sac_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/records/librecprocess.a \
$(top_builddir)/lib/ts/libtsutil.la \
- @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
+ @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \
@LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm
if BUILD_TESTS