You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/02/02 17:53:31 UTC
svn commit: r905704 - in /incubator/trafficserver/traffic/trunk:
iocore/cluster/ iocore/net/ libinktomi++/ proxy/ proxy/hdrs/ proxy/mgmt2/
proxy/mgmt2/web2/
Author: jplevyak
Date: Tue Feb 2 16:53:11 2010
New Revision: 905704
URL: http://svn.apache.org/viewvc?rev=905704&view=rev
Log:
TS-42: review and import Bryan Call's patches
Modified:
incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
incubator/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
incubator/trafficserver/traffic/trunk/libinktomi++/ink_queue.cc
incubator/trafficserver/traffic/trunk/proxy/ControlBase.cc
incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc
incubator/trafficserver/traffic/trunk/proxy/ReverseProxy.cc
incubator/trafficserver/traffic/trunk/proxy/Transform.cc
incubator/trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc
incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc
incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc Tue Feb 2 16:53:11 2010
@@ -2225,7 +2225,7 @@
start_time = 0;
}
// for CACHE_EVENT_RESPONSE/XXX the lock was acquired at the higher level
- int return_error = 0;
+ intptr_t return_error = 0;
ClusterVCToken *pToken = NULL;
retry:
Modified: incubator/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc Tue Feb 2 16:53:11 2010
@@ -106,10 +106,10 @@
goto Ldone;
if (na->server.fd != NO_FD && !na->action_->cancelled) {
if (!blockable)
- na->action_->continuation->handleEvent(EVENT_ERROR, (void *) res);
+ na->action_->continuation->handleEvent(EVENT_ERROR, (void *)(intptr_t)res);
else {
MUTEX_LOCK(lock, na->action_->mutex, e->ethread);
- na->action_->continuation->handleEvent(EVENT_ERROR, (void *) res);
+ na->action_->continuation->handleEvent(EVENT_ERROR, (void *)(intptr_t)res);
}
}
count = res;
@@ -390,7 +390,7 @@
}
if (!action_->cancelled) {
MUTEX_LOCK(lock, action_->mutex, t);
- action_->continuation->handleEvent(EVENT_ERROR, (void *) res);
+ action_->continuation->handleEvent(EVENT_ERROR, (void *)(intptr_t)res);
MUTEX_UNTAKE_LOCK(action_->mutex, t);
IOCORE_MachineFatal("accept thread received fatal error: errno = %d", errno);
}
@@ -549,7 +549,7 @@
goto Ldone;
}
if (!action_->cancelled)
- action_->continuation->handleEvent(EVENT_ERROR, (void *) res);
+ action_->continuation->handleEvent(EVENT_ERROR, (void *)(intptr_t)res);
goto Lerror;
}
vc->closed = 0;
Modified: incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Tue Feb 2 16:53:11 2010
@@ -562,7 +562,7 @@
cont->handleEvent(NET_EVENT_DATAGRAM_WRITE_COMPLETE, (void *) -1);
return ACTION_RESULT_DONE;
} else {
- cont->handleEvent(NET_EVENT_DATAGRAM_WRITE_ERROR, (void *) nbytes_sent);
+ cont->handleEvent(NET_EVENT_DATAGRAM_WRITE_ERROR, (void *)(intptr_t)nbytes_sent);
return ACTION_IO_ERROR;
}
}
Modified: incubator/trafficserver/traffic/trunk/libinktomi++/ink_queue.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_queue.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/ink_queue.cc (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/ink_queue.cc Tue Feb 2 16:53:11 2010
@@ -133,7 +133,7 @@
f->tail = NULL;
#endif
#else
- SET_FREELIST_POINTER_VERSION(f->head, FROM_PTR(NULL), 0);
+ SET_FREELIST_POINTER_VERSION(f->head, FROM_PTR(0), 0);
#endif
f->count = 0;
@@ -528,7 +528,7 @@
#endif
l->name = name;
l->offset = offset_to_next;
- SET_FREELIST_POINTER_VERSION(l->head, FROM_PTR(NULL), 0);
+ SET_FREELIST_POINTER_VERSION(l->head, FROM_PTR(0), 0);
}
#if defined(INK_USE_MUTEX_FOR_ATOMICLISTS)
Modified: incubator/trafficserver/traffic/trunk/proxy/ControlBase.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ControlBase.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ControlBase.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ControlBase.cc Tue Feb 2 16:53:11 2010
@@ -372,7 +372,7 @@
// coverity[secure_coding]
if (sscanf(val, "%d", &tmp) == 1) {
cur_el.type = MOD_IPORT;
- cur_el.opaque_data = (void *) tmp;
+ cur_el.opaque_data = (void *)(uintptr_t)tmp;
} else {
err = ME_BAD_IPORT;
goto error;
Modified: incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc Tue Feb 2 16:53:11 2010
@@ -125,7 +125,7 @@
#define __p_type p_type //ugly hack? - see resolv.h
#define D(x) x /* for debugging */
-int f1, f2;
+intptr_t f1, f2;
int framepointer = 0;
int program_counter = 0;
#endif // linux check
Modified: incubator/trafficserver/traffic/trunk/proxy/ReverseProxy.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ReverseProxy.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ReverseProxy.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ReverseProxy.cc Tue Feb 2 16:53:11 2010
@@ -55,16 +55,16 @@
UrlRewrite *rewrite_table = NULL;
// Tokens for the Callback function
-static const int FILE_CHANGED = 0;
-static const int REVERSE_CHANGED = 1;
-static const int TSNAME_CHANGED = 2;
-static const int AC_PORT_CHANGED = 3;
-static const int TRANS_CHANGED = 4;
-static const int DEFAULT_TO_PAC_CHANGED = 5;
-static const int PRISTINE_HOST_HDR_CHANGED = 6;
-static const int DEFAULT_TO_PAC_PORT_CHANGED = 7;
-static const int URL_REMAP_MODE_CHANGED = 8;
-static const int HTTP_DEFAULT_REDIRECT_CHANGED = 9;
+#define FILE_CHANGED 0
+#define REVERSE_CHANGED 1
+#define TSNAME_CHANGED 2
+#define AC_PORT_CHANGED 3
+#define TRANS_CHANGED 4
+#define DEFAULT_TO_PAC_CHANGED 5
+#define PRISTINE_HOST_HDR_CHANGED 6
+#define DEFAULT_TO_PAC_PORT_CHANGED 7
+#define URL_REMAP_MODE_CHANGED 8
+#define HTTP_DEFAULT_REDIRECT_CHANGED 9
int url_remap_mode;
Modified: incubator/trafficserver/traffic/trunk/proxy/Transform.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Transform.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Transform.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Transform.cc Tue Feb 2 16:53:11 2010
@@ -228,7 +228,7 @@
m_event_count, event, (long) m_tvc, (long) m_tvc->m_cont);
m_called_user = 1;
- m_tvc->m_cont->handleEvent(TRANSFORM_READ_READY, (void *) m_write_vio.nbytes);
+ m_tvc->m_cont->handleEvent(TRANSFORM_READ_READY, (void *)(intptr_t)m_write_vio.nbytes);
}
} else {
int towrite;
Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc Tue Feb 2 16:53:11 2010
@@ -1970,7 +1970,7 @@
// marshalling in to
if (m_alt->m_request_hdr.valid()) {
tmp = m_alt->m_request_hdr.m_heap->marshal(buf, len - used);
- marshal_alt->m_request_hdr.m_heap = (HdrHeap *) (used);
+ marshal_alt->m_request_hdr.m_heap = (HdrHeap *)(intptr_t)used;
ink_assert(((long) marshal_alt->m_request_hdr.m_heap) < len);
buf += tmp;
used += tmp;
@@ -1981,7 +1981,7 @@
if (m_alt->m_response_hdr.valid()) {
tmp = m_alt->m_response_hdr.m_heap->marshal(buf, len - used);
- marshal_alt->m_response_hdr.m_heap = (HdrHeap *) (used);
+ marshal_alt->m_response_hdr.m_heap = (HdrHeap *)(intptr_t)used;
ink_assert(((long) marshal_alt->m_response_hdr.m_heap) < len);
used += tmp;
} else {
Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc Tue Feb 2 16:53:11 2010
@@ -38,10 +38,10 @@
#include "Diags.h"
#include "ptrdef.h"
-const int HDR_MAX_ALLOC_SIZE = HDR_HEAP_DEFAULT_SIZE - sizeof(HdrHeap);
-const int HDR_HEAP_HDR_SIZE = ROUND(sizeof(HdrHeap), HDR_PTR_SIZE);
-const int STR_HEAP_HDR_SIZE = sizeof(HdrStrHeap);
-const int MAX_LOST_STR_SPACE = 1024;
+#define HDR_MAX_ALLOC_SIZE (HDR_HEAP_DEFAULT_SIZE - sizeof(HdrHeap))
+#define HDR_HEAP_HDR_SIZE ROUND(sizeof(HdrHeap), HDR_PTR_SIZE)
+#define STR_HEAP_HDR_SIZE sizeof(HdrStrHeap)
+#define MAX_LOST_STR_SPACE 1024
Allocator hdrHeapAllocator("hdrHeap", HDR_HEAP_DEFAULT_SIZE);
static HdrHeap proto_heap;
@@ -215,7 +215,7 @@
nbytes = ROUND(nbytes, HDR_PTR_SIZE);
- if (nbytes > HDR_MAX_ALLOC_SIZE) {
+ if (nbytes > (int)HDR_MAX_ALLOC_SIZE) {
ink_assert(!"alloc too big");
return NULL;
}
@@ -274,7 +274,7 @@
// but I already no that this code path is
// safe for forcing a str coalesce so I'm doing
// it here for sanity's sake
- if (m_lost_string_space > MAX_LOST_STR_SPACE) {
+ if (m_lost_string_space > (int)MAX_LOST_STR_SPACE) {
goto FAILED;
}
@@ -686,7 +686,7 @@
marshal_hdr->m_free_start = NULL;
marshal_hdr->m_data_start = (char *) HDR_HEAP_HDR_SIZE; // offset
marshal_hdr->m_magic = HDR_BUF_MAGIC_MARSHALED;
- marshal_hdr->m_writeable = false;;
+ marshal_hdr->m_writeable = false;
marshal_hdr->m_size = ptr_heap_size + HDR_HEAP_HDR_SIZE;
marshal_hdr->m_next = NULL;
marshal_hdr->m_free_size = 0;
@@ -694,7 +694,7 @@
marshal_hdr->m_lost_string_space = this->m_lost_string_space;
// We'have one read-only string heap after marshalling
- marshal_hdr->m_ronly_heap[0].m_heap_start = (char *) marshal_hdr->m_size; // offset
+ marshal_hdr->m_ronly_heap[0].m_heap_start = (char *)(intptr_t)marshal_hdr->m_size; // offset
marshal_hdr->m_ronly_heap[0].m_ref_count_ptr.m_ptr = NULL;
marshal_hdr->m_ronly_heap[1].m_heap_start = NULL;
@@ -1069,7 +1069,7 @@
// Find out if we are building up too much lost space
int new_lost_space = m_lost_string_space + inherit_from->m_lost_string_space;
- if (free_slots<0 || new_lost_space> MAX_LOST_STR_SPACE) {
+ if (free_slots < 0 || new_lost_space > (int)MAX_LOST_STR_SPACE) {
// Not enough free slots. We need to force a coalesce of
// string heaps for both old heaps and the inherited from heaps.
// Coalesce can't know the inherited str size so we pass it
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.cc Tue Feb 2 16:53:11 2010
@@ -95,7 +95,7 @@
MgmtCallbackList *cb_list;
InkHashTableValue hash_value;
- if (ink_hash_table_lookup(mgmt_callback_table, (InkHashTableKey) msg_id, &hash_value) != 0) {
+ if (ink_hash_table_lookup(mgmt_callback_table, (InkHashTableKey)(intptr_t)msg_id, &hash_value) != 0) {
cb_list = (MgmtCallbackList *) hash_value;
} else {
cb_list = NULL;
@@ -114,7 +114,7 @@
cb_list->func = cb;
cb_list->opaque_data = opaque_cb_data;
cb_list->next = NULL;
- ink_hash_table_insert(mgmt_callback_table, (InkHashTableKey) msg_id, cb_list);
+ ink_hash_table_insert(mgmt_callback_table, (InkHashTableKey)(intptr_t)msg_id, cb_list);
}
return msg_id;
} /* End BaseManager::registerMgmtCallback */
@@ -164,7 +164,7 @@
BaseManager::executeMgmtCallback(int msg_id, char *data_raw, int data_len)
{
InkHashTableValue hash_value;
- if (ink_hash_table_lookup(mgmt_callback_table, (InkHashTableKey) msg_id, &hash_value) != 0) {
+ if (ink_hash_table_lookup(mgmt_callback_table, (InkHashTableKey)(intptr_t)msg_id, &hash_value) != 0) {
for (MgmtCallbackList * cb_list = (MgmtCallbackList *) hash_value; cb_list; cb_list = cb_list->next) {
(*((MgmtCallback) (cb_list->func))) (cb_list->opaque_data, data_raw, data_len);
}
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Tue Feb 2 16:53:11 2010
@@ -4567,7 +4567,7 @@
int r;
RecordsConfigIndex = NEW(new MgmtHashTable("records_config_index", false, InkHashTableKeyType_String));
for (r = 0; RecordsConfig[r].value_type != INVALID; r++) {
- RecordsConfigIndex->mgmt_hash_table_insert(RecordsConfig[r].name, (void *) r);
+ RecordsConfigIndex->mgmt_hash_table_insert(RecordsConfig[r].name, (void *)(intptr_t)r);
}
}
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc?rev=905704&r1=905703&r2=905704&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc Tue Feb 2 16:53:11 2010
@@ -50,17 +50,17 @@
// Since we don't want to steal the manager's main thread we get
// config callbacks, set up an array to store the callback info and
// then read it periodically
-const int ADV_UI_ENABLED = 0;
-const int AUTH_ENABLED_CB = 1;
-const int AUTH_ADMIN_USER_CB = 2;
-const int AUTH_ADMIN_PASSWD_CB = 3;
-const int AUTH_OTHER_USERS_CB = 4;
-const int LANG_DICT_CB = 5;
-const int LOAD_FACTOR_CB = 6;
-const int MGMT_IP_ALLOW = 7;
-const int REFRESH_RATE_CB = 8;
-const int SSL_ENABLED_CB = 9;
-const int UPDATE_ARRAY_SIZE = 10;
+#define ADV_UI_ENABLED 0
+#define AUTH_ENABLED_CB 1
+#define AUTH_ADMIN_USER_CB 2
+#define AUTH_ADMIN_PASSWD_CB 3
+#define AUTH_OTHER_USERS_CB 4
+#define LANG_DICT_CB 5
+#define LOAD_FACTOR_CB 6
+#define MGMT_IP_ALLOW 7
+#define REFRESH_RATE_CB 8
+#define SSL_ENABLED_CB 9
+#define UPDATE_ARRAY_SIZE 10
int webConfigChanged = 0;
static int updateArray[UPDATE_ARRAY_SIZE];