trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r909688 - in /incubator/trafficserver/traffic/branches/dev: ./ install/ iocore/cache/ iocore/hostdb/ iocore/net/ libinktomi++/ proxy/ proxy/dns_cache/ proxy/mgmt2/ proxy/mgmt2/api2/remote/ proxy/mgmt2/cli/ proxy/mgmt2/cli2/ proxy/mgmt2/cop/...
Date Sat, 13 Feb 2010 01:45:10 GMT
Author: georgep
Date: Sat Feb 13 01:45:09 2010
New Revision: 909688

URL: http://svn.apache.org/viewvc?rev=909688&view=rev
Log:
Merge changes from TS-170,TS-176,TS-177,TS-15,TS-179,TS-143 from trunk to dev branch.

Modified:
    incubator/trafficserver/traffic/branches/dev/   (props changed)
    incubator/trafficserver/traffic/branches/dev/.gitignore
    incubator/trafficserver/traffic/branches/dev/configure.ac
    incubator/trafficserver/traffic/branches/dev/install/Makefile.am
    incubator/trafficserver/traffic/branches/dev/install/trafficserver.in
    incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.cc
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/Net.cc
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNet.cc
    incubator/trafficserver/traffic/branches/dev/libinktomi++/I_Version.h
    incubator/trafficserver/traffic/branches/dev/libinktomi++/Version.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
    incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc
    incubator/trafficserver/traffic/branches/dev/proxy/dns_cache/DNS_cache.h
    incubator/trafficserver/traffic/branches/dev/proxy/logcat.cc
    incubator/trafficserver/traffic/branches/dev/proxy/logstats.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/Makefile.am
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cliMain.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/Makefile.am
    incubator/trafficserver/traffic/branches/dev/proxy/sac.cc

Propchange: incubator/trafficserver/traffic/branches/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 13 01:45:09 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:891822-909513
+/incubator/trafficserver/traffic/trunk:891822-909679

Modified: incubator/trafficserver/traffic/branches/dev/.gitignore
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/.gitignore?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/.gitignore (original)
+++ incubator/trafficserver/traffic/branches/dev/.gitignore Sat Feb 13 01:45:09 2010
@@ -26,9 +26,17 @@
 libinktomi++/ParseRulesCTypeToUpper
 libinktomi++/mkdfa
 proxy/config/records.config
-proxy/cust_log_fmt_cnvrt
-proxy/logcat
-proxy/logstats
+
+proxy/mgmt2/api2/remote/traffic_api_cli_remote
+proxy/mgmt2/tools/traffic_mcast_snoop
+proxy/mgmt2/tools/traffic_net_config
+proxy/mgmt2/tools/traffic_shmem_clean
+proxy/mgmt2/tools/traffic_time_config
+proxy/mgmt2/tools/traffic_vip_config
+proxy/traffic_cust_log_fmt_cnvrt
+proxy/traffic_logcat
+proxy/traffic_logstats
+proxy/traffic_sac
 proxy/mgmt2/api2/remote/api_cli_remote
 proxy/mgmt2/cli/traffic_line
 proxy/mgmt2/cli2/traffic_shell
@@ -39,7 +47,6 @@
 proxy/mgmt2/tools/time_config
 proxy/mgmt2/tools/vip_config
 proxy/mgmt2/traffic_manager
-proxy/sac
 proxy/traffic_server
 
 libtool

Modified: incubator/trafficserver/traffic/branches/dev/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/configure.ac?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/configure.ac (original)
+++ incubator/trafficserver/traffic/branches/dev/configure.ac Sat Feb 13 01:45:09 2010
@@ -28,7 +28,7 @@
 # -----------------------------------------------------------------------------
 # 1. INITIALIZATION
 
