Author: zwoop
Date: Thu Jan 13 16:55:29 2011
New Revision: 1058658
URL: http://svn.apache.org/viewvc?rev=1058658&view=rev
Log:
TS-636 Remove StatAggregation.[cc,h]
Removed:
trafficserver/traffic/trunk/proxy/mgmt/StatAggregation.cc
trafficserver/traffic/trunk/proxy/mgmt/StatAggregation.h
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/proxy/mgmt/Main.cc
trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt/utils/WebMgmtUtils.h
trafficserver/traffic/trunk/proxy/mgmt/web2/WebOverview.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1058658&r1=1058657&r2=1058658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Thu Jan 13 16:55:29 2011
@@ -2,6 +2,17 @@
Changes with Apache Traffic Server 2.1.6
+ *) Rename proxy/http2 -> proxy/http and proxy/mgmt2 to proxy/mgmt [TS-631].
+
+ *) Add an example to records.config for how to bind a specific IP [TS-582].
+
+ *) Cluster port was activated even with clustering disabled. This fix also
+ adds monitoring support for the "cli" unix domain socket [TS-491].
+
+ *) Cleanup of inktomi.com [TS-593].
+
+ *) Cleaning up some old TCL files and dependencies [TS-324].
+
*) Remove traces of FTP references [TS-324] by purging the now useless TCL
bindings to it.
@@ -219,9 +230,11 @@ Changes with Apache Traffic Server 2.1.5
*) Various defines for version identification has been moved to the public
ts/ts.h include file, e.g.
- #define TS_VERSION_STRING "2.1.5-unstable" define TS_VERSION_NUMBER
- #2001005 define TS_VERSION_MAJOR 2 define TS_VERSION_MINOR 1 define
- #TS_VERSION_MICRO 5
+ #define TS_VERSION_STRING "2.1.6-unstable"
+ #define TS_VERSION_NUMBER 2001006
+ #define TS_VERSION_MAJOR 2
+ #define TS_VERSION_MINOR 1
+ #define TS_VERSION_MICRO 6
The intended use is for plugins to be able to verify available APIs at
compile time (vs the existing runtime checks) [TS-534].
Modified: trafficserver/traffic/trunk/proxy/mgmt/Main.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Main.cc?rev=1058658&r1=1058657&r2=1058658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Main.cc Thu Jan 13 16:55:29 2011
@@ -59,13 +59,7 @@
#endif
-#define USE_STATPRO
-#if defined(USE_STATPRO)
#include "StatProcessor.h"
-#else
-#include "StatAggregation.h"
-#endif
-
#include "P_RecLocal.h"
#include "P_RecCore.h"
@@ -91,10 +85,7 @@ LocalManager *lmgmt = NULL;
MgmtPing *icmp_ping;
FileManager *configFiles;
-#if defined(USE_STATPRO)
StatProcessor *statProcessor; // Statistics Processors
-#endif
-
AppVersionInfo appVersionInfo; // Build info for this application
inkcoreapi Diags *diags;
@@ -880,9 +871,7 @@ main(int argc, char **argv)
ticker = time(NULL);
mgmt_log("[TrafficManager] Setup complete\n");
-#ifdef USE_STATPRO
statProcessor = NEW(new StatProcessor());
-#endif
for (;;) {
lmgmt->processEventQueue();
@@ -916,20 +905,14 @@ main(int argc, char **argv)
/* Proxy is not up, but we should still exchange config and alarm info */
lmgmt->ccom->sendSharedData(false);
}
-#ifndef USE_STATPRO
// Aggregate node statistics
overviewGenerator->doClusterAg();
-#endif
lmgmt->ccom->checkPeers(&ticker);
overviewGenerator->checkForUpdates();
-#ifndef USE_STATPRO
- // Aggregate cluster statistics
- aggregateNodeRecords();
-#else
+
if (statProcessor) {
statProcessor->processStat();
}
-#endif
if (lmgmt->mgmt_shutdown_outstanding == true) {
lmgmt->mgmtShutdown(0, true);
@@ -972,11 +955,9 @@ main(int argc, char **argv)
}
-#if defined(STATPRO)
if (statProcessor) {
delete(statProcessor);
}
-#endif
#ifndef MGMT_SERVICE
return 0;
@@ -1245,11 +1226,9 @@ fileUpdated(char *fname)
lmgmt->signalFileChange("proxy.config.body_factory.template_sets_dir");
} else if (strcmp(fname, "stats.config.xml") == 0) {
-#if defined(STATPRO)
if (statProcessor) {
statProcessor->rereadConfig();
}
-#endif
mgmt_log(stderr, "[fileUpdated] stats.config.xml file has been
modified\n");
} else if (strcmp(fname, "congestion.config") == 0) {
lmgmt->signalFileChange("proxy.config.http.congestion_control.filename");
Modified: trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Makefile.am?rev=1058658&r1=1058657&r2=1058658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Makefile.am Thu Jan 13 16:55:29 2011
@@ -84,8 +84,6 @@ traffic_manager_SOURCES = \
RecordsConfig.h \
Rollback.cc \
Rollback.h \
- StatAggregation.cc \
- StatAggregation.h \
WebPluginList.cc \
WebPluginList.h
Modified: trafficserver/traffic/trunk/proxy/mgmt/utils/WebMgmtUtils.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/utils/WebMgmtUtils.h?rev=1058658&r1=1058657&r2=1058658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/utils/WebMgmtUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/utils/WebMgmtUtils.h Thu Jan 13
16:55:29 2011
@@ -88,11 +88,8 @@ bool varSetFloat(const char *varName, Re
// Return the type of the variable named
RecDataT varType(const char *varName);
-
int convertHtmlToUnix(char *buffer);
-
int substituteUnsafeChars(char *buffer);
-
char *substituteForHTMLChars(const char *buffer);
// Produce a hash table based on a HTML form submission
@@ -103,9 +100,8 @@ InkHashTable *processFormSubmission_noSu
// Shutdown the proxy
bool ProxyShutdown();
-int processSpawn(const char *args[],
- EnvBlock * env,
- textBuffer * input_buf, textBuffer * output_buf, bool nowait,
bool runAsRoot, bool * truncated = NULL);
+int processSpawn(const char *args[], EnvBlock * env, textBuffer * input_buf,
textBuffer * output_buf, bool nowait,
+ bool runAsRoot, bool * truncated = NULL);
void computeXactMax();
void appendDefaultDomain(char *hostname, int bufLength);
@@ -116,9 +112,6 @@ void appendDefaultDomain(char *hostname,
#define SECOND_TO_MILLISECOND_SCALE (1000.0)
#define PCT_TO_INTPCT_SCALE (100.0)
-void AgInt_generic_scale(char *processVar, char *nodeVar, double factor);
-void AgFloat_generic_scale_to_int(const char *processVar, const char *nodeVar,
double factor);
-
bool recordValidityCheck(const char *varName, const char *value);
bool recordRegexCheck(const char *pattern, const char *value);
bool recordRangeCheck(const char *pattern, const char *value);
Modified: trafficserver/traffic/trunk/proxy/mgmt/web2/WebOverview.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/web2/WebOverview.cc?rev=1058658&r1=1058657&r2=1058658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/web2/WebOverview.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/web2/WebOverview.cc Thu Jan 13
16:55:29 2011
@@ -2180,6 +2180,22 @@ overviewPage::varClusterCounterFromName(
return (status);
}
+// Moved from the now removed StatAggregation.cc
+void
+AgFloat_generic_scale_to_int(const char *processVar, const char *nodeVar,
double factor)
+{
+ MgmtFloat tmp;
+
+ if (varFloatFromName(processVar, &tmp)) {
+ tmp = tmp * factor;
+ tmp = tmp + 0.5; // round up.
+ varSetInt(nodeVar, (int) tmp);
+ } else {
+ varSetInt(nodeVar, -20);
+ }
+}
+
+
// void overviewPage::doClusterAg()
//
// Aggregate data for cluster records
