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 2011/06/17 02:43:23 UTC
svn commit: r1136745 - in /trafficserver/traffic/trunk: CHANGES
lib/ts/ink_config.h.in mgmt/LocalManager.cc mgmt/MgmtDefs.h
mgmt/stats/StatType.h proxy/InkAPI.cc proxy/http/HttpBodyFactory.cc
proxy/http/HttpConfig.h
Author: zwoop
Date: Fri Jun 17 00:43:23 2011
New Revision: 1136745
URL: http://svn.apache.org/viewvc?rev=1136745&view=rev
Log:
TS-760 Cleanup mgmt types.
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/lib/ts/ink_config.h.in
trafficserver/traffic/trunk/mgmt/LocalManager.cc
trafficserver/traffic/trunk/mgmt/MgmtDefs.h
trafficserver/traffic/trunk/mgmt/stats/StatType.h
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc
trafficserver/traffic/trunk/proxy/http/HttpConfig.h
Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Jun 17 00:43:23 2011
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.0
+ *) [TS-760] Cleanup mgmt types.
+
*) [TS-359] Remove DIR_SEP and use slash directly.
*) [TS-839] Build problems when specifying lmza location.
Modified: trafficserver/traffic/trunk/lib/ts/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_config.h.in?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_config.h.in Fri Jun 17 00:43:23 2011
@@ -167,10 +167,6 @@
#define TS_PKGSYSUSER "@pkgsysuser@"
#define TS_PKGSYSGROUP "@pkgsysgroup@"
-/* TODO: Fix those always defined features */
-#define MODULARIZED
-
-
/* Various "build" defines */
#define TS_BUILD_PREFIX "@prefix@"
#define TS_BUILD_EXEC_PREFIX "@rel_exec_prefix@"
Modified: trafficserver/traffic/trunk/mgmt/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/LocalManager.cc?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/mgmt/LocalManager.cc Fri Jun 17 00:43:23 2011
@@ -738,16 +738,16 @@ LocalManager::handleMgmtMsgFromProcesses
// stype is an enum type, so cast to an int* to avoid warnings. /leif
int tokens = sscanf(data_raw, "%255s %d %255s", var_name, (int *) &stype, var_value);
if (tokens != 3) {
- stype = INVALID;
+ stype = MGMT_INVALID;
}
switch (stype) {
- case INK_INT:
+ case MGMT_INT:
RecSetRecordInt(var_name, ink_atoi64(var_value));
break;
- case INK_COUNTER:
- case INK_FLOAT:
- case INK_STRING:
- case INVALID:
+ case MGMT_COUNTER:
+ case MGMT_FLOAT:
+ case MGMT_STRING:
+ case MGMT_INVALID:
default:
mgmt_elog(stderr,
"[LocalManager::handleMgmtMsgFromProcesses] " "Invalid plugin set-config msg '%s'\n", data_raw);
Modified: trafficserver/traffic/trunk/mgmt/MgmtDefs.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/MgmtDefs.h?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/MgmtDefs.h (original)
+++ trafficserver/traffic/trunk/mgmt/MgmtDefs.h Fri Jun 17 00:43:23 2011
@@ -48,14 +48,12 @@ typedef char *MgmtString;
typedef enum
{
- INVALID = -1,
- INK_INT = 0,
- INK_FLOAT = 1,
- INK_STRING = 2,
- INK_COUNTER = 3,
- INK_STAT_CONST = 4, // Added for the StatProcessor
- INK_STAT_FX = 5, // Added for the StatProcessor
- MAX_MGMT_TYPE = 6
+ MGMT_INVALID = -1,
+ MGMT_INT = 0,
+ MGMT_FLOAT = 1,
+ MGMT_STRING = 2,
+ MGMT_COUNTER = 3,
+ MGMT_TYPE_MAX = 4
} MgmtType;
/*
@@ -87,22 +85,4 @@ struct StatTwoIntSamples
}
};
-struct StatTwoFloatSamples
-{
- const char *lm_record_name;
- ink_hrtime previous_time;
- ink_hrtime current_time;
- MgmtFloat previous_value;
- MgmtFloat current_value;
-
- MgmtFloat diff_value()
- {
- return (current_value - previous_value);
- }
- ink_hrtime diff_time()
- {
- return (current_time - previous_time);
- }
-};
-
#endif /* _MGMT_DEF_H */
Modified: trafficserver/traffic/trunk/mgmt/stats/StatType.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/stats/StatType.h?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/stats/StatType.h (original)
+++ trafficserver/traffic/trunk/mgmt/stats/StatType.h Fri Jun 17 00:43:23 2011
@@ -39,8 +39,6 @@
#define BYTES_TO_MBIT_SCALE (8/1000000.0)
-#if defined MODULARIZED
-
#define ERROR_VALUE 0
#define StatDataT RecDataT
#define StatFloat RecFloat
@@ -73,26 +71,6 @@ struct StatFloatSamples
}
};
-#else
-
-#include "MgmtDefs.h"
-#define ERROR_VALUE -9999.0
-#define StatDataT MgmtType
-#define StatFloat MgmtFloat
-#define StatInt MgmtInt
-#define StatCounter MgmtIntCounter
-#define StatString MgmtString
-
-#define STAT_INT INK_INT
-#define STAT_FLOAT INK_FLOAT
-#define STAT_STRING INK_STRING
-#define STAT_COUNTER INK_COUNTER
-#define STAT_CONST INK_STAT_CONST
-#define STAT_FX INK_STAT_FX
-
-#define StatFloatSamples StatTwoFloatSamples
-#endif
-
// Urgly workaround -- no optimization in HPUX
#if defined(hpux)
#define inline
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Fri Jun 17 00:43:23 2011
@@ -6889,7 +6889,7 @@ TSMgmtConfigIntSet(const char *var_name,
int buffer_size = strlen(var_name) + 1 + 32 + 1 + 64 + 1;
buffer = (char *) alloca(buffer_size);
- snprintf(buffer, buffer_size, "%s %d %" PRId64 "", var_name, INK_INT, value);
+ snprintf(buffer, buffer_size, "%s %d %" PRId64 "", var_name, MGMT_INT, value);
// tell manager to set the configuration; note that this is not
// transactional (e.g. we return control to the plugin before the
Modified: trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc Fri Jun 17 00:43:23 2011
@@ -265,10 +265,6 @@ config_callback(const char *name, RecDat
return (0);
}
-//#ifdef MODULARIZED
-//void HttpBodyFactory::reconfigure(const char* name, RecDataT data_type,
-// RecData data, void *cookie)
-//#else
void
HttpBodyFactory::reconfigure()
//#endif
Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.h?rev=1136745&r1=1136744&r2=1136745&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.h Fri Jun 17 00:43:23 2011
@@ -50,12 +50,6 @@
#include "libts.h"
#include "ProxyConfig.h"
-#undef MgmtInt
-#undef MgmtFloat
-#define MgmtInt RecInt
-#define MgmtFloat RecFloat
-
-
#include "P_RecProcess.h"