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 2010/11/30 02:43:06 UTC
svn commit: r1040383 [14/38] - in /trafficserver/traffic/branches/wccp: ./
build/ contrib/ contrib/perl/AdminClient/lib/Apache/TS/ example/
example/add-header/ example/app-template/ example/append-transform/
example/basic-auth/ example/blacklist-0/ exa...
Modified: trafficserver/traffic/branches/wccp/proxy/Prefetch.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/Prefetch.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/Prefetch.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/Prefetch.cc Tue Nov 30 01:42:55 2010
@@ -289,7 +289,7 @@ ClassAllocator<PrefetchUrlEntry> prefetc
PrefetchTransform::PrefetchTransform(HttpSM * sm, HTTPHdr * resp)
-:INKVConnInternal(NULL, sm->mutex), m_output_buf(NULL), m_output_vio(NULL), m_sm(sm)
+ : INKVConnInternal(NULL, sm->mutex), m_output_buf(NULL), m_output_vio(NULL), m_sm(sm)
{
refcount_inc();
@@ -638,7 +638,7 @@ check_n_attach_prefetch_transform(HttpSM
Debug("PrefetchParserCT", "Content type is text/html\n");
if (prefetch_config.pre_parse_hook) {
- INKPrefetchInfo info;
+ TSPrefetchInfo info;
HTTPHdr *req = &sm->t_state.hdr_info.client_request;
info.request_buf = req;
@@ -654,11 +654,10 @@ check_n_attach_prefetch_transform(HttpSM
info.object_buf = 0;
info.object_buf_reader = 0;
- info.object_buf_status = INK_PREFETCH_OBJ_BUF_NOT_NEEDED;
+ info.object_buf_status = TS_PREFETCH_OBJ_BUF_NOT_NEEDED;
- int ret = (prefetch_config.pre_parse_hook) (INK_PREFETCH_PRE_PARSE_HOOK,
- &info);
- if (ret == INK_PREFETCH_DISCONTINUE)
+ int ret = (prefetch_config.pre_parse_hook) (TS_PREFETCH_PRE_PARSE_HOOK, &info);
+ if (ret == TS_PREFETCH_DISCONTINUE)
return;
}
//now insert the parser
@@ -666,7 +665,7 @@ check_n_attach_prefetch_transform(HttpSM
if (prefetch_trans) {
Debug("PrefetchParser", "Adding Prefetch Parser 0x%p\n", prefetch_trans);
- INKHttpTxnHookAdd(sm, INK_HTTP_RESPONSE_TRANSFORM_HOOK, prefetch_trans);
+ TSHttpTxnHookAdd(sm, TS_HTTP_RESPONSE_TRANSFORM_HOOK, prefetch_trans);
DUMP_HEADER("PrefetchParserHdrs", &sm->t_state.hdr_info.client_request, (int64)0,
"Request Header given for Prefetch Parser");
@@ -675,7 +674,7 @@ check_n_attach_prefetch_transform(HttpSM
static int
-PrefetchPlugin(INKCont contp, INKEvent event, void *edata)
+PrefetchPlugin(TSCont contp, TSEvent event, void *edata)
{
NOWARN_UNUSED(contp);
HttpSM *sm = (HttpSM *) edata;
@@ -684,13 +683,13 @@ PrefetchPlugin(INKCont contp, INKEvent e
switch (event) {
- case INK_EVENT_HTTP_CACHE_LOOKUP_COMPLETE:{
+ case TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE:{
- Debug("PrefetchPlugin", "Received INK_HTTP_CACHE_LOOKUP_COMPLETE_HOOK " "event (sm = 0x%p)\n", sm);
+ Debug("PrefetchPlugin", "Received TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK " "event (sm = 0x%p)\n", sm);
int status;
- INKHttpTxnCacheLookupStatusGet((INKHttpTxn) sm, &status);
+ TSHttpTxnCacheLookupStatusGet((TSHttpTxn) sm, &status);
- if (status == INK_CACHE_LOOKUP_HIT_FRESH) {
+ if (status == TS_CACHE_LOOKUP_HIT_FRESH) {
Debug("PrefetchPlugin", "Cached object is fresh\n");
resp = sm->t_state.cache_info.object_read->response_get();
from_cache = true;
@@ -700,8 +699,8 @@ PrefetchPlugin(INKCont contp, INKEvent e
break;
}
- case INK_EVENT_HTTP_READ_RESPONSE_HDR:
- Debug("PrefetchPlugin", "Received INK_EVENT_HTTP_READ_RESPONSE_HDR " "event (sm = 0x%p)\n", sm);
+ case TS_EVENT_HTTP_READ_RESPONSE_HDR:
+ Debug("PrefetchPlugin", "Received TS_EVENT_HTTP_READ_RESPONSE_HDR " "event (sm = 0x%p)\n", sm);
resp = &sm->t_state.hdr_info.server_response;
break;
@@ -714,7 +713,7 @@ PrefetchPlugin(INKCont contp, INKEvent e
if (resp && resp->valid())
check_n_attach_prefetch_transform(sm, resp, from_cache);
- INKHttpTxnReenable(sm, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(sm, TS_EVENT_HTTP_CONTINUE);
//Debug("PrefetchPlugin", "Returning after check_n_attach_prefetch_transform()\n");
@@ -739,9 +738,9 @@ PrefetchProcessor::start()
prefetch_udp_fd = socketManager.socket(PF_INET, SOCK_DGRAM, 0);
- INKCont contp = INKContCreate(PrefetchPlugin, NULL);
- INKHttpHookAdd(INK_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, contp);
- INKHttpHookAdd(INK_HTTP_READ_RESPONSE_HDR_HOOK, contp);
+ TSCont contp = TSContCreate(PrefetchPlugin, NULL);
+ TSHttpHookAdd(TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK, contp);
+ TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, contp);
Note("PrefetchProcessor: Started the prefetch processor\n");
} else {
@@ -1330,8 +1329,7 @@ PrefetchBlaster::handleCookieHeaders(HTT
// INKqa11823 - now add the old Cookies back based on the new cookies
if (add_cookies && existing_req_cookies) {
- MIMEField *o_cookie = req_hdr->field_find(MIME_FIELD_COOKIE,
- MIME_LEN_COOKIE);
+ MIMEField *o_cookie = req_hdr->field_find(MIME_FIELD_COOKIE, MIME_LEN_COOKIE);
const char *iter_cookie;
int iter_cookie_len;
@@ -1622,23 +1620,23 @@ PrefetchBlaster::blastObject(int event,
setup_object_header(reader->start(), reader->read_avail(), obj_cancelled);
- if (url_ent->object_buf_status != INK_PREFETCH_OBJ_BUF_NOT_NEEDED &&
+ if (url_ent->object_buf_status != TS_PREFETCH_OBJ_BUF_NOT_NEEDED &&
prefetch_config.embedded_obj_hook && !obj_cancelled) {
- INKPrefetchInfo info;
+ TSPrefetchInfo info;
memset(&info, 0, sizeof(info));
info.embedded_url = url_ent->url;
info.object_buf_status = url_ent->object_buf_status;
- info.object_buf = INKIOBufferCreate();
- info.object_buf_reader = INKIOBufferReaderAlloc(info.object_buf);
+ info.object_buf = TSIOBufferCreate();
+ info.object_buf_reader = TSIOBufferReaderAlloc(info.object_buf);
((MIOBuffer *) info.object_buf)->write(reader);
- prefetch_config.embedded_obj_hook(INK_PREFETCH_EMBEDDED_OBJECT_HOOK, &info);
+ prefetch_config.embedded_obj_hook(TS_PREFETCH_EMBEDDED_OBJECT_HOOK, &info);
}
- if (url_ent->object_buf_status == INK_PREFETCH_OBJ_BUF_NEEDED) {
+ if (url_ent->object_buf_status == TS_PREFETCH_OBJ_BUF_NEEDED) {
//we need not send this to the child
free();
break;
@@ -1709,14 +1707,14 @@ int
PrefetchBlaster::invokeBlaster()
{
int ret = (cache_http_info && !prefetch_config.push_cached_objects)
- ? INK_PREFETCH_DISCONTINUE : INK_PREFETCH_CONTINUE;
+ ? TS_PREFETCH_DISCONTINUE : TS_PREFETCH_CONTINUE;
unsigned int url_proto = prefetch_config.default_url_proto;
data_proto = prefetch_config.default_data_proto;
if (prefetch_config.embedded_url_hook) {
- INKPrefetchInfo info;
+ TSPrefetchInfo info;
info.request_buf = request;
info.request_loc = request->m_http;
@@ -1725,7 +1723,7 @@ PrefetchBlaster::invokeBlaster()
info.object_buf = 0;
info.object_buf_reader = 0;
- info.object_buf_status = INK_PREFETCH_OBJ_BUF_NOT_NEEDED;
+ info.object_buf_status = TS_PREFETCH_OBJ_BUF_NOT_NEEDED;
info.client_ip = url_ent->child_ip;
info.embedded_url = url_ent->url;
@@ -1734,7 +1732,7 @@ PrefetchBlaster::invokeBlaster()
info.url_response_proto = data_proto;
ret = (*prefetch_config.embedded_url_hook)
- (INK_PREFETCH_EMBEDDED_URL_HOOK, &info);
+ (TS_PREFETCH_EMBEDDED_URL_HOOK, &info);
url_proto = info.url_proto;
data_proto = info.url_response_proto;
@@ -1742,14 +1740,14 @@ PrefetchBlaster::invokeBlaster()
url_ent->object_buf_status = info.object_buf_status;
}
- if (ret == INK_PREFETCH_CONTINUE) {
+ if (ret == TS_PREFETCH_CONTINUE) {
if (url_proto != TCP_BLAST && url_proto != UDP_BLAST)
url_ent->url_multicast_ip = url_proto;
if (data_proto != TCP_BLAST && data_proto != UDP_BLAST)
url_ent->data_multicast_ip = data_proto;
- if (url_ent->object_buf_status != INK_PREFETCH_OBJ_BUF_NEEDED) {
+ if (url_ent->object_buf_status != TS_PREFETCH_OBJ_BUF_NEEDED) {
if (url_proto == TCP_BLAST)
url_list = transform->tcp_url_list;
else
@@ -2175,26 +2173,26 @@ KeepAliveLockHandler::handleEvent(int ev
/* API */
int
-INKPrefetchStart()
+TSPrefetchStart()
{
- printf("INKPrefetchStart() is called\n");
+ printf("TSPrefetchStart() is called\n");
return 0;
}
int
-INKPrefetchHookSet(int hook_no, INKPrefetchHook hook)
+TSPrefetchHookSet(int hook_no, TSPrefetchHook hook)
{
switch (hook_no) {
- case INK_PREFETCH_PRE_PARSE_HOOK:
+ case TS_PREFETCH_PRE_PARSE_HOOK:
prefetch_config.pre_parse_hook = hook;
return 0;
- case INK_PREFETCH_EMBEDDED_URL_HOOK:
+ case TS_PREFETCH_EMBEDDED_URL_HOOK:
prefetch_config.embedded_url_hook = hook;
return 0;
- case INK_PREFETCH_EMBEDDED_OBJECT_HOOK:
+ case TS_PREFETCH_EMBEDDED_OBJECT_HOOK:
prefetch_config.embedded_obj_hook = hook;
return 0;
Modified: trafficserver/traffic/branches/wccp/proxy/Prefetch.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/Prefetch.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/Prefetch.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/Prefetch.h Tue Nov 30 01:42:55 2010
@@ -30,7 +30,7 @@
#ifdef PREFETCH
#include "Update.h"
-#include "api/ts/ts_private_frozen.h"
+#include "api/ts/experimental.h"
#include "api/ts/InkAPIHughes.h"
#define IPSTRARGS(ip) (unsigned int) ((unsigned char *) &(ip))[0], \
@@ -41,9 +41,9 @@
typedef enum
{
ILL_BLAST = 0,
- UDP_BLAST = INK_PREFETCH_PROTO_UDP,
- TCP_BLAST = INK_PREFETCH_PROTO_TCP
- //MULTICAST_BLAST = INK_PREFETCH_PROTO_UDP_MULTICAST
+ UDP_BLAST = TS_PREFETCH_PROTO_UDP,
+ TCP_BLAST = TS_PREFETCH_PROTO_TCP
+ //MULTICAST_BLAST = TS_PREFETCH_PROTO_UDP_MULTICAST
} PrefetchBlastType;
class BlasterUrlList;
@@ -75,9 +75,9 @@ struct PrefetchConfiguration
unsigned int max_recursion; //limit on depth of recursive prefetch
unsigned int redirection; //limit on depth of redirect prefetch
- INKPrefetchHook pre_parse_hook;
- INKPrefetchHook embedded_url_hook;
- INKPrefetchHook embedded_obj_hook;
+ TSPrefetchHook pre_parse_hook;
+ TSPrefetchHook embedded_url_hook;
+ TSPrefetchHook embedded_obj_hook;
int readConfiguration();
void readHtmlTags(int fd, html_tag ** ptags, html_tag ** pattrs);
@@ -89,7 +89,7 @@ class PrefetchUrlEntry: public RefCountO
public:
PrefetchUrlEntry()
:url(0), len(INT_MAX), resp_blaster(0),
- object_buf_status(INK_PREFETCH_OBJ_BUF_NOT_NEEDED),
+ object_buf_status(TS_PREFETCH_OBJ_BUF_NOT_NEEDED),
req_ip(0), child_ip(0), url_multicast_ip(0), data_multicast_ip(0), blaster_link(0), hash_link(0)
{
refcount_inc();
Modified: trafficserver/traffic/branches/wccp/proxy/SimpleHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/SimpleHttp.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/SimpleHttp.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/SimpleHttp.cc Tue Nov 30 01:42:55 2010
@@ -31,6 +31,8 @@
#include "Diags.h"
#include "HTTP.h"
+// TODO: This should be changed later to use TS_HAS_TESTS, but currently, the test
+// most likely isn't functional.
#if COMPILE_SIMPLE_HTTP
#define HISTORY_SIZE 0
Modified: trafficserver/traffic/branches/wccp/proxy/StatAPITypes.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StatAPITypes.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StatAPITypes.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/StatAPITypes.h Tue Nov 30 01:42:55 2010
@@ -40,10 +40,10 @@ class HistogramStats
public:
// TODO: Eliminate STL strings ?
HistogramStats() { }
- HistogramStats(const std::string &stat_prefix, long long max_stat) { init(stat_prefix, max_stat); }
- void init(const std::string &stat_prefix, long long max_stat);
- void inc(long long stat_val);
- long long get_bucket(long long theNumber);
+ HistogramStats(const std::string &stat_prefix, int64 max_stat) { init(stat_prefix, max_stat); }
+ void init(const std::string &stat_prefix, int64 max_stat);
+ void inc(int64 stat_val);
+ int64 get_bucket(int64 theNumber);
private:
std::vector<uint32_t> buckets; // TODO: Do we need a vector here?
};
Modified: trafficserver/traffic/branches/wccp/proxy/StatPages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StatPages.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StatPages.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/StatPages.cc Tue Nov 30 01:42:55 2010
@@ -32,10 +32,9 @@
#include "ProxyConfig.h"
#include "StatPages.h"
#include "HdrUtils.h"
-#include "CacheInspectorAllow.h"
#include "MatcherUtils.h"
-#define MAX_STAT_PAGES 100
+#define MAX_STAT_PAGES 32
// Globals
@@ -47,8 +46,7 @@ static struct
StatPagesFunc func;
} stat_pages[MAX_STAT_PAGES];
-static int n_stat_pages = 0;
-
+volatile static int n_stat_pages = 0;
void
StatPagesManager::init()
@@ -71,17 +69,15 @@ StatPagesManager::handle_http(Continuati
{
URL *url = header->url_get();
- if (((m_enabled == 1 || m_enabled == 3) &&
- is_cache_inspector_page(url) &&
- (!cache_inspector_allow_table || cache_inspector_allow_table->match(client_ip))) ||
+ if (((m_enabled == 1 || m_enabled == 3) && is_cache_inspector_page(url)) ||
((m_enabled == 2 || m_enabled == 3) && is_stat_page(url) && !is_cache_inspector_page(url))) {
int host_len;
char host[1024];
const char *h;
int i;
+
h = url->host_get(&host_len);
- strncpy(host, h, host_len);
- host[host_len] = '\0';
+ ink_strncpy(host, h, host_len >= 1023 ? 1024 : host_len + 1);
unescapifyStr(host);
host_len = strlen(host);
@@ -98,48 +94,33 @@ StatPagesManager::handle_http(Continuati
bool StatPagesManager::is_stat_page(URL * url)
{
- int
- length;
- const char *
- h = url->host_get(&length);
- //Bug fixed by YTS Team, yamsat BZ58899
- char *
- host = (char *) xmalloc(length + 1);
- if (h == NULL || length < 2) {
- xfree(host);
+ int length;
+ const char *h = url->host_get(&length);
+ char host[1024];
+
+ if (h == NULL || length < 2)
return false;
- }
- strncpy(host, h, length);
- host[length] = '\0';
+ ink_strncpy(host, h, length >= 1023 ? 1024 : length + 1);
unescapifyStr(host);
length = strlen(host);
-//return ((host[0] == '{') && (host[length-1] == '}'));
-//Bug fixed by YTS Team, yamsat BZ58899
- bool
- retVal;
+
if ((host[0] == '{') && (host[length - 1] == '}'))
- retVal = true;
- else
- retVal = false;
- xfree(host);
- return retVal;
+ return true;
+ return false;
}
bool StatPagesManager::is_cache_inspector_page(URL * url)
{
- int
- length;
- const char *
- h = url->host_get(&length);
- char
- host[1024];
- if (h == NULL || length < 2) {
+ int length;
+ const char *h = url->host_get(&length);
+ char host[1024];
+
+ if (h == NULL || length < 2)
return false;
- }
- strncpy(host, h, length);
+ ink_strncpy(host, h, length >= 1023 ? 1024 : length + 1);
host[length] = '\0';
unescapifyStr(host);
length = strlen(host);
Modified: trafficserver/traffic/branches/wccp/proxy/StatSystem.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StatSystem.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StatSystem.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/StatSystem.cc Tue Nov 30 01:42:55 2010
@@ -51,8 +51,6 @@ time_t last_http_local_time;
#endif
ink_stat_lock_t global_http_trans_stat_lock;
ink_unprot_global_stat_t global_http_trans_stats[MAX_HTTP_TRANS_STATS];
-inkcoreapi ink_stat_lock_t global_rni_trans_stat_lock;
-inkcoreapi ink_unprot_global_stat_t global_rni_trans_stats[MAX_RNI_TRANS_STATS];
#ifndef USE_LOCKS_FOR_DYN_STATS
inkcoreapi ink_unprot_global_stat_t global_dyn_stats[MAX_DYN_STATS - DYN_STAT_START];
#else
@@ -147,26 +145,11 @@ static int non_persistent_stats[] = {
/////////////////////////////////////
// Start of Scheduled Update stats
/////////////////////////////////////
- // WMT stats
// DNS
//dns_success_time_stat
};
#endif
-
-
-#define _HEADER \
-RniTransactionStatsString_t RniTransactionStatsStrings[] = {
-
-#define _FOOTER };
-#define _D(_x) { _x, #_x},
-
-#include "RniTransStats.h"
-#undef _HEADER
-#undef _FOOTER
-#undef _D
-
-
#define _HEADER \
DynamicStatsString_t DynamicStatsStrings[] = {
@@ -222,13 +205,6 @@ clear_stats()
global_http_trans_stats[i].count = 0;
}
}
- stats_size = MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS - 1;
- for (i = 0; i < stats_size; i++) {
- if (persistent_stat(i + NO_RNI_TRANS_STATS)) {
- global_rni_trans_stats[i].sum = 0;
- global_rni_trans_stats[i].count = 0;
- }
- }
stats_size = MAX_DYN_STATS - NO_DYN_STATS - 1;
for (i = 0; i < stats_size; i++) {
if (persistent_stat(i + NO_DYN_STATS)) {
@@ -262,9 +238,7 @@ read_stats_snap()
goto Lmissmatch;
if (version != version_read)
goto Lmissmatch;
- stats_size =
- MAX_HTTP_TRANS_STATS - NO_HTTP_TRANS_STATS +
- MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS + MAX_DYN_STATS - NO_DYN_STATS;
+ stats_size = MAX_HTTP_TRANS_STATS - NO_HTTP_TRANS_STATS + MAX_DYN_STATS - NO_DYN_STATS;
if (socketManager.read(fd, (char *) &count, sizeof(count)) != sizeof(count))
goto Lmissmatch;
if (count != stats_size)
@@ -279,15 +253,6 @@ read_stats_snap()
!= sizeof(global_http_trans_stats[i].count))
goto Lmissmatch;
}
- stats_size = MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS;
- for (i = 0; i < stats_size; i++) {
- if (socketManager.read(fd, (char *) &global_rni_trans_stats[i].sum, sizeof(global_rni_trans_stats[i].sum))
- != sizeof(global_rni_trans_stats[i].sum))
- goto Lmissmatch;
- if (socketManager.read(fd, (char *) &global_rni_trans_stats[i].count, sizeof(global_rni_trans_stats[i].count))
- != sizeof(global_rni_trans_stats[i].count))
- goto Lmissmatch;
- }
stats_size = MAX_DYN_STATS - NO_DYN_STATS;
for (i = 0; i < stats_size; i++) {
if (socketManager.read(fd, (char *) &global_dyn_stats[i].sum, sizeof(global_dyn_stats[i].sum))
@@ -321,11 +286,8 @@ write_stats_snap()
goto Lerror;
{
- int stats_size =
- MAX_HTTP_TRANS_STATS - NO_HTTP_TRANS_STATS +
- MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS + MAX_DYN_STATS - NO_DYN_STATS;
- int buf_size = sizeof(unsigned int) * 3 +
- stats_size * (sizeof(global_dyn_stats[0].sum) + sizeof(global_dyn_stats[0].count));
+ int stats_size = MAX_HTTP_TRANS_STATS - NO_HTTP_TRANS_STATS + MAX_DYN_STATS - NO_DYN_STATS;
+ int buf_size = sizeof(unsigned int) * 3 + stats_size * (sizeof(global_dyn_stats[0].sum) + sizeof(global_dyn_stats[0].count));
buf = (char *) xmalloc(buf_size);
char *p = buf;
int i = 0;
@@ -344,15 +306,6 @@ write_stats_snap()
p += sizeof(global_http_trans_stats[i].count);
}
STAT_LOCK_RELEASE(&(global_http_trans_stat_lock));
- stats_size = MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS;
- STAT_LOCK_ACQUIRE(&(global_rni_trans_stat_lock));
- for (i = 0; i < stats_size; i++) {
- memcpy(p, (char *) &global_rni_trans_stats[i].sum, sizeof(global_rni_trans_stats[i].sum));
- p += sizeof(global_rni_trans_stats[i].sum);
- memcpy(p, (char *) &global_rni_trans_stats[i].count, sizeof(global_rni_trans_stats[i].count));
- p += sizeof(global_rni_trans_stats[i].count);
- }
- STAT_LOCK_RELEASE(&(global_rni_trans_stat_lock));
stats_size = MAX_DYN_STATS - NO_DYN_STATS;
for (i = 0; i < stats_size; i++) {
// INKqa09981 (Clearing Host Database and DNS Statistics)
@@ -606,7 +559,6 @@ initialize_all_global_stats()
take_rusage_snap(); // fill in _old as well
STAT_LOCK_INIT(&(global_http_trans_stat_lock), "Global Http Stats Lock");
- STAT_LOCK_INIT(&(global_rni_trans_stat_lock), "Global Rni Stats Lock");
for (istat = NO_HTTP_TRANS_STATS; istat < MAX_HTTP_TRANS_STATS; istat++) {
if (!persistent_stat(istat)) {
@@ -614,12 +566,6 @@ initialize_all_global_stats()
}
}
- for (istat = NO_RNI_TRANS_STATS; istat < MAX_RNI_TRANS_STATS; istat++) {
- if (!persistent_stat(istat)) {
- INITIALIZE_GLOBAL_TRANS_STATS(global_rni_trans_stats[istat]);
- }
- }
-
for (istat = NO_DYN_STATS; istat < MAX_DYN_STATS; istat++) {
if (!persistent_stat(istat)) {
i = istat - DYN_STAT_START;
@@ -899,132 +845,10 @@ http_trans_stats_time_useconds_cb(void *
return res;
}
-// rni trans stat functions
-// there is the implicit assumption that the lock has
-// been acquired.
-void *
-rni_trans_stats_int_msecs_to_float_seconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_RNI_TRANS_STAT((long) data, count, sum);
-
- float r;
- if (count == 0) {
- r = 0.0;
- } else {
- r = ((float) sum) / 1000.0;
- }
- *(float *) res = r;
- return res;
-}
-
-void *
-rni_trans_stats_count_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- //*(ink_statval_t *)res = count;
- ink_atomic_swap64((ink_statval_t *) res, count);
- return res;
-}
-
-void *
-rni_trans_stats_sum_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- //*(ink_statval_t *)res = sum;
- ink_atomic_swap64((ink_statval_t *) res, sum);
- return res;
-}
-
-void *
-rni_trans_stats_avg_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- if (count == 0) {
- *(float *) res = 0.0;
- } else {
- *(float *) res = (float) sum / (float) count;
- }
- return res;
-}
-
-void *
-rni_trans_stats_fsum_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- *(float *) res = *(double *) ∑
- return res;
-}
-
-void *
-rni_trans_stats_favg_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- if (count == 0) {
- *(float *) res = 0.0;
- } else {
- *(float *) res = *(double *) &sum / *(double *) &count;
- }
- return res;
-}
-
-void *
-rni_trans_stats_time_seconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float) sum / (float) count;
- r = r / (float) HRTIME_SECOND;
- }
- *(float *) res = r;
- return res;
-}
-
-void *
-rni_trans_stats_time_mseconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float) sum / (float) count;
- r = r / (float) HRTIME_MSECOND;
- }
- *(float *) res = r;
- return res;
-}
-
-void *
-rni_trans_stats_time_useconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_RNI_TRANS_STAT((long) data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float) sum / (float) count;
- r = r / (float) HRTIME_USECOND;
- }
- *(float *) res = r;
- return res;
-}
void
initialize_http_stats()
{
-
///////////////////////
// Transaction Stats //
///////////////////////
Modified: trafficserver/traffic/branches/wccp/proxy/StatSystem.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StatSystem.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StatSystem.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/StatSystem.h Tue Nov 30 01:42:55 2010
@@ -169,37 +169,9 @@ struct HttpTransactionStatsString_t
char *name;
};
-
-//
-// RNI Transaction Stats
-//
-#define _HEADER \
-typedef enum { \
- NO_RNI_TRANS_STATS = 0,
-
-#define _FOOTER \
- MAX_RNI_TRANS_STATS \
-} RniTransactionStat_t;
-
-#define _D(_x) _x,
-
-#include "RniTransStats.h"
-
-#undef _HEADER
-#undef _FOOTER
-#undef _D
-
-struct RniTransactionStatsString_t
-{
- RniTransactionStat_t i;
- const char *name;
-};
-
-
//
// Note: DYN_STAT_START needs to be at least the next
-// power of 2 bigger than the value of MAX_HTTP_TRANS_STATS,
-// MAX_NTTP_TRANS_STATS, MAX_RNI_TRANS_STATS
+// power of 2 bigger than the value of MAX_HTTP_TRANS_STATS
//
#define DYN_STAT_START 2048
#define DYN_STAT_MASK (~(2047UL))
@@ -229,7 +201,6 @@ struct DynamicStatsString_t
};
extern HttpTransactionStatsString_t HttpTransactionStatsStrings[];
-extern RniTransactionStatsString_t RniTransactionStatsStrings[];
extern DynamicStatsString_t DynamicStatsStrings[];
//---------------------------------------------------------------------//
@@ -252,7 +223,9 @@ struct ink_prot_global_stat_t
ink_stat_lock_t access_lock;
ink_statval_t count;
ink_statval_t sum;
- ink_prot_global_stat_t():count(0), sum(0)
+
+ ink_prot_global_stat_t()
+ : count(0), sum(0)
{
ink_mutex_init(&access_lock, "Stats Access Lock");
}
@@ -382,11 +355,6 @@ struct ink_unprot_global_stat_t
ink_assert (!(X & DYN_STAT_MASK)); \
READ_GLOBAL_HTTP_TRANS_STAT(X,C,S); \
}
-#define READ_RNI_TRANS_STAT(X,C,S) \
-{ \
- ink_assert (!(X & DYN_STAT_MASK)); \
- READ_GLOBAL_RNI_TRANS_STAT(X,C,S); \
-}
// set the stat.count to a specific value
#define __SET_TRANS_COUNT(local_stat_struct_, X, V) \
@@ -423,17 +391,6 @@ struct ink_unprot_global_stat_t
STAT_LOCK_RELEASE(&(global_http_trans_stat_lock)); \
}
-#define UPDATE_RNI_TRANS_STATS(local_stat_struct_) \
-{ \
- int i; \
- STAT_LOCK_ACQUIRE(&(global_rni_trans_stat_lock)); \
- for (i=NO_RNI_TRANS_STATS; i<MAX_RNI_TRANS_STATS; i++) { \
- global_rni_trans_stats[i].count += (ink_statval_t)1; \
- global_rni_trans_stats[i].sum += local_stat_struct_[i].value; \
- } \
- STAT_LOCK_RELEASE(&(global_rni_trans_stat_lock)); \
-}
-
#define STAT_LOCK_ACQUIRE(X) (ink_mutex_acquire(X))
#define STAT_LOCK_RELEASE(X) (ink_mutex_release(X))
#define STAT_LOCK_INIT(X,S) (ink_mutex_init(X,S))
@@ -531,11 +488,6 @@ global_dyn_stats[X].sum = 0
C = global_http_trans_stats[X].count; \
S = global_http_trans_stats[X].sum; \
}
-#define READ_GLOBAL_RNI_TRANS_STAT(X,C,S) \
-{ \
- C = global_rni_trans_stats[X].count; \
- S = global_rni_trans_stats[X].sum; \
-}
#define SET_GLOBAL_DYN_COUNT(X,V) \
global_dyn_stats[X].count = V
@@ -586,11 +538,6 @@ S = global_dyn_stats[X].sum;
C = global_http_trans_stats[X].count; \
S = global_http_trans_stats[X].sum; \
}
-#define READ_GLOBAL_RNI_TRANS_STAT(X,C,S) \
-{ \
- C = global_rni_trans_stats[X].count; \
- S = global_rni_trans_stats[X].sum; \
-}
#define SET_GLOBAL_DYN_COUNT(X,V) \
global_dyn_stats[X].count = V
@@ -655,11 +602,6 @@ global_dyn_stats[X].sum = S
C = global_http_trans_stats[X].count; \
S = global_http_trans_stats[X].sum; \
}
-#define READ_GLOBAL_RNI_TRANS_STAT(X,C,S) \
-{ \
- C = global_rni_trans_stats[X].count; \
- S = global_rni_trans_stats[X].sum; \
-}
#define SET_GLOBAL_DYN_COUNT(X,V) \
{ \
STAT_LOCK_ACQUIRE(&(global_dyn_stats[X].access_lock)); \
@@ -703,15 +645,6 @@ void *http_trans_stats_time_seconds_cb(v
void *http_trans_stats_time_mseconds_cb(void *data, void *res);
void *http_trans_stats_time_useconds_cb(void *data, void *res);
-void *rni_trans_stats_count_cb(void *data, void *res);
-inkcoreapi void *rni_trans_stats_sum_cb(void *data, void *res);
-void *rni_trans_stats_avg_cb(void *data, void *res);
-void *rni_trans_stats_fsum_cb(void *data, void *res);
-void *rni_trans_stats_favg_cb(void *data, void *res);
-void *rni_trans_stats_time_seconds_cb(void *data, void *res);
-void *rni_trans_stats_time_mseconds_cb(void *data, void *res);
-void *rni_trans_stats_time_useconds_cb(void *data, void *res);
-
void *dyn_stats_count_cb(void *data, void *res);
inkcoreapi void *dyn_stats_sum_cb(void *data, void *res);
void *dyn_stats_avg_cb(void *data, void *res);
@@ -726,8 +659,6 @@ void *dyn_stats_int_msecs_to_float_secon
//---------------------------------------------------------------------//
extern ink_stat_lock_t global_http_trans_stat_lock;
extern ink_unprot_global_stat_t global_http_trans_stats[MAX_HTTP_TRANS_STATS];
-extern inkcoreapi ink_stat_lock_t global_rni_trans_stat_lock;
-extern inkcoreapi ink_unprot_global_stat_t global_rni_trans_stats[MAX_RNI_TRANS_STATS];
#ifndef USE_LOCKS_FOR_DYN_STATS
extern inkcoreapi ink_unprot_global_stat_t global_dyn_stats[MAX_DYN_STATS - DYN_STAT_START];
#else
Modified: trafficserver/traffic/branches/wccp/proxy/StatSystemV2.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StatSystemV2.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StatSystemV2.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/StatSystemV2.cc Tue Nov 30 01:42:55 2010
@@ -30,12 +30,12 @@
extern class EventProcessor eventProcessor;
std::map<std::string, uint32_t> StatSystemV2::stat_name_to_num;
-std::vector< std::pair<std::string, INK64> > StatSystemV2::global_stats;
+std::vector< std::pair<std::string, int64> > StatSystemV2::global_stats;
uint32_t StatSystemV2::MAX_STATS_ALLOWED = 500000;
uint32_t StatSystemV2::NUM_STATS_ESTIMATE = 5000;
-static INKMutex statsMutex = NULL;
+static TSMutex statsMutex = NULL;
-void StatSystemV2::incrementGlobal(uint32_t stat_num, INK64 stat_val)
+void StatSystemV2::incrementGlobal(uint32_t stat_num, int64 stat_val)
{
if(stat_num >= global_stats.size()) {
Debug("http", "Cannot incrementing stat %u as it is greater than global_stats size", stat_num);
@@ -45,7 +45,7 @@ void StatSystemV2::incrementGlobal(uint3
global_stats[stat_num].second += stat_val;
}
-bool StatSystemV2::increment(uint32_t stat_num, INK64 stat_val)
+bool StatSystemV2::increment(uint32_t stat_num, int64 stat_val)
{
if(stat_num >= MAX_STATS_ALLOWED) {
return false;
@@ -54,17 +54,17 @@ bool StatSystemV2::increment(uint32_t st
EThread *t = this_ethread();
// stat_num starts at 0
if(t->thread_stats.size() < (unsigned int)stat_num+1) {
- if (INKMutexLock(t->thread_stats_mutex) != INK_SUCCESS) {
+ if (TSMutexLock(t->thread_stats_mutex) != INK_SUCCESS) {
return false;
}
t->thread_stats.resize(stat_num+1, 0);
- INKMutexUnlock(t->thread_stats_mutex);
+ TSMutexUnlock(t->thread_stats_mutex);
}
t->thread_stats[stat_num] += stat_val;
return true;
}
-bool StatSystemV2::increment(const char *stat_name, INK64 stat_val)
+bool StatSystemV2::increment(const char *stat_name, int64 stat_val)
{
uint32_t stat_num;
if(!getStatNum(stat_name, stat_num)) {
@@ -73,25 +73,25 @@ bool StatSystemV2::increment(const char
return increment(stat_num, stat_val);
}
-bool StatSystemV2::get(uint32_t stat_num, INK64 *stat_val)
+bool StatSystemV2::get(uint32_t stat_num, int64 *stat_val)
{
// Get stat lock
- if (INKMutexLock(statsMutex) != INK_SUCCESS) {
+ if (TSMutexLock(statsMutex) != INK_SUCCESS) {
return false;
}
if(stat_num >= global_stats.size()) {
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
return false;
}
*stat_val = global_stats[stat_num].second;
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
return true;
}
-bool StatSystemV2::get(const char *stat_name, INK64 *stat_val)
+bool StatSystemV2::get(const char *stat_name, int64 *stat_val)
{
// Get value of stat with name == stat_name
// Returns value from the global stats map. does not walk threads
@@ -102,7 +102,7 @@ bool StatSystemV2::get(const char *stat_
return get(stat_num, stat_val);
}
-bool StatSystemV2::get_current(uint32_t stat_num, INK64 *stat_val)
+bool StatSystemV2::get_current(uint32_t stat_num, int64 *stat_val)
{
// Returns current value of stat. Walks all threads
@@ -110,19 +110,19 @@ bool StatSystemV2::get_current(uint32_t
// Collect stat from all threads
for(int i =0; i < eventProcessor.n_ethreads; i++) {
EThread *t = eventProcessor.all_ethreads[i];
- if (INKMutexLock(t->thread_stats_mutex) != INK_SUCCESS) {
+ if (TSMutexLock(t->thread_stats_mutex) != INK_SUCCESS) {
return false;
}
if(t->thread_stats.size() > stat_num) {
*stat_val += t->thread_stats[stat_num];
}
- INKMutexUnlock(t->thread_stats_mutex);
+ TSMutexUnlock(t->thread_stats_mutex);
}
return true;
}
-bool StatSystemV2::get_current(const char *stat_name, INK64 *stat_val)
+bool StatSystemV2::get_current(const char *stat_name, int64 *stat_val)
{
uint32_t stat_num;
if(!getStatNum(stat_name, stat_num)) {
@@ -138,7 +138,7 @@ bool StatSystemV2::registerStat(const ch
}
// Get stat lock
- if (INKMutexLock(statsMutex) != INK_SUCCESS) {
+ if (TSMutexLock(statsMutex) != INK_SUCCESS) {
*stat_num = MAX_STATS_ALLOWED;
return false;
}
@@ -147,13 +147,13 @@ bool StatSystemV2::registerStat(const ch
std::map<std::string, uint32_t>::const_iterator stat_name_it = stat_name_to_num.find(stat_name);
if(stat_name_it != stat_name_to_num.end()) {
*stat_num = stat_name_it->second;
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
return true;
}
// Check to see if limit for max allowed stats was hit
if(global_stats.size() == MAX_STATS_ALLOWED) {
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
*stat_num = MAX_STATS_ALLOWED;
return false;
}
@@ -162,7 +162,7 @@ bool StatSystemV2::registerStat(const ch
*stat_num = global_stats.size() - 1;
stat_name_to_num[stat_name] = *stat_num;
Debug("http", "Registered stat : %s %u", global_stats[*stat_num].first.c_str(), *stat_num);
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
return true;
}
@@ -182,26 +182,26 @@ void StatSystemV2::setNumStatsEstimate(u
void StatSystemV2::init()
{
if (statsMutex == NULL)
- statsMutex = INKMutexCreate();
+ statsMutex = TSMutexCreate();
- if (INKMutexLock(statsMutex) != INK_SUCCESS) {
+ if (TSMutexLock(statsMutex) != INK_SUCCESS) {
return;
}
// Resize thread_stats vector in each thread to NUM_STATS_ESTIMATE
for(int i =0; i < eventProcessor.n_ethreads; i++) {
EThread *t = eventProcessor.all_ethreads[i];
- INKMutexLock(t->thread_stats_mutex);
+ TSMutexLock(t->thread_stats_mutex);
t->thread_stats.resize(NUM_STATS_ESTIMATE);
- INKMutexUnlock(t->thread_stats_mutex);
+ TSMutexUnlock(t->thread_stats_mutex);
}
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
}
void StatSystemV2::clear()
{
- for(std::vector< std::pair<std::string, INK64> >::iterator it = StatSystemV2::global_stats.begin();
+ for(std::vector< std::pair<std::string, int64> >::iterator it = StatSystemV2::global_stats.begin();
it != StatSystemV2::global_stats.end(); it++) {
it->second = 0;
}
@@ -209,7 +209,7 @@ void StatSystemV2::clear()
void StatSystemV2::collect()
{
- if (INKMutexLock(statsMutex) != INK_SUCCESS) {
+ if (TSMutexLock(statsMutex) != INK_SUCCESS) {
return;
}
@@ -218,9 +218,9 @@ void StatSystemV2::collect()
EThread *t = eventProcessor.all_ethreads[i];
// Lock thread stats to prevent resizing on increment
- INKMutexLock(t->thread_stats_mutex);
+ TSMutexLock(t->thread_stats_mutex);
int j = 0;
- for(std::vector<INK64>::iterator it = t->thread_stats.begin();
+ for(std::vector<int64>::iterator it = t->thread_stats.begin();
it != t->thread_stats.end(); it++, j++) {
if(*it != 0) {
incrementGlobal(j, *it);
@@ -228,31 +228,31 @@ void StatSystemV2::collect()
}
// Release thread stats
- INKMutexUnlock(t->thread_stats_mutex);
+ TSMutexUnlock(t->thread_stats_mutex);
}
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
}
bool StatSystemV2::getStatNum(const char *stat_name, uint32_t &stat_num)
{
// Get stat lock
- if (INKMutexLock(statsMutex) != INK_SUCCESS) {
+ if (TSMutexLock(statsMutex) != INK_SUCCESS) {
return false;
}
// Get stat num and release lock
std::map<std::string, uint32_t>::const_iterator stat_name_it = stat_name_to_num.find(stat_name);
if(stat_name_it == stat_name_to_num.end()) {
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
return false;
}
stat_num = stat_name_it->second;
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
return true;
}
-static INKThread statsCommandThread;
+static TSThread statsCommandThread;
static const int MAX_STAT_NAME_LENGTH = 512;
int StatCollectorContinuation::mainEvent(int event, Event * e)
{
@@ -288,21 +288,21 @@ void StatCollectorContinuation::print_st
"-----------------------------------------------------------------------------\n";
printbuf << "TIME " << _startTime <<"\n";
- if (INKMutexLock(statsMutex) == INK_SUCCESS) {
- for(std::vector< std::pair<std::string, INK64> >::const_iterator it = StatSystemV2::global_stats.begin();
+ if (TSMutexLock(statsMutex) == INK_SUCCESS) {
+ for(std::vector< std::pair<std::string, int64> >::const_iterator it = StatSystemV2::global_stats.begin();
it != StatSystemV2::global_stats.end(); it++) {
if(it->second != 0 ) {
printbuf << "STAT " << it->first << " " << it->second << "\n";
}
}
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
}
printbuf << "END\n";
}
void StatCollectorContinuation::print_stat(const char *stat_name, std::stringstream &printbuf, bool current) {
// Print only non zero stats
- INK64 stat_val = 0;
+ int64 stat_val = 0;
bool stat_get_status;
if(current) {
stat_get_status = StatSystemV2::get_current(stat_name, &stat_val);
@@ -329,19 +329,19 @@ void StatCollectorContinuation::print_st
void
StatCollectorContinuation::get_stats_with_prefix(const std::string &stat_prefix, std::vector<std::string> &stat_names)
{
- if (INKMutexLock(statsMutex) != INK_SUCCESS) {
+ if (TSMutexLock(statsMutex) != INK_SUCCESS) {
return;
}
// Get all stats which start with stat_prefix
- for(std::vector< std::pair<std::string, INK64> >::const_iterator it = StatSystemV2::global_stats.begin();
+ for(std::vector< std::pair<std::string, int64> >::const_iterator it = StatSystemV2::global_stats.begin();
it != StatSystemV2::global_stats.end(); it++) {
size_t found = it->first.find(stat_prefix);
if(found == 0) {
stat_names.push_back(it->first);
}
}
- INKMutexUnlock(statsMutex);
+ TSMutexUnlock(statsMutex);
}
int
@@ -542,21 +542,21 @@ void* StatCollectorContinuation::command
return 0;
}
- INKThreadCreate(commandLoop, &client_sock);
+ TSThreadCreate(commandLoop, &client_sock);
}
}
int StatCollectorContinuation::_statCommandPort = 8091;
time_t StatCollectorContinuation::_startTime = time(NULL);
int StatCollectorContinuation::_readTimeout = 600;
-long StatCollectorContinuation::_readTimeoutUSecs = 0;
+int StatCollectorContinuation::_readTimeoutUSecs = 0;
void StatCollectorContinuation::setStatCommandPort(int port)
{
_statCommandPort = port;
}
-void StatCollectorContinuation::setReadTimeout(int secs, long usecs)
+void StatCollectorContinuation::setReadTimeout(int secs, int usecs)
{
_readTimeout = secs;
_readTimeoutUSecs = usecs;
@@ -566,5 +566,5 @@ StatCollectorContinuation::StatCollector
{
Debug("http", "YTS start time : %lld", (long long) StatCollectorContinuation::_startTime);
SET_HANDLER(&StatCollectorContinuation::mainEvent);
- statsCommandThread = INKThreadCreate(commandListen, &_statCommandPort);
+ statsCommandThread = TSThreadCreate(commandListen, &_statCommandPort);
}
Modified: trafficserver/traffic/branches/wccp/proxy/StatSystemV2.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StatSystemV2.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StatSystemV2.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/StatSystemV2.h Tue Nov 30 01:42:55 2010
@@ -43,12 +43,12 @@ class Event;
class StatSystemV2
{
public:
- static bool increment(uint32_t stat_num, INK64 stat_val = 1);
- static bool increment(const char *stat_name, INK64 stat_val = 1);
- static bool get(uint32_t stat_num, INK64 *stat_val);
- static bool get(const char *stat_name, INK64 *stat_val);
- static bool get_current(uint32_t stat_num, INK64 *stat_val);
- static bool get_current(const char *stat_name, INK64 *stat_val);
+ static bool increment(uint32_t stat_num, int64 stat_val = 1);
+ static bool increment(const char *stat_name, int64 stat_val = 1);
+ static bool get(uint32_t stat_num, int64 *stat_val);
+ static bool get(const char *stat_name, int64 *stat_val);
+ static bool get_current(uint32_t stat_num, int64 *stat_val);
+ static bool get_current(const char *stat_name, int64 *stat_val);
static bool registerStat(const char *stat_name, uint32_t *stat_num);
static void setMaxStatsAllowed(uint32_t max_stats_allowed);
@@ -58,13 +58,13 @@ public:
private:
// These must be called after acquiring a lock
// Since these are private, only methods in StatCollectorContinuation can call them
- static void incrementGlobal(uint32_t stat_num, INK64 stat_val = 1);
+ static void incrementGlobal(uint32_t stat_num, int64 stat_val = 1);
static void clear();
static void collect();
static bool getStatNum(const char *stat_name, uint32_t &stat_num);
static std::map<std::string, uint32_t> stat_name_to_num;
- static std::vector< std::pair<std::string, INK64> > global_stats;
+ static std::vector< std::pair<std::string, int64> > global_stats;
static uint32_t MAX_STATS_ALLOWED;
static uint32_t NUM_STATS_ESTIMATE;
@@ -76,7 +76,7 @@ class StatCollectorContinuation : public
public:
StatCollectorContinuation();
static void setStatCommandPort(int port);
- static void setReadTimeout(int secs = 1, long usecs = 0);
+ static void setReadTimeout(int secs = 1, int usecs = 0);
private:
int mainEvent(int event, Event *e);
@@ -93,7 +93,7 @@ private:
static int _statCommandPort;
static time_t _startTime;
static int _readTimeout;
- static long _readTimeoutUSecs;
+ static int _readTimeoutUSecs;
};
#endif // STAT_SYSTEM_V2
Modified: trafficserver/traffic/branches/wccp/proxy/StateEventLogger.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StateEventLogger.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StateEventLogger.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/StateEventLogger.cc Tue Nov 30 01:42:55 2010
@@ -253,13 +253,8 @@ test_thread(void *i)
for (j = 0; j < calls; j++) {
(*sel) (TestStateEvent(pi, j));
}
-#ifdef __alpha
-#define LL_FMT "%ld"
-#else
-#define LL_FMT "%lld"
-#endif
finish = ink_get_hrtime();
- printf("StateEventLogger cost = " LL_FMT "ns\n", (finish - start) / (N_THREADS * calls));
+ printf("StateEventLogger cost = %lldns\n", (finish - start) / (N_THREADS * calls));
return NULL;
}
Modified: trafficserver/traffic/branches/wccp/proxy/StateEventLogger.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StateEventLogger.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StateEventLogger.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/StateEventLogger.h Tue Nov 30 01:42:55 2010
@@ -72,23 +72,6 @@
#include "ink_platform.h"
#include <time.h>
-#ifdef __alpha
-// these macros convert to sparc byte ordering from Alpha form.
-#define my_byteorder_int(to,from) \
- to = (((unsigned int)from) >> 16) | (from << 16)
-#define my_byteorder_hrtime(to,from) \
- to = ((from & 0xffff) << 48) | \
- ((from & 0xffff0000) << 16) | \
- ((from & 0xffff00000000) >> 16) | \
- ((from & 0xffff000000000000) >> 48)
-
-#else
-#define my_byteorder_int(to,from) \
- to=from
-#define my_byteorder_hrtime(to,from) \
- to = from
-
-#endif
//#define USE_RINGBUF
// This code is too complex for the minimal I/O system call reduction
@@ -159,18 +142,18 @@ public:
virtual void marshal(char *buf) const
{
ink_hrtime t;
- my_byteorder_hrtime(t, d_ts);
- memcpy(buf, &t, sizeof(t));
- buf += sizeof(t);
+ t = d_ts;
+ memcpy(buf, &t, sizeof(t));
+ buf += sizeof(t);
int x;
- my_byteorder_int(x, d_param1);
- memcpy(buf, &x, sizeof(x));
- buf += sizeof(x);
+ x = d_param1;
+ memcpy(buf, &x, sizeof(x));
+ buf += sizeof(x);
- my_byteorder_int(x, d_param2);
- memcpy(buf, &x, sizeof(x));
+ x = d_param2;
+ memcpy(buf, &x, sizeof(x));
};
#endif
virtual int size() const
Modified: trafficserver/traffic/branches/wccp/proxy/Stuffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/Stuffer.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/Stuffer.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/Stuffer.cc Tue Nov 30 01:42:55 2010
@@ -50,7 +50,6 @@ connAllowed(uint32 ip)
struct StufferAccepter:Continuation
{
-
StufferAccepter():Continuation(NULL)
{
SET_HANDLER(&StufferAccepter::mainEvent);
@@ -84,20 +83,15 @@ readIPs(ParentRecord * parentRec, uint32
return 0;
int n = 0;
-
pRecord *pr = parentRec->parents;
int n_parents = parentRec->num_parents;
for (int i = 0; i < n_parents && n < max; i++) {
-
-#if !defined(VxWorks)
ink_gethostbyname_r_data data;
+
struct hostent *ent = ink_gethostbyname_r(pr[i].hostname, &data);
if (ent)
ip_arr[n++] = *(uint32 *) ent->h_addr_list[0];
-#else
- ip_arr[n++] = inet_addr(pr[i].hostname);
-#endif
}
return n;
@@ -147,17 +141,9 @@ StufferInitialize(void)
int stuffer_port;
ReadConfigInteger(stuffer_port, proxy_config_stuffer_port);
-
Debug("stuffer", "stuffer initialized (port = %d%s)", stuffer_port, stuffer_port ? "" : " accept disabled");
-
buildParentIPTable();
-#ifdef VxWorks
- extern void *ts_udp_receiver(void *);
- Debug("stuffer", "starting udp listener");
- ink_thread_create(ts_udp_receiver, (void *) stuffer_port);
-#endif
-
if (stuffer_port > 0)
netProcessor.main_accept(NEW(new StufferAccepter), NO_FD, stuffer_port);
}
@@ -183,6 +169,7 @@ inline int
StufferCacheWriter::addData(int max)
{
int nwritten = buf->write(stuffer->reader, max);
+
nadded += nwritten;
return nwritten;
}
@@ -379,8 +366,7 @@ StufferCacheWriter::initCacheLookupConfi
HttpConfigParams *http_config_params = HttpConfig::acquire();
cache_lookup_config.cache_global_user_agent_header = http_config_params->global_user_agent_header ? true : false;
- cache_lookup_config.cache_enable_default_vary_headers =
- http_config_params->cache_enable_default_vary_headers ? true : false;
+ cache_lookup_config.cache_enable_default_vary_headers = http_config_params->cache_enable_default_vary_headers ? true : false;
cache_lookup_config.cache_vary_default_text = http_config_params->cache_vary_default_text;
cache_lookup_config.cache_vary_default_images = http_config_params->cache_vary_default_images;
cache_lookup_config.cache_vary_default_other = http_config_params->cache_vary_default_other;
@@ -435,7 +421,6 @@ responseIsNewer(HTTPHdr * old_resp, HTTP
int
StufferCacheWriter::mainEvent(int event, void *data)
{
-
switch (event) {
case VC_EVENT_READ_COMPLETE:{
Modified: trafficserver/traffic/branches/wccp/proxy/StufferUdpReceiver.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/StufferUdpReceiver.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/StufferUdpReceiver.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/StufferUdpReceiver.cc Tue Nov 30 01:42:55 2010
@@ -67,7 +67,7 @@ static int number_of_packets_dropped = 0
static int number_of_connections_to_ts = 0;
static int number_of_timeouts = 0;
-/*this functions should be a signal handler on OSs other than VxWorks*/
+/* TODO: this functions should be a signal handler ... */
int
stufferUdpStatShow()
{
Modified: trafficserver/traffic/branches/wccp/proxy/Transform.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/Transform.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/Transform.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/Transform.cc Tue Nov 30 01:42:55 2010
@@ -59,7 +59,7 @@
*/
-#ifndef INK_NO_TRANSFORM
+#ifndef TS_NO_TRANSFORM
#include "ProxyConfig.h"
#include "P_Net.h"
@@ -115,8 +115,7 @@ TransformProcessor::null_transform(Proxy
-------------------------------------------------------------------------*/
INKVConnInternal *
-TransformProcessor::range_transform(ProxyMutex *mut,
- MIMEField *range_field, HTTPInfo *cache_obj, HTTPHdr *transform_resp, bool & b)
+TransformProcessor::range_transform(ProxyMutex *mut, MIMEField *range_field, HTTPInfo *cache_obj, HTTPHdr *transform_resp, bool & b)
{
RangeTransform *range_transform = NEW(new RangeTransform(mut, range_field, cache_obj, transform_resp));
@@ -305,7 +304,7 @@ TransformTerminus::handle_event(int even
// the user back instead of the read_vio cont (which won't
// exist).
if (m_tvc->m_closed == 0) {
- if (m_closed == INK_VC_CLOSE_ABORT) {
+ if (m_closed == TS_VC_CLOSE_ABORT) {
if (m_read_vio.op == VIO::NONE) {
if (!m_called_user) {
m_called_user = 1;
@@ -394,9 +393,9 @@ TransformTerminus::do_io_close(int error
if (error != -1) {
lerrno = error;
- m_closed = INK_VC_CLOSE_ABORT;
+ m_closed = TS_VC_CLOSE_ABORT;
} else {
- m_closed = INK_VC_CLOSE_NORMAL;
+ m_closed = TS_VC_CLOSE_NORMAL;
}
m_read_vio.op = VIO::NONE;
@@ -527,9 +526,9 @@ TransformVConnection::do_io_close(int er
Debug("transform", "TransformVConnection do_io_close: %d [0x%lx]", error, (long) this);
if (error != -1) {
- m_closed = INK_VC_CLOSE_ABORT;
+ m_closed = TS_VC_CLOSE_ABORT;
} else {
- m_closed = INK_VC_CLOSE_NORMAL;
+ m_closed = TS_VC_CLOSE_NORMAL;
}
m_transform->do_io_close(error);
@@ -568,15 +567,6 @@ TransformControl::TransformControl()
SET_HANDLER(&TransformControl::handle_event);
m_hooks.append(transformProcessor.null_transform(new_ProxyMutex()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
}
/*-------------------------------------------------------------------------
@@ -591,8 +581,8 @@ TransformControl::handle_event(int event
char *s, *e;
ink_assert(m_tvc == NULL);
- if (http_global_hooks && http_global_hooks->get(INK_HTTP_RESPONSE_TRANSFORM_HOOK)) {
- m_tvc = transformProcessor.open(this, http_global_hooks->get(INK_HTTP_RESPONSE_TRANSFORM_HOOK));
+ if (http_global_hooks && http_global_hooks->get(TS_HTTP_RESPONSE_TRANSFORM_HOOK)) {
+ m_tvc = transformProcessor.open(this, http_global_hooks->get(TS_HTTP_RESPONSE_TRANSFORM_HOOK));
} else {
m_tvc = transformProcessor.open(this, m_hooks.get());
}
@@ -642,7 +632,7 @@ TransformControl::handle_event(int event
-------------------------------------------------------------------------*/
NullTransform::NullTransform(ProxyMutex *_mutex)
-:INKVConnInternal(NULL, _mutex), m_output_buf(NULL), m_output_reader(NULL), m_output_vio(NULL)
+ : INKVConnInternal(NULL, _mutex), m_output_buf(NULL), m_output_reader(NULL), m_output_vio(NULL)
{
SET_HANDLER(&NullTransform::handle_event);
@@ -770,6 +760,7 @@ NullTransform::handle_event(int event, v
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
+#ifdef TS_HAS_TESTS
void
TransformTest::run()
{
@@ -777,6 +768,7 @@ TransformTest::run()
eventProcessor.schedule_imm(NEW(new TransformControl()), ET_NET);
}
}
+#endif
@@ -791,15 +783,13 @@ TransformTest::run()
inline static int
num_chars_for_int(int i)
{
- int k;
+ int k = 1;
if (i < 0)
return 0;
- k = 1;
-
while ((i /= 10) != 0)
- k++;
+ ++k;
return k;
}
@@ -808,18 +798,17 @@ num_chars_for_int(int i)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-RangeTransform::RangeTransform(ProxyMutex *mut, MIMEField *range_field,
- HTTPInfo *cache_obj, HTTPHdr *transform_resp)
-:INKVConnInternal(NULL, mut),
-m_output_buf(NULL),
-m_output_reader(NULL),
-m_range_field(range_field),
-m_transform_resp(transform_resp),
-m_output_vio(NULL),
-m_unsatisfiable_range(true),
-m_not_handle_range(false),
-m_num_range_fields(0),
-m_current_range(0), m_content_type(NULL), m_content_type_len(0), m_ranges(NULL), m_output_cl(0), m_done(0)
+RangeTransform::RangeTransform(ProxyMutex *mut, MIMEField *range_field, HTTPInfo *cache_obj, HTTPHdr *transform_resp)
+ : INKVConnInternal(NULL, mut),
+ m_output_buf(NULL),
+ m_output_reader(NULL),
+ m_range_field(range_field),
+ m_transform_resp(transform_resp),
+ m_output_vio(NULL),
+ m_unsatisfiable_range(true),
+ m_not_handle_range(false),
+ m_num_range_fields(0),
+ m_current_range(0), m_content_type(NULL), m_content_type_len(0), m_ranges(NULL), m_output_cl(0), m_done(0)
{
SET_HANDLER(&RangeTransform::handle_event);
@@ -1253,5 +1242,4 @@ RangeTransform::calculate_output_cl()
Debug("transform_range", "Pre-calculated Content-Length for Range response is %d", m_output_cl);
}
-#endif //INK_NO_TRANSFORM
-
+#endif // TS_NO_TRANSFORM
Modified: trafficserver/traffic/branches/wccp/proxy/Transform.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/Transform.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/Transform.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/Transform.h Tue Nov 30 01:42:55 2010
@@ -39,21 +39,20 @@ public:
void start();
public:
- VConnection * open(Continuation * cont, APIHook * hooks);
-
+ VConnection * open(Continuation * cont, APIHook * hooks);
INKVConnInternal *null_transform(ProxyMutex * mutex);
-
- INKVConnInternal *range_transform(ProxyMutex * mutex,
- MIMEField * range_field, HTTPInfo * cache_obj, HTTPHdr * transform_resp, bool & b);
-
+ INKVConnInternal *range_transform(ProxyMutex * mutex, MIMEField * range_field, HTTPInfo * cache_obj,
+ HTTPHdr * transform_resp, bool & b);
};
+#ifdef TS_HAS_TESTS
class TransformTest
{
public:
static void run();
};
+#endif
extern TransformProcessor transformProcessor;
Modified: trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.cc Tue Nov 30 01:42:55 2010
@@ -36,13 +36,13 @@ FILE *fp;
void
UDPClientTestInit()
{
- INKCont cont;
+ TSCont cont;
unsigned long ip;
- INKMutex readMutexp;
+ TSMutex readMutexp;
ip = inet_addr("209.131.48.79");
- readMutexp = INKMutexCreate();
- cont = INKContCreate(&UDPClient_handle_callbacks, readMutexp);
+ readMutexp = TSMutexCreate();
+ cont = TSContCreate(&UDPClient_handle_callbacks, readMutexp);
fp = fopen("UDPAPI.dbg", "a+");
fprintf(fp, "UDPClient Init called\n");
fclose(fp);
@@ -51,16 +51,16 @@ UDPClientTestInit()
}
int
-UDPClient_handle_callbacks(INKCont cont, INKEvent event, void *e)
+UDPClient_handle_callbacks(TSCont cont, TSEvent event, void *e)
{
INKUDPacketQueue packetQueue;
INKUDPPacket packet;
- INKIOBufferBlock recvBuffBlock;
+ TSIOBufferBlock recvBuffBlock;
unsigned int destIp = inet_addr("209.131.48.79");
int destPort = 1813;
INKUDPConn UDPConn;
- INKIOBufferReader reader;
- INKIOBuffer iobuffer;
+ TSIOBufferReader reader;
+ TSIOBuffer iobuffer;
const char *buf;
int avail, total_len = 0;
char recvBuff[1024];
@@ -68,7 +68,7 @@ UDPClient_handle_callbacks(INKCont cont,
switch (event) {
- case INK_NET_EVENT_DATAGRAM_OPEN:
+ case TS_NET_EVENT_DATAGRAM_OPEN:
UDPConn = (INKUDPConn) e;
INKUDPRecvFrom(cont, UDPConn);
INKUDPSendTo(cont, UDPConn, destIp, destPort, sendBuff, strlen(sendBuff));
@@ -76,17 +76,17 @@ UDPClient_handle_callbacks(INKCont cont,
break;
- case INK_NET_EVENT_DATAGRAM_READ_READY:
+ case TS_NET_EVENT_DATAGRAM_READ_READY:
fprintf(fp, "read ready called\n.");
packetQueue = (INKUDPacketQueue) e;
while ((packet = INKUDPPacketGet(packetQueue)) != NULL) {
recvBuffBlock = INKUDPPacketBufferBlockGet(packet);
- iobuffer = INKIOBufferCreate();
- reader = INKIOBufferReaderAlloc(iobuffer);
- INKIOBufferAppend(iobuffer, recvBuffBlock);
- buf = INKIOBufferBlockReadStart(recvBuffBlock, reader, &avail);
+ iobuffer = TSIOBufferCreate();
+ reader = TSIOBufferReaderAlloc(iobuffer);
+ TSIOBufferAppend(iobuffer, recvBuffBlock);
+ buf = TSIOBufferBlockReadStart(recvBuffBlock, reader, &avail);
if (avail > 0) {
@@ -95,22 +95,22 @@ UDPClient_handle_callbacks(INKCont cont,
memcpy((char *) &recvBuff + total_len, buf, avail);
- INKIOBufferReaderConsume(reader, avail);
+ TSIOBufferReaderConsume(reader, avail);
total_len += avail;
}
/* INKqa10255: we'd free the memory - jinsheng */
INKUDPPacketDestroy(packet);
- INKIOBufferReaderFree(reader);
- INKIOBufferDestroy(iobuffer);
+ TSIOBufferReaderFree(reader);
+ TSIOBufferDestroy(iobuffer);
}
break;
- case INK_NET_EVENT_DATAGRAM_WRITE_COMPLETE:
+ case TS_NET_EVENT_DATAGRAM_WRITE_COMPLETE:
break;
}
fclose(fp);
- return INK_EVENT_CONTINUE;
+ return TS_EVENT_CONTINUE;
}
Modified: trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/UDPAPIClientTest.h Tue Nov 30 01:42:55 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "api/include/ts_private.h"
+#include "api/include/experimental.h"
void UDPClientTestInit();
int UDPClient_handle_callbacks(INKCont cont, INKEvent event, void *e);
Modified: trafficserver/traffic/branches/wccp/proxy/UDPAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/UDPAPITest.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/UDPAPITest.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/UDPAPITest.cc Tue Nov 30 01:42:55 2010
@@ -35,13 +35,13 @@ FILE *fp;
void
UDPTestInit()
{
- INKCont cont;
- INKMutex readMutexp;
+ TSCont cont;
+ TSMutex readMutexp;
unsigned long ip;
ip = inet_addr("209.131.48.79");
- readMutexp = INKMutexCreate();
- cont = INKContCreate(&handle_callbacks, readMutexp);
+ readMutexp = TSMutexCreate();
+ cont = TSContCreate(&handle_callbacks, readMutexp);
// INKUDPBind(cont, INADDR_ANY,1813);
INKUDPBind(cont, ip, 1813);
}
@@ -57,13 +57,13 @@ printN(const char *start, int length)
}
int
-handle_callbacks(INKCont cont, INKEvent event, void *e)
+handle_callbacks(TSCont cont, TSEvent event, void *e)
{
INKUDPacketQueue packetQueue;
INKUDPPacket packet;
- INKIOBufferBlock recvBuffBlock;
- INKIOBufferReader reader;
- INKIOBuffer iobuffer;
+ TSIOBufferBlock recvBuffBlock;
+ TSIOBufferReader reader;
+ TSIOBuffer iobuffer;
INKUDPConn UDPConn;
unsigned int ip;
int port;
@@ -79,30 +79,30 @@ handle_callbacks(INKCont cont, INKEvent
switch (event) {
- case INK_NET_EVENT_DATAGRAM_OPEN:
+ case TS_NET_EVENT_DATAGRAM_OPEN:
fprintf(fp, "open event called\n");
UDPConn = (INKUDPConn) e;
INKUDPRecvFrom(cont, UDPConn);
break;
- case INK_NET_EVENT_DATAGRAM_READ_READY:
+ case TS_NET_EVENT_DATAGRAM_READ_READY:
fprintf(fp, "read ready event called\n");
packetQueue = (INKUDPacketQueue) e;
total_len = 0;
while ((packet = INKUDPPacketGet(packetQueue)) != NULL) {
recvBuffBlock = INKUDPPacketBufferBlockGet(packet);
- iobuffer = INKIOBufferCreate();
- reader = INKIOBufferReaderAlloc(iobuffer);
- INKIOBufferAppend(iobuffer, recvBuffBlock);
- buf = INKIOBufferBlockReadStart(recvBuffBlock, reader, &avail);
+ iobuffer = TSIOBufferCreate();
+ reader = TSIOBufferReaderAlloc(iobuffer);
+ TSIOBufferAppend(iobuffer, recvBuffBlock);
+ buf = TSIOBufferBlockReadStart(recvBuffBlock, reader, &avail);
if (avail > 0) {
fprintf(fp, "Received message is\n");
printN(buf, avail);
fprintf(fp, "message length = %i\n", avail);
memcpy((char *) &recv_buffer + total_len, buf, avail);
- INKIOBufferReaderConsume(reader, avail);
+ TSIOBufferReaderConsume(reader, avail);
total_len += avail;
}
@@ -116,16 +116,16 @@ handle_callbacks(INKCont cont, INKEvent
/* INKqa10255: we'd free the memory - jinsheng */
INKUDPPacketDestroy(packet);
- INKIOBufferReaderFree(reader);
- INKIOBufferDestroy(iobuffer);
+ TSIOBufferReaderFree(reader);
+ TSIOBufferDestroy(iobuffer);
}
break;
- case INK_NET_EVENT_DATAGRAM_WRITE_COMPLETE:
+ case TS_NET_EVENT_DATAGRAM_WRITE_COMPLETE:
break;
}
fclose(fp);
- return INK_EVENT_CONTINUE;
+ return TS_EVENT_CONTINUE;
}
Modified: trafficserver/traffic/branches/wccp/proxy/UDPAPITest.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/UDPAPITest.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/UDPAPITest.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/UDPAPITest.h Tue Nov 30 01:42:55 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "api/include/ts_private.h"
+#include "api/include/experimental.h"
void UDPTestInit();
int handle_callbacks(INKCont cont, INKEvent event, void *e);
Propchange: trafficserver/traffic/branches/wccp/proxy/api/ts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 30 01:42:55 2010
@@ -0,0 +1 @@
+ts.h
Modified: trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIHughes.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIHughes.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIHughes.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIHughes.h Tue Nov 30 01:42:55 2010
@@ -29,12 +29,12 @@ typedef struct
{
/*request header */
- INKMBuffer request_buf;
- INKMLoc request_loc;
+ TSMBuffer request_buf;
+ TSMLoc request_loc;
/*response header */
- INKMBuffer response_buf;
- INKMLoc response_loc;
+ TSMBuffer response_buf;
+ TSMLoc response_loc;
/*child ip addr in network order */
unsigned int client_ip;
@@ -46,8 +46,8 @@ typedef struct
int present_in_cache;
/* Reader for the buffer which contains the prefetched object */
- INKIOBuffer object_buf;
- INKIOBufferReader object_buf_reader;
+ TSIOBuffer object_buf;
+ TSIOBufferReader object_buf_reader;
/* This specifies if we need to invoke the OBJECT_HOOK and whether we
need to send the buffer to child as well
@@ -59,51 +59,51 @@ typedef struct
unsigned int url_proto;
unsigned int url_response_proto;
-} INKPrefetchInfo;
+} TSPrefetchInfo;
-typedef int (*INKPrefetchHook) (int hook, INKPrefetchInfo * prefetch_info);
+typedef int (*TSPrefetchHook) (int hook, TSPrefetchInfo * prefetch_info);
enum
-{ /* return type for INKPrefetchHook */
- INK_PREFETCH_CONTINUE,
- INK_PREFETCH_DISCONTINUE
+{ /* return type for TSPrefetchHook */
+ TS_PREFETCH_CONTINUE,
+ TS_PREFETCH_DISCONTINUE
};
enum
{
- INK_PREFETCH_PROTO_TCP = 1,
- INK_PREFETCH_PROTO_UDP
+ TS_PREFETCH_PROTO_TCP = 1,
+ TS_PREFETCH_PROTO_UDP
};
enum
{
- INK_PREFETCH_OBJ_BUF_NOT_NEEDED = 0,
- INK_PREFETCH_OBJ_BUF_NEEDED, /* The user wants the buffer but does not
+ TS_PREFETCH_OBJ_BUF_NOT_NEEDED = 0,
+ TS_PREFETCH_OBJ_BUF_NEEDED, /* The user wants the buffer but does not
want it to be transmitted to the child */
- INK_PREFETCH_OBJ_BUF_NEEDED_N_TRANSMITTED /* The object should
+ TS_PREFETCH_OBJ_BUF_NEEDED_N_TRANSMITTED /* The object should
be transmitted as well */
};
enum
{ /* prefetch hooks */
- INK_PREFETCH_PRE_PARSE_HOOK,
+ TS_PREFETCH_PRE_PARSE_HOOK,
/* This hook is invoked just before we begin to parse a document
request and response headers are available.
- Return value: INK_PREFETCH_CONTINUE :continue parsing
- INK_PREFETCH_DISCONTIUE: don't bother parser
+ Return value: TS_PREFETCH_CONTINUE :continue parsing
+ TS_PREFETCH_DISCONTIUE: don't bother parser
*/
- INK_PREFETCH_EMBEDDED_URL_HOOK,
+ TS_PREFETCH_EMBEDDED_URL_HOOK,
/* This hook is invoked when a URL is extracted.
url_proto and url_response_proto contain the default protocols used
for sending the url and actual url object respectively to the child.
The hook can change thes to one of the 3 methods mentioned above.
- Return value: INK_PREFETCH_CONTINUE : prefetch this url.
- INK_PREFETCH_DISCONTIUE: don't bother prefetching this
+ Return value: TS_PREFETCH_CONTINUE : prefetch this url.
+ TS_PREFETCH_DISCONTIUE: don't bother prefetching this
url
*/
- INK_PREFETCH_EMBEDDED_OBJECT_HOOK
+ TS_PREFETCH_EMBEDDED_OBJECT_HOOK
/* This hook is invoked when the user wants to have access to the buffer
of the embedded object we prefetched. We pass in the buffer reader.
The reader contains the data in the format specified in the Prefetch
@@ -111,16 +111,16 @@ enum
It is the users responsibility to free the reader.
The only valid field in the PrefetchInfo structure object_buf_reader.
embedded_url, object_buf, object_buf_reader, and object_buf_status are
- set in INKPrefetchInfo passed as arguments
+ set in TSPrefetchInfo passed as arguments
*/
/* more hooks */
};
-inkapi int INKPrefetchStart();
+tsapi int TSPrefetchStart();
/* This starts the Prefetch engine in Traffic Server
Return value 0 indicates success.*/
-inkapi int INKPrefetchHookSet(int hook_no, INKPrefetchHook hook_fn);
+tsapi int TSPrefetchHookSet(int hook_no, TSPrefetchHook hook_fn);
/* Registers a hook for the given hook_no.
A hook is already present, it is replace by hook_fn
return value 0 indicates success */
Modified: trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIPrivateIOCore.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIPrivateIOCore.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIPrivateIOCore.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/api/ts/InkAPIPrivateIOCore.h Tue Nov 30 01:42:55 2010
@@ -50,9 +50,9 @@ class INKContInternal:public DummyVConne
{
public:
INKContInternal();
- INKContInternal(INKEventFunc funcp, INKMutex mutexp);
+ INKContInternal(TSEventFunc funcp, TSMutex mutexp);
- void init(INKEventFunc funcp, INKMutex mutexp);
+ void init(TSEventFunc funcp, TSMutex mutexp);
virtual void destroy();
void handle_event_count(int event);
@@ -63,13 +63,13 @@ public:
// We should give these appropriate names, like contName and isContStatsEnabled() or some such.
void setName(const char *name);
const char *getName();
- void statCallsMade(INKHttpHookID hook_id);
+ void statCallsMade(TSHttpHookID hook_id);
bool isStatsEnabled() { return stats_enabled; }
#endif
public:
void *mdata;
- INKEventFunc m_event_func;
+ TSEventFunc m_event_func;
volatile int m_event_count;
volatile int m_closed;
int m_deletable;
@@ -88,12 +88,12 @@ public:
};
-enum INKApiDataType
+enum TSApiDataType
{
- INK_API_DATA_READ_VIO = VCONNECTION_API_DATA_BASE,
- INK_API_DATA_WRITE_VIO,
- INK_API_DATA_OUTPUT_VC,
- INK_API_DATA_CLOSED
+ TS_API_DATA_READ_VIO = VCONNECTION_API_DATA_BASE,
+ TS_API_DATA_WRITE_VIO,
+ TS_API_DATA_OUTPUT_VC,
+ TS_API_DATA_CLOSED
};
@@ -101,9 +101,9 @@ class INKVConnInternal:public INKContInt
{
public:
INKVConnInternal();
- INKVConnInternal(INKEventFunc funcp, INKMutex mutexp);
+ INKVConnInternal(TSEventFunc funcp, TSMutex mutexp);
- void init(INKEventFunc funcp, INKMutex mutexp);
+ void init(TSEventFunc funcp, TSMutex mutexp);
virtual void destroy();
int handle_event(int event, void *edata);
@@ -157,8 +157,8 @@ public:
#define LOCK_MONGO_MUTEX
#define UNLOCK_MONGO_MUTEX
#define MUX_WARNING(p) \
-INKDebug ("sdk","(SDK) null mutex detected in critical region (mutex created)"); \
-INKDebug ("sdk","(SDK) please create continuation [%p] with mutex", (p));
+TSDebug ("sdk","(SDK) null mutex detected in critical region (mutex created)"); \
+TSDebug ("sdk","(SDK) please create continuation [%p] with mutex", (p));
#else
static ink_mutex big_mux;
@@ -173,7 +173,7 @@ static ink_mutex big_mux;
if (( (INKContInternal*)_c)->mutex == NULL) { \
( (INKContInternal*)_c)->mutex = new_ProxyMutex(); \
UNLOCK_MONGO_MUTEX; \
- MUX_WARNING(_c); \
+ MUX_WARNING(_c); \
MUTEX_SET_AND_TAKE_LOCK(ml, ((INKContInternal*)_c)->mutex, this_ethread()); \
} else { \
UNLOCK_MONGO_MUTEX; \
@@ -185,9 +185,9 @@ extern "C"
{
#endif /* __cplusplus */
- INKReturnCode sdk_sanity_check_mutex(INKMutex);
- INKReturnCode sdk_sanity_check_hostlookup_structure(INKHostLookupResult);
- INKReturnCode sdk_sanity_check_iocore_structure(void *);
+ TSReturnCode sdk_sanity_check_mutex(TSMutex);
+ TSReturnCode sdk_sanity_check_hostlookup_structure(TSHostLookupResult);
+ TSReturnCode sdk_sanity_check_iocore_structure(void *);
/* ----------------------------------------------------------------------
*
@@ -195,16 +195,14 @@ extern "C"
*
* ---------------------------------------------------------------------- */
- inkapi INKMutex INKMutexCreateInternal(void);
- inkapi int INKMutexCheck(INKMutex mutex);
+ tsapi TSMutex TSMutexCreateInternal(void);
+ tsapi int TSMutexCheck(TSMutex mutex);
/* IOBuffer */
- inkapi void INKIOBufferReaderCopy(INKIOBufferReader, const void *, int);
- inkapi int INKIOBufferBlockDataSizeGet(INKIOBufferBlock blockp);
- inkapi INKReturnCode INKIOBufferBlockDestroy(INKIOBufferBlock blockp);
-
-
+ tsapi void TSIOBufferReaderCopy(TSIOBufferReader readerp, const void *buf, int64 length);
+ tsapi int64 TSIOBufferBlockDataSizeGet(TSIOBufferBlock blockp);
+ tsapi TSReturnCode TSIOBufferBlockDestroy(TSIOBufferBlock blockp);
typedef void *INKUDPPacket;
typedef void *INKUDPacketQueue;
typedef void *INKUDPConn;
@@ -212,60 +210,60 @@ extern "C"
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi INKAction INKUDPBind(INKCont contp, unsigned int ip, int port);
+ tsapi TSAction INKUDPBind(TSCont contp, unsigned int ip, int port);
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi INKAction INKUDPSendTo(INKCont contp, INKUDPConn udp, unsigned int ip, int port, char *buf, int len);
+ tsapi TSAction INKUDPSendTo(TSCont contp, INKUDPConn udp, unsigned int ip, int port, char *buf, int len);
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi INKAction INKUDPRecvFrom(INKCont contp, INKUDPConn udp);
+ tsapi TSAction INKUDPRecvFrom(TSCont contp, INKUDPConn udp);
/****************************************************************************
* Return file descriptor.
* contact: OXYGEN
****************************************************************************/
- inkapi int INKUDPConnFdGet(INKUDPConn udp);
+ tsapi int INKUDPConnFdGet(INKUDPConn udp);
/* ===== UDP Packet ===== */
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi INKUDPPacket INKUDPPacketCreate();
+ tsapi INKUDPPacket INKUDPPacketCreate();
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi INKIOBufferBlock INKUDPPacketBufferBlockGet(INKUDPPacket packet);
+ tsapi TSIOBufferBlock INKUDPPacketBufferBlockGet(INKUDPPacket packet);
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi unsigned int INKUDPPacketFromAddressGet(INKUDPPacket packet);
+ tsapi unsigned int INKUDPPacketFromAddressGet(INKUDPPacket packet);
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi int INKUDPPacketFromPortGet(INKUDPPacket packet);
+ tsapi int INKUDPPacketFromPortGet(INKUDPPacket packet);
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi INKUDPConn INKUDPPacketConnGet(INKUDPPacket packet);
+ tsapi INKUDPConn INKUDPPacketConnGet(INKUDPPacket packet);
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi void INKUDPPacketDestroy(INKUDPPacket packet);
+ tsapi void INKUDPPacketDestroy(INKUDPPacket packet);
/* ===== Packet Queue ===== */
/****************************************************************************
* contact: OXYGEN
****************************************************************************/
- inkapi INKUDPPacket INKUDPPacketGet(INKUDPacketQueue queuep);
+ tsapi INKUDPPacket INKUDPPacketGet(INKUDPacketQueue queuep);
#ifdef __cplusplus
}