-AC_INIT([Apache Traffic Server], [2.0.0-alpha], [trafficserver-dev@incubator.apache.org],
[trafficserver])
+AC_INIT([Apache Traffic Server], [2.0.0-alpha], [trafficserver-dev@incubator.apache.org],
[trafficserver],[http://incubator.apache.org/projects/trafficserver.html])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2])

Modified: incubator/trafficserver/traffic/branches/dev/install/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/install/Makefile.am?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/install/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/install/Makefile.am Sat Feb 13 01:45:09 2010
@@ -26,10 +26,9 @@
   -I$(top_srcdir)/proxy/logging
 
 dist_bin_SCRIPTS = \
-  start_traffic_shell \
   trafficserver
 
-bin_PROGRAMS = update_records
+noinst_PROGRAMS = update_records
 
 update_records_SOURCES = update_records.cc 
 update_records_LDFLAGS = @EXTRA_CXX_LDFLAGS@

Modified: incubator/trafficserver/traffic/branches/dev/install/trafficserver.in
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/install/trafficserver.in?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/install/trafficserver.in (original)
+++ incubator/trafficserver/traffic/branches/dev/install/trafficserver.in Sat Feb 13 01:45:09
2010
@@ -28,9 +28,6 @@
 #                    This should be placed in /etc/init.d. on Ubuntu
 ### END INIT INFO
 
-# Author: George Paul <georgev.paul@yahoo.com>
-#
-
 # Fedora:
 #  When this file is installed as /etc/rc.d/init.d/trafficserver
 #  and added to the chkconfig system with `chkconfig --add trafficserver`
@@ -39,6 +36,9 @@
 # Ubuntu:
 #  Values read from /etc/default/trafficserver
 
+TS_PACKAGE_NAME="@PACKAGE_NAME@"
+TS_PACKAGE_VERSION="@PACKAGE_VERSION@"
+TS_PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@"
 
 if [ -e /etc/SuSE-release ]; then
     DISTRIB_ID="suse"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/NewCacheVC.cc Sat Feb 13 01:45:09
2010
@@ -103,9 +103,6 @@
 {
   Debug("cache_plugin", "[NewCacheVC::reenable] this=%lX vio=%lX", (long) this, (long) vio);
   if (_vio.op == VIO::WRITE) {
-    if (!_vio.buffer.reader()->read_avail()) {
-      ink_assert(!"useless reenable of cache write");
-    }
     SET_HANDLER(&NewCacheVC::handleWrite);
     if (!trigger) {
       trigger = vio->mutex->thread_holding->schedule_imm_local(this);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc Sat Feb 13 01:45:09
2010
@@ -495,6 +495,11 @@
   char *reason = "none";
   HostDBInfo *r = ar;
 
+  if (r == NULL) {
+    cont->handleEvent(EVENT_HOST_DB_LOOKUP, NULL);
+    return false;
+  }
+
   if (r->failed()) {
     if (r->is_srv && r->srv_count) {
       cont->handleEvent(EVENT_SRV_LOOKUP, NULL);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h Sat Feb
13 01:45:09 2010
@@ -54,8 +54,8 @@
 #define CONFIGURATION_HISTORY_PROBE_DEPTH   1
 
 // Bump this any time hostdb format is changed
-#define HOST_DB_CACHE_MAJOR_VERSION         1
-#define HOST_DB_CACHE_MINOR_VERSION         2
+#define HOST_DB_CACHE_MAJOR_VERSION         2
+#define HOST_DB_CACHE_MINOR_VERSION         0
 
 #define DEFAULT_HOST_DB_FILENAME             "host.db"
 #define DEFAULT_HOST_DB_SIZE                 (1<<14)

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h Sat Feb 13 01:45:09
2010
@@ -56,10 +56,10 @@
 
 // Update these if there is a change to MultiCacheBase
 // There is a separate HOST_DB_CACHE_[MAJOR|MINOR]_VERSION
-#define MULTI_CACHE_MAJOR_VERSION    1
+#define MULTI_CACHE_MAJOR_VERSION    2
 #define MULTI_CACHE_MINOR_VERSION    0
 
-#define MULTI_CACHE_HEAP_HIGH_WATER  0.9
+#define MULTI_CACHE_HEAP_HIGH_WATER  0.8
 
 #define MULTI_CACHE_HEAP_INITIAL     sizeof(inku32)
 #define MULTI_CACHE_HEAP_ALIGNMENT   8

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/Net.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/Net.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/Net.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/Net.cc Sat Feb 13 01:45:09 2010
@@ -44,6 +44,7 @@
 
   IOCORE_RegisterConfigUpdateFunc("proxy.config.net.connections_throttle", change_net_connections_throttle,
NULL);
   IOCORE_ReadConfigInteger(fds_throttle, "proxy.config.net.connections_throttle");
+  IOCORE_ReadConfigInteger(throttle_enabled,"proxy.config.net.throttle_enabled");
 
   IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.net.listen_backlog", 1024, RECU_DYNAMIC,
RECC_NULL, NULL);
 

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h Sat Feb 13 01:45:09
2010
@@ -165,6 +165,7 @@
 extern ink_hrtime emergency_throttle_time;
 extern int net_connections_throttle;
 extern int fds_throttle;
+extern bool throttle_enabled;
 extern int fds_limit;
 extern ink_hrtime last_transient_accept_error;
 extern int http_accept_port_number;
@@ -319,6 +320,11 @@
 inline int
 check_net_throttle(ThrottleType t, ink_hrtime now)
 {
+  if(throttle_enabled == false) {
+    // added by Vijay to disable throttle. This is done find out if
+    // there any other problem other than the stats problem -- bug 3040824
+    return false;
+  }
   int connections = net_connections_to_throttle(t);
   if (connections >= net_connections_throttle)
     return true;

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNet.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNet.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNet.cc Sat Feb 13 01:45:09
2010
@@ -28,6 +28,7 @@
 ink_hrtime emergency_throttle_time;
 int net_connections_throttle;
 int fds_throttle;
+bool throttle_enabled;
 int fds_limit = 8000;
 ink_hrtime last_transient_accept_error;
 

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/I_Version.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/I_Version.h?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/I_Version.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/I_Version.h Sat Feb 13 01:45:09
2010
@@ -80,6 +80,7 @@
 {
 public:
   int defined;
+  char PkgStr[128];
   char AppStr[128];
   char VersionStr[128];
   char BldNumStr[128];
@@ -90,9 +91,10 @@
   char BldCompileFlagsStr[128];
   char FullVersionInfoStr[256];
 
-    AppVersionInfo();
-  void setup(char *app_name, char *app_version,
-             char *build_date, char *build_time, char *build_machine, char *build_person,
char *build_cflags);
+  AppVersionInfo();
+  void setup(char *pkg_name, char *app_name, char *app_version, 
+             char *build_date, char *build_time, char *build_machine, 
+             char *build_person, char *build_cflags);
 };
 
 #endif /*_Version_h*/

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/Version.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/Version.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/Version.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/Version.cc Sat Feb 13 01:45:09
2010
@@ -28,7 +28,7 @@
 AppVersionInfo::AppVersionInfo()
 {
   defined = 0;
-
+  ink_strncpy(PkgStr, "?", sizeof(PkgStr));
   ink_strncpy(AppStr, "?", sizeof(AppStr));
   ink_strncpy(VersionStr, "?", sizeof(VersionStr));
   ink_strncpy(BldNumStr, "?", sizeof(BldNumStr));
@@ -43,8 +43,9 @@
 
 
 void
-AppVersionInfo::setup(char *app_name, char *app_version,
-                      char *build_date, char *build_time, char *build_machine, char *build_person,
char *build_cflags)
+AppVersionInfo::setup(char *pkg_name, char *app_name, char *app_version,
+                      char *build_date, char *build_time, char *build_machine, 
+                      char *build_person, char *build_cflags)
 {
   char month_name[8];
   int year, month, day, hour, minute, second;
@@ -67,7 +68,7 @@
   ///////////////////////////////////////////
   // now construct the version information //
   ///////////////////////////////////////////
-
+  ink_strncpy(PkgStr, pkg_name, sizeof(PkgStr));
   ink_strncpy(AppStr, app_name, sizeof(AppStr));
   snprintf(VersionStr, sizeof(VersionStr), "%s", app_version);
   snprintf(BldNumStr, sizeof(BldNumStr), "%d%d%d", month, day, hour);
@@ -77,13 +78,15 @@
   snprintf(BldPersonStr, sizeof(BldPersonStr), "%s", build_person);
   snprintf(BldCompileFlagsStr, sizeof(BldCompileFlagsStr), "%s", build_cflags);
 
-  snprintf(FullVersionInfoStr, sizeof(FullVersionInfoStr), "%s %s - (build # %d%d%d on %s
at %s)",
-           AppStr, VersionStr, month, day, hour, build_date, build_time);
+  snprintf(FullVersionInfoStr, sizeof(FullVersionInfoStr), 
+           "%s - %s - %s - (build # %d%d%d on %s at %s)",
+           PkgStr, AppStr, VersionStr, month, day, hour, build_date, build_time);
 
   /////////////////////////////////////////////////////////////
   // the manager doesn't like empty strings, so prevent them //
   /////////////////////////////////////////////////////////////
-
+  if (PkgStr[0] == '\0')
+    ink_strncpy(PkgStr, "?", sizeof(PkgStr));
   if (AppStr[0] == '\0')
     ink_strncpy(AppStr, "?", sizeof(AppStr));
   if (VersionStr[0] == '\0')

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc Sat Feb 13 01:45:09 2010
@@ -116,7 +116,8 @@
 {
   init_system();
   // Define the version info
-  appVersionInfo.setup("traffic_server", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME,"traffic_server", PACKAGE_VERSION, __DATE__,
+                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
   // Local process manager
   initialize_process_manager();
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Main.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Main.cc Sat Feb 13 01:45:09 2010
@@ -1700,7 +1700,8 @@
   check_system_constants();
 
   // Define the version info
-  appVersionInfo.setup("traffic_server", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME,"traffic_server", PACKAGE_VERSION, __DATE__,
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   chdir_root(); // change directory to the install root of traffic server.
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am Sat Feb 13 01:45:09 2010
@@ -43,13 +43,11 @@
 
 bin_PROGRAMS = \
   traffic_server \
-  logcat \
-  logstats \
-  sac \
-  cust_log_fmt_cnvrt
+  traffic_logcat \
+  traffic_logstats \
+  traffic_sac
 
-dist_noinst_SCRIPTS = ts-instantiate.pl
-dist_bin_SCRIPTS = example_alarm_bin.sh example_prep.sh
+noinst_PROGRAMS =  traffic_cust_log_fmt_cnvrt
 
 noinst_HEADERS = \
   api/include/InkAPIaaa.h \
@@ -71,7 +69,7 @@
   libClusterHashStandalone.a \
   libTrafficServerStandalone.a
 
-EXTRA_DIST = InkAPITestTool.cc
+EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh
 
 traffic_server_SOURCES = \
   AbstractBuffer.cc \
@@ -171,16 +169,11 @@
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ \
-  @LIBMLD@ @LIBEXC@ -lm @LIBEV@
+  @LIBMLD@ @LIBEXC@ @LIBM@ @LIBEV@
 
-logcat_CPPFLAGS = \
-  -DPREFIX=\"$(prefix)\" \
-  -DPKGLOGDIR=\"$(pkglogdir)\" \
-  -DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
-  $(AM_CPPFLAGS)
-logcat_SOURCES = logcat.cc
-logcat_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-logcat_LDADD = \
+traffic_logcat_SOURCES = logcat.cc
+traffic_logcat_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_logcat_LDADD = \
   ICP.o \
   ICPConfig.o \
   ICPProcessor.o \
@@ -234,11 +227,11 @@
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm
+  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ @LIBM@
 
-logstats_SOURCES = logstats.cc
-logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-logstats_LDADD = \
+traffic_logstats_SOURCES = logstats.cc
+traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_logstats_LDADD = \
   ICP.o \
   ICPConfig.o \
   ICPProcessor.o \
@@ -294,16 +287,11 @@
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm
+  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ @LIBM@
 
-sac_CPPFLAGS = \
-  -DPREFIX=\"$(prefix)\" \
-  -DPKGLOGDIR=\"$(pkglogdir)\" \
-  -DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
-  $(AM_CPPFLAGS)
-sac_SOURCES = sac.cc
-sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-sac_LDADD = \
+traffic_sac_SOURCES = sac.cc
+traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_sac_LDADD = \
   ICP.o \
   ICPConfig.o \
   ICPProcessor.o \
@@ -357,10 +345,10 @@
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBREGEX@ @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm
+  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ @LIBM@
 
-cust_log_fmt_cnvrt_SOURCES = cust_log_fmt_cnvrt.cc
-cust_log_fmt_cnvrt_LDADD = \
+traffic_cust_log_fmt_cnvrt_SOURCES = cust_log_fmt_cnvrt.cc
+traffic_cust_log_fmt_cnvrt_LDADD = \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ \
   @LIBTCL@ @LIBRT@ @LIBICONV@ @LIBDL@

Modified: incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc Sat Feb 13 01:45:09
2010
@@ -38,8 +38,7 @@
 #include "I_Version.h"
 #include "ink_assert.h"
 
-#define PROGRAM_VERSION		"1.0"
-#define PROGRAM_NAME            "cust_log_fmt_cnvrt"
+#define PROGRAM_NAME            "traffic_cust_log_fmt_cnvrt"
 
 const int LINE_BUFFER_SIZE = 1024;
 const int MAX_LOG_OBJECTS = 64;
@@ -529,7 +528,8 @@
   // build the application information structure
   //
   AppVersionInfo appVersionInfo;
-  appVersionInfo.setup(PROGRAM_NAME, PROGRAM_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME, PROGRAM_NAME, PACKAGE_VERSION, __DATE__, 
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // process command-line arguments
   //

Modified: incubator/trafficserver/traffic/branches/dev/proxy/dns_cache/DNS_cache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/dns_cache/DNS_cache.h?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/dns_cache/DNS_cache.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/dns_cache/DNS_cache.h Sat Feb 13 01:45:09
2010
@@ -39,7 +39,7 @@
 void start_dns_Proxy(int);
 void *dns_udp_receiver(void *arg);
 
-#define DNS_CACHE_MODULE_MAJOR_VERSION 1
+#define DNS_CACHE_MODULE_MAJOR_VERSION 2
 #define DNS_CACHE_MODULE_MINOR_VERSION 0
 #define DNS_CACHE_MODULE_VERSION makeModuleVersion(                    \
                                        DNS_CACHE_MODULE_MAJOR_VERSION, \

Modified: incubator/trafficserver/traffic/branches/dev/proxy/logcat.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logcat.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logcat.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logcat.cc Sat Feb 13 01:45:09 2010
@@ -23,8 +23,7 @@
 
 #include "ink_unused.h"
 
-#define PROGRAM_VERSION		"1.0"
-#define PROGRAM_NAME		"logcat"
+#define PROGRAM_NAME		"traffic_logcat"
 #define MAX_LOGBUFFER_SIZE	65536
 
 #include <poll.h>
@@ -241,7 +240,8 @@
 
   // build the application information structure
   //
-  appVersionInfo.setup(PROGRAM_NAME, PROGRAM_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__, 
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // process command-line arguments
   //

Modified: incubator/trafficserver/traffic/branches/dev/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logstats.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logstats.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logstats.cc Sat Feb 13 01:45:09 2010
@@ -57,8 +57,7 @@
 
 
 // Constants, please update the VERSION number when you make a new build!!!
-#define PROGRAM_VERSION		"1.0"
-#define PROGRAM_NAME		"logstats"
+#define PROGRAM_NAME		"traffic_logstats"
 
 const int MAX_LOGBUFFER_SIZE = 65536;
 const int DEFAULT_LINE_LEN = 78;
@@ -1635,12 +1634,12 @@
     format_ysar(totals.content.other, totals.total);
     format_ysar(totals.content.none, totals.total, true);
   } else if (cl.ymon) {
-    std::cout << hostname << '\t' << "yts_origins\t" << status <<
'\t' << "ver. " << PROGRAM_VERSION << notice << std::
+    std::cout << hostname << '\t' << "yts_origins\t" << status <<
'\t' << "ver. " << PACKAGE_VERSION << notice << std::
       endl;
     for (OriginStorage::iterator i = origins.begin(); i != origins.end(); i++) {
       if (use_origin(i->second)) {
         std::cout << hostname << '\t' << "yts_origins" << '\t' <<
-          status << '\t' << "ver. " << PROGRAM_VERSION << notice
<< "|";
+          status << '\t' << "ver. " << PACKAGE_VERSION << notice
<< "|";
         print_ymon_metrics(i->second, std::cout);
         std::cout << std::endl;
       }
@@ -1754,7 +1753,8 @@
   char ts_path[PATH_NAME_MAX + 1];
 
   // build the application information structure
-  appVersionInfo.setup(PROGRAM_NAME, PROGRAM_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__, 
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Initialize some globals
   memset(&totals, 0, sizeof(totals));   // Make sure counters are zero

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc Sat Feb 13 01:45:09 2010
@@ -518,7 +518,8 @@
   }
 
   // Set up the application version info
-  appVersionInfo.setup("traffic_manager", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME,"traffic_manager", PACKAGE_VERSION, 
+                       __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
   initSignalHandlers();
 
   // Process Environment Variables
@@ -545,7 +546,7 @@
   for (int i = 1; i < argc; i++) {      /* Process command line args */
 
     if (argv[i][0] == '-') {
-      if (strcmp(argv[i], "-version") == 0) {
+      if ((strcmp(argv[i], "-version") == 0) || (strcmp(argv[i], "-V") == 0)) {
         fprintf(stderr, "%s\n", appVersionInfo.FullVersionInfoStr);
         exit(0);
       } else if (strcmp(argv[i], "-proxyOff") == 0) {
@@ -1305,7 +1306,7 @@
   fprintf(stderr, "     -printRecords  [...]   Print flags, default all are off.\n");
   fprintf(stderr, "     -debug         <tags>  Enable the given debug tags\n");
   fprintf(stderr, "     -action        <tags>  Enable the given action tags.\n");
-  fprintf(stderr, "     -version               Print version id and exit.\n");
+  fprintf(stderr, "     -version or -V         Print version id and exit.\n");
   fprintf(stderr, "     -snmplog       <int>   Turn on SNMP SDK diagnostics. (2147450879
is good...)\n");
   fprintf(stderr, "     -vingid        <id>    Vingid Flag\n");
   fprintf(stderr, "\n");

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc Sat Feb 13 01:45:09
2010
@@ -851,15 +851,15 @@
   //        # 2 - some extra info added
   {CONFIG, "proxy.config.http.verbose_via_str", "", INK_INT, "2", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.http.request_via_str", "", INK_STRING, "TrafficServer/" PACKAGE_VERSION,
RU_REREAD,
+  {CONFIG, "proxy.config.http.request_via_str", "", INK_STRING, "ApacheTrafficServer/" PACKAGE_VERSION,
RU_REREAD,
    RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.http.response_via_str", "", INK_STRING, "TrafficServer/" PACKAGE_VERSION,
RU_REREAD,
+  {CONFIG, "proxy.config.http.response_via_str", "", INK_STRING, "ApacheTrafficServer/" PACKAGE_VERSION,
RU_REREAD,
    RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.http.response_server_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL,
RC_NULL, "[0-3]", RA_NULL}
   ,
-  {CONFIG, "proxy.config.http.response_server_str", "", INK_STRING, "TS/" PACKAGE_VERSION,
RU_REREAD, RR_NULL, RC_NULL,
+  {CONFIG, "proxy.config.http.response_server_str", "", INK_STRING, "ATS/" PACKAGE_VERSION,
RU_REREAD, RR_NULL, RC_NULL,
    ".*", RA_NULL}
   ,
   {CONFIG, "proxy.config.http.enable_url_expandomatic", "", INK_INT, "1", RU_REREAD, RR_NULL,
RC_INT, "[0-1]", RA_NULL}
@@ -2118,6 +2118,8 @@
   {CONFIG, "proxy.config.net.connections_throttle", "", INK_INT, "<connections_throttle>",
RU_RESTART_TS, RR_REQUIRED,
    RC_STR, "^[0-9]+$", RA_NULL}
   ,
+  {CONFIG, "proxy.config.net.throttle_enabled", "", INK_INT, "1", RU_NULL, RR_NULL, RC_NULL,
"[0-1]", RA_NULL}
+  ,
   {CONFIG, "proxy.config.net.max_poll_delay", "", INK_INT, "128", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.net.listen_backlog", "", INK_INT, "1024", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/Makefile.am Sat Feb
13 01:45:09 2010
@@ -38,7 +38,7 @@
 MGMT_DEFS = @MGMT_DEFS@
 DEFS  += $(MGMT_DEFS)
 
-bin_PROGRAMS = api_cli_remote
+noinst_PROGRAMS = traffic_api_cli_remote
 
 noinst_LIBRARIES = libmgmtapiremote.a 
 libmgmtapiremote_a_SOURCES = \
@@ -55,8 +55,8 @@
   NetworkUtilsRemote.cc \
   NetworkUtilsRemote.h
 
-api_cli_remote_SOURCES = APITestCliRemote.cc 
-api_cli_remote_LDADD = \
+traffic_api_cli_remote_SOURCES = APITestCliRemote.cc 
+traffic_api_cli_remote_LDADD = \
   libmgmtapiremote.a \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc Sat Feb 13 01:45:09
2010
@@ -32,6 +32,7 @@
 #include "inktomi++.h"
 
 #include "ink_args.h"
+#include "I_Version.h"
 #include "Tokenizer.h"
 #include "TextBuffer.h"
 #include "CliUtils.h"
@@ -286,6 +287,8 @@
   }                             // end while(1)
 }                               // end runInteractive
 
+AppVersionInfo appVersionInfo;
+int version_flag = 0;
 /*
  * Main entry point
  */
@@ -312,6 +315,10 @@
   repeatInterval = 5;
   timeout_arg = -1;
 
+  // build the application information structure
+  appVersionInfo.setup(PACKAGE_NAME,"traffic_line", PACKAGE_VERSION, __DATE__, 
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+
   clientCLI *cli = new clientCLI();
 
 /* Argument description table used to describe how to parse command line args, */
@@ -341,7 +348,8 @@
     {"bounce_cluster", 'B', "Bounce traffic_server (cluster wide)", "F", &BounceCluster,
NULL, NULL},
     {"bounce_local", 'b', "Bounce local traffic_server", "F", &BounceLocal, NULL, NULL},
     {"clear_cluster", 'C', "Clear Statistics (cluster wide)", "F", &ClearCluster, NULL,
NULL},
-    {"clear_node", 'c', "Clear Statistics (local node)", "F", &ClearNode, NULL, NULL}
+    {"clear_node", 'c', "Clear Statistics (local node)", "F", &ClearNode, NULL, NULL},
+    {"version", 'V', "Print Version Id", "T", &version_flag, NULL, NULL},
     /* INKqa10624
        { "timeout", 'T', "Request timeout (seconds)", "I", &timeout_arg, NULL, NULL}
*/
 
@@ -353,6 +361,12 @@
   // Process command line arguments and dump into variables
   process_args(argument_descriptions, n_argument_descriptions, argv);
 
+  // check for the version number request
+  if (version_flag) {
+    fprintf(stderr, "%s\n", appVersionInfo.FullVersionInfoStr);
+    exit(0);
+  }
+
 #ifdef _WIN32
   if (initWinSock() == false) {
     fprintf(stderr, "%s: unable to initialize winsock.\n", programName);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/Makefile.am?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/Makefile.am Sat Feb 13 01:45:09
2010
@@ -28,11 +28,6 @@
   -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
   -DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\"
 
-dist_bin_SCRIPTS = \
-  cli_setdomain.tcl \
-  cli_sethostname.tcl \
-  cli_setrouter.tcl \
-  script_configs.tcl
 
 bin_PROGRAMS = traffic_shell
 traffic_shell_SOURCES = \

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cliMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cliMain.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cliMain.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cliMain.cc Sat Feb 13 01:45:09
2010
@@ -21,10 +21,13 @@
   limitations under the License.
  */
 
+#include "ink_config.h"
 #include <stdlib.h>
 //#include "tclExtend.h"
 #include "tcl.h"
 #include <string.h>
+#include "ink_args.h"
+#include "I_Version.h"
 #include <CliMgmtUtils.h>
 #include "../api2/include/INKMgmtAPI.h"
 
@@ -38,6 +41,9 @@
 // registers an event callback for all events in general
 void register_event_callback(void);
 
+AppVersionInfo appVersionInfo;
+int version_flag = 0;
+
 int
 main(int argc, char *argv[])
 {
@@ -45,6 +51,28 @@
   char config_path[512];
   INKError status;
 
+  // build the application information structure
+  appVersionInfo.setup(PACKAGE_NAME,"traffic_shell", PACKAGE_VERSION, __DATE__,
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+
+  // Argument description table used to describe how to parse command line args,
+  // see 'ink_args.h' for meanings of the various fields 
+  ArgumentDescription argument_descriptions[] = {
+    {"version", 'V', "Print Version Id", "T", &version_flag, NULL, NULL}
+  };
+
+  int n_argument_descriptions = SIZE(argument_descriptions);
+  NOWARN_UNUSED(argc);
+
+  // Process command line arguments and dump into variables
+  process_args(argument_descriptions, n_argument_descriptions, argv);
+
+  // check for the version number request
+  if (version_flag) {
+    fprintf(stderr, "%s\n", appVersionInfo.FullVersionInfoStr);
+    exit(0);
+  }
+
   // traffic_shell binary should use printf to display information onscreen
   CliDisplayPrintf = 1;
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc Sat Feb 13
01:45:09 2010
@@ -2338,7 +2338,6 @@
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Entering init()\n");
 #endif
-  appVersionInfo.setup("traffic_cop", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
 
   init_signals();
   init_syslog();
@@ -2364,16 +2363,21 @@
 #endif
 }
 
-
+int version_flag = 0;
 int
 main(int argc, char *argv[])
 {
   int fd;
+  appVersionInfo.setup(PACKAGE_NAME,"traffic_cop", PACKAGE_VERSION, __DATE__, 
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-stop") == 0) {
       fprintf(stdout, "Cool! I think I'll be a STOP cop!\n");
       killsig = SIGSTOP;
+    } else if (strcmp(argv[i], "-V") == 0) {
+      fprintf(stderr, "%s\n", appVersionInfo.FullVersionInfoStr);
+      exit(0);
     }
   }
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/Makefile.am?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/Makefile.am Sat Feb 13
01:45:09 2010
@@ -33,31 +33,31 @@
 MGMT_DEFS = @MGMT_DEFS@
 DEFS += $(MGMT_DEFS)
 
-bin_PROGRAMS = vip_config net_config time_config shmem_clean mcast_snoop
+noinst_PROGRAMS = traffic_vip_config traffic_net_config traffic_time_config traffic_shmem_clean
traffic_mcast_snoop
 
 noinst_LIBRARIES = libinksysapi.a libinkconfigapi.a
 
-vip_config_SOURCES = VIPConfig.cc
-vip_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-vip_config_LDADD = \
+traffic_vip_config_SOURCES = VIPConfig.cc
+traffic_vip_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_vip_config_LDADD = \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBDL@ @LIBICONV@
 
-net_config_SOURCES = NetConfig.cc
-net_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-net_config_LDADD = \
+traffic_net_config_SOURCES = NetConfig.cc
+traffic_net_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_net_config_LDADD = \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBICONV@
 
-time_config_SOURCES = TimeConfig.cc
-time_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_time_config_SOURCES = TimeConfig.cc
+traffic_time_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 
-shmem_clean_SOURCES = ShmemClean.cc
-shmem_clean_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_shmem_clean_SOURCES = ShmemClean.cc
+traffic_shmem_clean_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 
-mcast_snoop_SOURCES = McastSnoop.cc
-mcast_snoop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-mcast_snoop_LDADD = \
+traffic_mcast_snoop_SOURCES = McastSnoop.cc
+traffic_mcast_snoop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_mcast_snoop_LDADD = \
   $(top_builddir)/libinktomi++/libinktomi++.a \
   @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBTHREAD@ @LIBDL@ @LIBICONV@
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/sac.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/sac.cc?rev=909688&r1=909687&r2=909688&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/sac.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/sac.cc Sat Feb 13 01:45:09 2010
@@ -30,8 +30,7 @@
  ***************************************************************************/
 #include "ink_unused.h"
 
-#define PROGRAM_NAME		"sac"
-#define PROGRAM_VERSION		"1.0"
+#define PROGRAM_NAME		"traffic_sac"
 
 #include "LogStandalone.cc"
 
@@ -92,7 +91,8 @@
   char ts_path[PATH_NAME_MAX + 1];
   // build the application information structure
   //
-  appVersionInfo.setup(PROGRAM_NAME, PROGRAM_VERSION, __DATE__, __TIME__, BUILD_MACHINE,
BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__, 
+                       __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // take care of command-line arguments
   //



Mime
View raw message