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 [9/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/ exam...
Modified: trafficserver/traffic/branches/wccp/proxy/FetchSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/FetchSM.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/FetchSM.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/FetchSM.cc Tue Nov 30 01:42:55 2010
@@ -33,14 +33,14 @@ ClassAllocator < FetchSM > FetchSMAlloca
void
FetchSM::cleanUp()
{
- INKDebug(DEBUG_TAG, "[%s] calling cleanup", __FUNCTION__);
+ Debug(DEBUG_TAG, "[%s] calling cleanup", __FUNCTION__);
free_MIOBuffer(response_buffer);
free_MIOBuffer(req_buffer);
free_MIOBuffer(resp_buffer);
mutex.clear();
http_parser_clear(&http_parser);
client_response_hdr.destroy();
- INKfree(client_response);
+ xfree(client_response);
PluginVC *vc = (PluginVC *) http_vc;
vc->do_io_close();
FetchSMAllocator.free(this);
@@ -49,8 +49,8 @@ FetchSM::cleanUp()
void
FetchSM::httpConnect()
{
- INKDebug(DEBUG_TAG, "[%s] calling httpconnect write", __FUNCTION__);
- INKHttpConnect(_ip, _port, &(http_vc));
+ Debug(DEBUG_TAG, "[%s] calling httpconnect write", __FUNCTION__);
+ TSHttpConnect(_ip, _port, &(http_vc));
PluginVC *vc = (PluginVC *) http_vc;
read_vio = vc->do_io_read(this, INT_MAX, resp_buffer);
write_vio = vc->do_io_write(this, getReqLen(), req_reader);
@@ -71,23 +71,23 @@ int FetchSM::InvokePlugin(int event, voi
return ret;
}
void
-FetchSM::get_info_from_buffer(INKIOBufferReader the_reader)
+FetchSM::get_info_from_buffer(TSIOBufferReader the_reader)
{
char *info;
// char *info_start;
- int read_avail, read_done;
- INKIOBufferBlock blk;
+ int64 read_avail, read_done;
+ TSIOBufferBlock blk;
char *buf;
if (!the_reader)
return ;
- read_avail = INKIOBufferReaderAvail(the_reader);
- INKDebug(DEBUG_TAG, "[%s] total avail %d", __FUNCTION__, read_avail);
+ read_avail = TSIOBufferReaderAvail(the_reader);
+ Debug(DEBUG_TAG, "[%s] total avail %d", __FUNCTION__, read_avail);
//size_t hdr_size = _headers.size();
- //info = (char *) INKmalloc(sizeof(char) * (read_avail+1) + hdr_size);
- info = (char *) INKmalloc(sizeof(char) * (read_avail+1));
+ //info = (char *) xmalloc(sizeof(char) * (read_avail+1) + hdr_size);
+ info = (char *) xmalloc(sizeof(char) * (read_avail+1));
if (info == NULL)
return ;
client_response = info;
@@ -96,11 +96,11 @@ FetchSM::get_info_from_buffer(INKIOBuffe
/* Read the data out of the reader */
while (read_avail > 0) {
- blk = INKIOBufferReaderStart(the_reader);
- buf = (char *) INKIOBufferBlockReadStart(blk, the_reader, &read_done);
+ blk = TSIOBufferReaderStart(the_reader);
+ buf = (char *) TSIOBufferBlockReadStart(blk, the_reader, &read_done);
memcpy(info, buf, read_done);
if (read_done > 0) {
- INKIOBufferReaderConsume(the_reader, read_done);
+ TSIOBufferReaderConsume(the_reader, read_done);
read_avail -= read_done;
info += read_done;
}
@@ -112,14 +112,14 @@ void
FetchSM::process_fetch_read(int event)
{
- INKDebug(DEBUG_TAG, "[%s] I am here read", __FUNCTION__);
+ Debug(DEBUG_TAG, "[%s] I am here read", __FUNCTION__);
int bytes;
int bytes_used;
int actual_bytes_copied = 0;
switch (event) {
- case INK_EVENT_VCONN_READ_READY:
+ case TS_EVENT_VCONN_READ_READY:
bytes = resp_reader->read_avail();
- INKDebug(DEBUG_TAG, "[%s] number of bytes in read ready %d", __FUNCTION__, bytes);
+ Debug(DEBUG_TAG, "[%s] number of bytes in read ready %d", __FUNCTION__, bytes);
while (actual_bytes_copied < bytes) {
actual_bytes_copied = response_buffer->write(resp_reader, bytes, 0);
resp_reader->consume(actual_bytes_copied);
@@ -128,36 +128,36 @@ FetchSM::process_fetch_read(int event)
resp_reader->consume(bytes);
if (header_done == 0 && callback_options == AFTER_HEADER) {
if (client_response_hdr.parse_resp(&http_parser, response_reader, &bytes_used, 0) == PARSE_DONE) {
- //InvokePlugin( INK_EVENT_INTERNAL_60201, (void *) &client_response_hdr);
+ //InvokePlugin( TS_EVENT_INTERNAL_60201, (void *) &client_response_hdr);
InvokePlugin( callback_events.success_event_id, (void *) &client_response_hdr);
header_done = 1;
}
}
read_vio->reenable();
break;
- case INK_EVENT_VCONN_READ_COMPLETE:
- case INK_EVENT_VCONN_EOS:
+ case TS_EVENT_VCONN_READ_COMPLETE:
+ case TS_EVENT_VCONN_EOS:
if(callback_options == AFTER_HEADER || callback_options == AFTER_BODY) {
bytes = response_reader->read_avail();
get_info_from_buffer(response_reader);
- INKDebug(DEBUG_TAG, "[%s] number of bytes %d", __FUNCTION__, bytes);
+ Debug(DEBUG_TAG, "[%s] number of bytes %d", __FUNCTION__, bytes);
if(client_response!=NULL)
client_response[bytes] = '\0';
//client_response[bytes + _headers.size()] = '\0';
- INKDebug(DEBUG_TAG, "[%s] Completed data fetch of size %d, notifying caller", __FUNCTION__, bytes);
- //InvokePlugin( INK_EVENT_INTERNAL_60200, (void *) client_response);
+ Debug(DEBUG_TAG, "[%s] Completed data fetch of size %d, notifying caller", __FUNCTION__, bytes);
+ //InvokePlugin( TS_EVENT_INTERNAL_60200, (void *) client_response);
client_bytes = bytes;
- //InvokePlugin( INK_EVENT_INTERNAL_60200, (void *) this);
+ //InvokePlugin( TS_EVENT_INTERNAL_60200, (void *) this);
InvokePlugin( callback_events.success_event_id, (void *) this);
}
- INKDebug(DEBUG_TAG, "[%s] received EOS", __FUNCTION__);
+ Debug(DEBUG_TAG, "[%s] received EOS", __FUNCTION__);
cleanUp();
break;
- case INK_EVENT_ERROR:
+ case TS_EVENT_ERROR:
default:
- //InvokePlugin(INK_EVENT_ERROR, NULL);
+ //InvokePlugin(TS_EVENT_ERROR, NULL);
InvokePlugin( callback_events.failure_event_id, NULL);
cleanUp();
break;
@@ -168,15 +168,15 @@ FetchSM::process_fetch_read(int event)
void
FetchSM::process_fetch_write(int event)
{
- INKDebug(DEBUG_TAG, "[%s] calling process write", __FUNCTION__);
+ Debug(DEBUG_TAG, "[%s] calling process write", __FUNCTION__);
switch (event) {
- case INK_EVENT_VCONN_WRITE_COMPLETE:
+ case TS_EVENT_VCONN_WRITE_COMPLETE:
//INKVConnShutdown(http_vc, 0, 1) ; why does not this work???
req_finished = true;
break;
- case INK_EVENT_VCONN_WRITE_READY:
- case INK_EVENT_ERROR:
- //InvokePlugin( INK_EVENT_ERROR, NULL);
+ case TS_EVENT_VCONN_WRITE_READY:
+ case TS_EVENT_ERROR:
+ //InvokePlugin( TS_EVENT_ERROR, NULL);
InvokePlugin( callback_events.failure_event_id, NULL);
cleanUp();
default:
@@ -187,14 +187,13 @@ FetchSM::process_fetch_write(int event)
int
FetchSM::fetch_handler(int event, void *edata)
{
- INKDebug(DEBUG_TAG, "[%s] calling fetch_plugin", __FUNCTION__);
+ Debug(DEBUG_TAG, "[%s] calling fetch_plugin", __FUNCTION__);
if (edata == read_vio) {
process_fetch_read(event);
} else if (edata == write_vio) {
process_fetch_write(event);
} else {
- //InvokePlugin( INK_EVENT_ERROR, NULL);
InvokePlugin( callback_events.failure_event_id, NULL);
cleanUp();
}
Modified: trafficserver/traffic/branches/wccp/proxy/FetchSM.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/FetchSM.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/FetchSM.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/FetchSM.h Tue Nov 30 01:42:55 2010
@@ -31,8 +31,6 @@
#ifndef _FETCH_SM_H
#define _FETCH_SM_H
-#include <string>
-
#include "P_Net.h"
#include "ts.h"
#include "HttpSM.h"
@@ -43,10 +41,10 @@ public:
FetchSM()
{
};
- void init(INKCont cont, INKFetchWakeUpOptions options, INKFetchEvent events, const char* headers, int length,unsigned int ip, int port)
+ void init(TSCont cont, TSFetchWakeUpOptions options, TSFetchEvent events, const char* headers, int length,unsigned int ip, int port)
{
//_headers.assign(headers);
- INKDebug("FetchSM", "[%s] FetchSM initialized for request with headers\n--\n%s\n--", __FUNCTION__, headers);
+ Debug("FetchSM", "[%s] FetchSM initialized for request with headers\n--\n%s\n--", __FUNCTION__, headers);
req_finished = 0;
resp_finished = 0;
header_done = 0;
@@ -73,7 +71,7 @@ public:
void process_fetch_write(int event);
void httpConnect();
void cleanUp();
- void get_info_from_buffer(INKIOBufferReader reader);
+ void get_info_from_buffer(TSIOBufferReader reader);
char* resp_get(int* length);
private:
int InvokePlugin(int event, void*data);
@@ -89,7 +87,7 @@ private:
return req_reader->read_avail();
}
- INKVConn http_vc;
+ TSVConn http_vc;
VIO *read_vio;
VIO *write_vio;
MIOBuffer *response_buffer; // response to FetchSM call
@@ -100,17 +98,16 @@ private:
int client_bytes;
MIOBuffer *resp_buffer; // response to HttpConnect Call
IOBufferReader *resp_reader;
- INKCont contp;
+ TSCont contp;
HTTPParser http_parser;
HTTPHdr client_response_hdr;
- INKFetchEvent callback_events;
- INKFetchWakeUpOptions callback_options;
+ TSFetchEvent callback_events;
+ TSFetchWakeUpOptions callback_options;
bool req_finished;
bool header_done;
bool resp_finished;
unsigned int _ip;
int _port;
- //std::string _headers;
};
#endif
Modified: trafficserver/traffic/branches/wccp/proxy/ICP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/ICP.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/ICP.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/ICP.cc Tue Nov 30 01:42:55 2010
@@ -900,7 +900,7 @@ ICPPeerReadCont::PeerReadStateMachine(Pe
s->_peer->writeAction = NULL;
int len = completionUtil::getBytesTransferred(e);
- if (len == ntohs(s->_rICPmsg->h.msglen)) {
+ if (len == (int)ntohs(s->_rICPmsg->h.msglen)) {
ICP_INCREMENT_DYN_STAT(query_response_write_stat);
s->_peer->LogSendMsg(s->_rICPmsg, &s->_sender); // log query reply
} else {
Modified: trafficserver/traffic/branches/wccp/proxy/ICP.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/ICP.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/ICP.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/ICP.h Tue Nov 30 01:42:55 2010
@@ -1118,9 +1118,6 @@ public:
~ICPRequestCont();
void *operator new(size_t size, void *mem);
void operator delete(void *mem);
-#ifdef __alpha
- void operator delete(void *p, void *mem);
-#endif
inline void SetRequestStartTime()
{
_start_time = ink_get_hrtime();
@@ -1239,15 +1236,6 @@ delete(void *mem)
ICPRequestCont_allocator.free((ICPRequestCont *) mem);
}
-#ifdef __alpha
-inline void
- ICPRequestCont::operator
-delete(void *p, void *mem)
-{
- ink_release_assert(!"invalid ICPRequestCont::operator delete(void *p, void *mem)");
-}
-#endif
-
extern struct RecRawStatBlock *icp_rsb;
enum
Modified: trafficserver/traffic/branches/wccp/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/ICPConfig.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/ICPConfig.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/ICPConfig.cc Tue Nov 30 01:42:55 2010
@@ -779,15 +779,8 @@ ICPConfiguration::icp_config_change_call
close(fd);
if (!error) {
- for (int i = 0; i <= MAX_DEFINED_PEERS; i++) {
-#if defined (alpha) || defined(__alpha)
- PeerConfigData *p_cur;
- p_cur = ICPconfig->_peer_cdata_current[i];
- *p_cur = P[i];
-#else
- *ICPconfig->_peer_cdata_current[i] = P[i]; // Broken on DEC
-#endif
- }
+ for (int i = 0; i <= MAX_DEFINED_PEERS; i++)
+ *ICPconfig->_peer_cdata_current[i] = P[i];
}
delete[]P; // free working buffer
if (!startup)
@@ -955,7 +948,7 @@ ParentSiblingPeer::ValidSender(struct so
} else {
// Make sure the sockaddr_in corresponds to this peer
if ((GetIP()->s_addr == fr->sin_addr.s_addr)
- && (GetPort() == ntohs(fr->sin_port))) {
+ && (GetPort() == (int)ntohs(fr->sin_port))) {
return 1; // Sender is this peer
} else {
return 0; // Sender is not this peer
@@ -1090,7 +1083,7 @@ MultiCastPeer::ValidSender(struct sockad
Peer *P = _next;
while (P) {
if ((P->GetIP()->s_addr == sa->sin_addr.s_addr)
- && (P->GetPort() == ntohs(sa->sin_port))) {
+ && (P->GetPort() == (int)ntohs(sa->sin_port))) {
return 1;
} else {
P = P->GetNext();
Modified: trafficserver/traffic/branches/wccp/proxy/Initialize.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/Initialize.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/Initialize.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/Initialize.cc Tue Nov 30 01:42:55 2010
@@ -137,7 +137,7 @@ init_system_dirs(void)
if ((err = stat(system_log_dir, &s)) < 0) {
fprintf(stderr,"unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
- fprintf(stderr,"please set 'proxy.config.log2.logfile_dir'\n");
+ fprintf(stderr,"please set 'proxy.config.log.logfile_dir'\n");
_exit(1);
}
}
@@ -202,23 +202,6 @@ init_system_core_size(void)
}
}
-void
-init_system_memalign_heap(void)
-{
- int64 ram_cache_max = -1;
- int enable_preallocation = 1;
-
- REC_ReadConfigInteger(enable_preallocation, "proxy.config.system.memalign_heap");
- if (enable_preallocation) {
- REC_ReadConfigInteger(ram_cache_max, "proxy.config.cache.ram_cache.size");
- if (ram_cache_max > 0) {
- if (!ink_memalign_heap_init(ram_cache_max))
- Warning("Unable to init memalign heap");
- } else {
- Warning("Unable to read proxy.config.cache.ram_cache.size var from config");
- }
- }
-}
int system_syslog_facility = LOG_DAEMON;
@@ -399,7 +382,6 @@ char action_tags[1024] = "";
int diags_init = 0;
//int command_flag = 0;
-extern int use_accept_thread;
int num_of_net_threads = ink_number_of_processors();
//int num_of_cache_threads = 1;
Modified: trafficserver/traffic/branches/wccp/proxy/Initialize.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/Initialize.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/Initialize.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/Initialize.h Tue Nov 30 01:42:55 2010
@@ -45,7 +45,6 @@ extern int system_syslog_facility;
void init_system_settings(void);
void init_system_dirs(void);
void init_system_core_size(void);
-void init_system_memalign_heap(void);
void init_system_syslog_log_configure(void);
//void init_system_logging();
void init_system_reconfigure_diags(void);