You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/07/06 17:49:05 UTC
trafficserver git commit: TS-3722 Eliminate the remnants of tstop,
which is known only as traffic_top
Repository: trafficserver
Updated Branches:
refs/heads/6.0.x e95d2f379 -> 5194f8301
TS-3722 Eliminate the remnants of tstop, which is known only as traffic_top
(cherry picked from commit 315371ae943c1bf1f6f7dd2b3a666a2230d49d7a)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5194f830
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5194f830
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5194f830
Branch: refs/heads/6.0.x
Commit: 5194f8301506d25ff843d4351f626b500013016e
Parents: e95d2f3
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jun 29 14:01:17 2015 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Mon Jul 6 08:48:40 2015 -0700
----------------------------------------------------------------------
README | 8 ++++----
cmd/traffic_top/Makefile.am | 8 ++------
cmd/traffic_top/stats.h | 2 +-
configure.ac | 4 ++--
doc/locale/ja/LC_MESSAGES/reference/commands/tstop.en.po | 6 +++---
tools/lighttpd_mod_generator/mod_generator.c | 2 +-
6 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5194f830/README
----------------------------------------------------------------------
diff --git a/README b/README
index 78cce71..97a299b 100644
--- a/README
+++ b/README
@@ -115,8 +115,8 @@ plugins to build large scale web applications.
flex (optional, required for e.g. WCCP)
libhwloc-dev (optional, highly recommended)
liblua5.1-dev or libluajit-5.1-dev (optional)
- libncurses5-dev (optional, required for e.g.: tstop)
- libcurl4-openssl-dev (optional, required for e.g.: tstop)
+ libncurses5-dev (optional, required for e.g.: traffic_top)
+ libcurl4-openssl-dev (optional, required for e.g.: traffic_top)
Ubuntu EC2 9.10:
NOTE: Alternately you may use the install scripts in 'contrib' which
@@ -139,8 +139,8 @@ plugins to build large scale web applications.
flex (optional)
libhwloc-dev (optional, highly recommended)
liblua-dev (optional)
- libncurses5-dev (optional, required for e.g.: tstop)
- libcurl3-openssl-dev (optional, required for e.g.: tstop)
+ libncurses5-dev (optional, required for e.g.: traffic_top)
+ libcurl3-openssl-dev (optional, required for e.g.: traffic_top)
FreeBSD 7.2,8.0,9.0,9.1
GCC 4.2.1 compiler suite or clang. You can install the following
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5194f830/cmd/traffic_top/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am
index f586bbe..de4bf02 100644
--- a/cmd/traffic_top/Makefile.am
+++ b/cmd/traffic_top/Makefile.am
@@ -15,8 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# We only build tstop if libcurses and libcurl are available.
-if BUILD_TSTOP
+# We only build traffic_top if libcurses and libcurl are available.
+if BUILD_TRAFFIC_TOP
AM_CPPFLAGS = \
$(iocore_include_dirs) \
@@ -40,8 +40,4 @@ traffic_top_LDADD = \
$(top_builddir)/mgmt/api/libtsmgmt.la \
@CURL_LIBS@ @CURSES_LIB@
-# Install a compatibility symlink because traffic_top was named tstop in previous releases.
-install-exec-hook:
- cd $(DESTDIR)$(bindir) && $(RM) tstop && $(LN_S) traffic_top tstop
-
endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5194f830/cmd/traffic_top/stats.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_top/stats.h b/cmd/traffic_top/stats.h
index 4b48bde..78d7f89 100644
--- a/cmd/traffic_top/stats.h
+++ b/cmd/traffic_top/stats.h
@@ -1,6 +1,6 @@
/** @file
- Include file for the tstop stats.
+ Include file for the traffic_top stats.
@section license License
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5194f830/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ce9a8b6..d673a28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1080,9 +1080,9 @@ AX_WITH_CURSES
CFLAGS="$__saved_CFLAGS"
AX_LIB_CURL([7.19], [
- AM_CONDITIONAL([BUILD_TSTOP], [test "x$ax_cv_curses" = "xyes"])
+ AM_CONDITIONAL([BUILD_TRAFFIC_TOP], [test "x$ax_cv_curses" = "xyes"])
], [
- AM_CONDITIONAL([BUILD_TSTOP], [false])
+ AM_CONDITIONAL([BUILD_TRAFFIC_TOP], [false])
]
)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5194f830/doc/locale/ja/LC_MESSAGES/reference/commands/tstop.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/commands/tstop.en.po b/doc/locale/ja/LC_MESSAGES/reference/commands/tstop.en.po
index 63a07ad..eb94059 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/commands/tstop.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/commands/tstop.en.po
@@ -26,10 +26,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../reference/commands/tstop.en.rst:20
-msgid "tstop"
+#: ../../reference/commands/traffic_top.en.rst:20
+msgid "traffic_top"
msgstr ""
-#: ../../reference/commands/tstop.en.rst:25
+#: ../../reference/commands/traffic_top.en.rst:25
msgid "Description"
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5194f830/tools/lighttpd_mod_generator/mod_generator.c
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/mod_generator.c b/tools/lighttpd_mod_generator/mod_generator.c
index bd5668e..8d5ba90 100644
--- a/tools/lighttpd_mod_generator/mod_generator.c
+++ b/tools/lighttpd_mod_generator/mod_generator.c
@@ -1,6 +1,6 @@
/** @file
- Main file for the tstop application.
+ Main file for the generator plugin for lighttpd
@section license License