You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2011/02/06 19:04:20 UTC
svn commit: r1067713 - in /trafficserver/traffic/trunk: ./ mgmt/ mgmt/api/
mgmt/cluster/ mgmt/stats/ mgmt/utils/ mgmt/web2/ proxy/
Author: amc
Date: Sun Feb 6 18:04:19 2011
New Revision: 1067713
URL: http://svn.apache.org/viewvc?rev=1067713&view=rev
Log:
TS-664
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/mgmt/Alarms.cc
trafficserver/traffic/trunk/mgmt/AutoConf.cc
trafficserver/traffic/trunk/mgmt/LocalManager.h
trafficserver/traffic/trunk/mgmt/Main.h
trafficserver/traffic/trunk/mgmt/Makefile.am
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/mgmt/api/Makefile.am
trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc
trafficserver/traffic/trunk/mgmt/cluster/Makefile.am
trafficserver/traffic/trunk/mgmt/cluster/VMap.cc
trafficserver/traffic/trunk/mgmt/stats/Makefile.am
trafficserver/traffic/trunk/mgmt/stats/StatType.cc
trafficserver/traffic/trunk/mgmt/utils/Makefile.am
trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc
trafficserver/traffic/trunk/mgmt/web2/Makefile.am
trafficserver/traffic/trunk/mgmt/web2/MgmtAllow.cc
trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc
trafficserver/traffic/trunk/proxy/Makefile.am
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sun Feb 6 18:04:19 2011
@@ -1217,7 +1217,7 @@ AC_CONFIG_FILES([mgmt/tools/Makefile])
AC_CONFIG_FILES([mgmt/utils/Makefile])
AC_CONFIG_FILES([mgmt/web2/Makefile])
AC_CONFIG_FILES([proxy/stats/Makefile])
-AC_CONFIG_FILES([proxy/wccp/Makefile])
+AC_CONFIG_FILES([lib/wccp/Makefile])
AC_CONFIG_FILES([proxy/api/ts/Makefile])
# Traffic Cop
AC_CONFIG_FILES([cop/Makefile])
Modified: trafficserver/traffic/trunk/mgmt/Alarms.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/Alarms.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/Alarms.cc (original)
+++ trafficserver/traffic/trunk/mgmt/Alarms.cc Sun Feb 6 18:04:19 2011
@@ -32,7 +32,7 @@
*/
#include "libts.h"
-#include "Main.h"
+#include "LocalManager.h"
#include "MgmtUtils.h"
#include "Alarms.h"
#include "Diags.h"
Modified: trafficserver/traffic/trunk/mgmt/AutoConf.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/AutoConf.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/AutoConf.cc (original)
+++ trafficserver/traffic/trunk/mgmt/AutoConf.cc Sun Feb 6 18:04:19 2011
@@ -26,7 +26,7 @@
#include "ink_port.h"
#include "ink_time.h"
-#include "Main.h"
+#include "LocalManager.h"
#include "MgmtUtils.h"
#include "AutoConf.h"
#include "TextBuffer.h"
Modified: trafficserver/traffic/trunk/mgmt/LocalManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/LocalManager.h?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/LocalManager.h (original)
+++ trafficserver/traffic/trunk/mgmt/LocalManager.h Sun Feb 6 18:04:19 2011
@@ -41,7 +41,7 @@
#include "VMap.h"
#include "WebPluginList.h"
#if TS_HAS_WCCP
-#include "../wccp/Wccp.h"
+#include <wccp/Wccp.h>
#endif
#if !defined(WIN32)
Modified: trafficserver/traffic/trunk/mgmt/Main.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/Main.h?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/Main.h (original)
+++ trafficserver/traffic/trunk/mgmt/Main.h Sun Feb 6 18:04:19 2011
@@ -24,7 +24,6 @@
#ifndef _MAIN_H_
#define _MAIN_H_
-#include "LocalManager.h"
#include "FileManager.h"
#include "WebOverview.h"
#include "I_Version.h"
Modified: trafficserver/traffic/trunk/mgmt/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/Makefile.am?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/Makefile.am Sun Feb 6 18:04:19 2011
@@ -38,7 +38,7 @@ AM_CPPFLAGS = $(ink_with_modules_local)
-I$(top_srcdir)/mgmt/stats \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
- -I$(top_srcdir)/lib/tsconfig
+ -I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
@@ -50,15 +50,15 @@ bin_PROGRAMS = traffic_manager
# Compile this for "process manager"
libmgmt_p_a_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/preparse \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy
+ -I$(top_srcdir)/proxy \
+ -I$(top_srcdir)/proxy/hdrs \
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib
libmgmt_p_a_SOURCES = \
BaseManager.cc \
BaseManager.h \
@@ -113,6 +113,6 @@ traffic_manager_LDADD = \
# Must do it this way or the dependencies aren't detected.
if BUILD_WCCP
traffic_manager_LDADD += \
- $(top_builddir)/proxy/wccp/libwccp.a \
+ $(top_builddir)/lib/wccp/libwccp.a \
$(top_builddir)/lib/tsconfig/libtsconfig.a
endif
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Sun Feb 6 18:04:19 2011
@@ -24,7 +24,7 @@
#include "ink_config.h"
#include "RecordsConfig.h"
-#include "Main.h"
+#include "ParseRules.h"
//-------------------------------------------------------------------------
// RecordsConfig
Modified: trafficserver/traffic/trunk/mgmt/api/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/Makefile.am?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/api/Makefile.am Sun Feb 6 18:04:19 2011
@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/mgmt/api/include \
- -I$(top_srcdir)/lib/tsconfig
+ -I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc Sun Feb 6 18:04:19 2011
@@ -39,6 +39,7 @@
#include "MgmtSocket.h"
#include "Main.h"
+#include "LocalManager.h"
#include "ClusterCom.h"
#include "MgmtUtils.h"
#include "WebMgmtUtils.h"
Modified: trafficserver/traffic/trunk/mgmt/cluster/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cluster/Makefile.am?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cluster/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/cluster/Makefile.am Sun Feb 6 18:04:19 2011
@@ -23,7 +23,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
- -I$(top_srcdir)/lib/tsconfig
+ -I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/cluster/VMap.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cluster/VMap.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cluster/VMap.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cluster/VMap.cc Sun Feb 6 18:04:19 2011
@@ -33,6 +33,7 @@
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "Main.h"
+#include "LocalManager.h"
#include "VMap.h"
#include "MgmtUtils.h"
#include "P_RecLocal.h"
Modified: trafficserver/traffic/trunk/mgmt/stats/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/stats/Makefile.am?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/stats/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/stats/Makefile.am Sun Feb 6 18:04:19 2011
@@ -24,8 +24,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/web2 \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy
+ -I$(top_srcdir)/proxy \
+ -I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/stats/StatType.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/stats/StatType.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/stats/StatType.cc (original)
+++ trafficserver/traffic/trunk/mgmt/stats/StatType.cc Sun Feb 6 18:04:19 2011
@@ -33,6 +33,7 @@
#include "ink_config.h"
#include "StatType.h"
#include "MgmtUtils.h"
+#include "ink_hrtime.h"
bool StatError = false; // global error flag
bool StatDebug = false; // global debug flag
@@ -972,7 +973,7 @@ StatObjectList::Eval()
if (object->m_update_interval <= 0) {
// non-time statistics
- object->m_current_time = ink_get_hrtime();
+ object->m_current_time = ink_get_hrtime_internal();
result = ERROR_VALUE;
if (object->m_node_dest) {
@@ -995,7 +996,7 @@ StatObjectList::Eval()
object->m_last_update = object->m_current_time;
} else {
// timed statisitics
- object->m_current_time = ink_get_hrtime();
+ object->m_current_time = ink_get_hrtime_internal();
threshold = object->m_update_interval * HRTIME_SECOND;
delta = object->m_current_time - object->m_last_update;
Modified: trafficserver/traffic/trunk/mgmt/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/Makefile.am?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/utils/Makefile.am Sun Feb 6 18:04:19 2011
@@ -18,7 +18,6 @@
# limitations under the License.
AM_CPPFLAGS = \
- -I$(top_srcdir)/lib/records \
-I$(top_srcdir)/iocore/utils \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api \
@@ -26,7 +25,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy
+ -I$(top_srcdir)/proxy \
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc Sun Feb 6 18:04:19 2011
@@ -37,7 +37,8 @@
#ifdef LOCAL_MANAGER
// mgmt/Main.h
-#include "../Main.h"
+#include "LocalManager.h"
+//#include "../Main.h"
#else
// proxy/Main.h
#include "../../proxy/Main.h"
Modified: trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/utils/WebMgmtUtils.cc Sun Feb 6 18:04:19 2011
@@ -22,7 +22,7 @@
*/
#include "libts.h"
-#include "Main.h"
+#include "LocalManager.h"
#include "MgmtUtils.h"
#include "WebMgmtUtils.h"
Modified: trafficserver/traffic/trunk/mgmt/web2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/Makefile.am?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/web2/Makefile.am Sun Feb 6 18:04:19 2011
@@ -26,8 +26,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/tools \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/hdrs
+ -I$(top_srcdir)/proxy/hdrs \
+ -I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/web2/MgmtAllow.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/MgmtAllow.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/MgmtAllow.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/MgmtAllow.cc Sun Feb 6 18:04:19 2011
@@ -30,7 +30,7 @@
#include "ink_platform.h"
#include "MgmtAllow.h"
-#include "Main.h"
+#include "LocalManager.h"
#include "MgmtUtils.h"
// Make sure we have LOCAL_MANAGER defined for MatcherUtils.h
Modified: trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc Sun Feb 6 18:04:19 2011
@@ -31,7 +31,7 @@
#include "libts.h"
#include "I_Layout.h"
-#include "Main.h"
+#include "LocalManager.h"
#include "WebHttp.h"
#include "WebGlobals.h"
#include "MgmtUtils.h"
Modified: trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebOverview.cc Sun Feb 6 18:04:19 2011
@@ -37,7 +37,7 @@
#include "WebHttpTree.h"
#include "WebMgmtUtils.h"
-#include "Main.h"
+#include "LocalManager.h"
#include "ClusterCom.h"
#include "MgmtUtils.h"
#include "MgmtDefs.h"
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1067713&r1=1067712&r2=1067713&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Sun Feb 6 18:04:19 2011
@@ -22,11 +22,7 @@ noinst_LIBRARIES = libTrafficServerStand
bin_PROGRAMS =
noinst_PROGRAMS =
else
-SUBDIRS = congest http logging
-if BUILD_WCCP
-SUBDIRS += wccp
-endif
-SUBDIRS += config stats
+SUBDIRS = congest http logging config stats
noinst_LIBRARIES =
bin_PROGRAMS = \
traffic_server \