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/09/22 01:13:37 UTC
svn commit: r999684 - in /trafficserver/traffic/trunk/iocore: cache/
cluster/ eventsystem/ net/
Author: jplevyak
Date: Tue Sep 21 23:13:36 2010
New Revision: 999684
URL: http://svn.apache.org/viewvc?rev=999684&view=rev
Log:
-228: second phase, cleanup "long" as its size can be ambiguous depending on the compiler
Modified:
trafficserver/traffic/trunk/iocore/cache/Cache.cc
trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc
trafficserver/traffic/trunk/iocore/cache/CachePages.cc
trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc
trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc
trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h
trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h
trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h
trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h
trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc
trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc
trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h
trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h
trafficserver/traffic/trunk/iocore/net/P_NetAccept.h
trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Tue Sep 21 23:13:36 2010
@@ -269,7 +269,7 @@ CacheVC::do_io_close(int alerrno)
ink_debug_assert(mutex->thread_holding == this_ethread());
int previous_closed = closed;
closed = (alerrno == -1) ? 1 : -1; // Stupid default arguments
- DDebug("cache_close", "do_io_close %lX %d %d", (long) this, alerrno, closed);
+ DDebug("cache_close", "do_io_close %p %d %d", this, alerrno, closed);
if (!previous_closed && !recursive)
die();
}
@@ -277,7 +277,7 @@ CacheVC::do_io_close(int alerrno)
void
CacheVC::reenable(VIO *avio)
{
- DDebug("cache_reenable", "reenable %lX", (long) this);
+ DDebug("cache_reenable", "reenable %p", this);
(void) avio;
ink_assert(avio->mutex->thread_holding);
if (!trigger) {
@@ -295,7 +295,7 @@ CacheVC::reenable(VIO *avio)
void
CacheVC::reenable_re(VIO *avio)
{
- DDebug("cache_reenable", "reenable_re %lX", (long) this);
+ DDebug("cache_reenable", "reenable_re %p", this);
(void) avio;
ink_assert(avio->mutex->thread_holding);
if (!trigger) {
@@ -723,8 +723,8 @@ CacheProcessor::cacheInitialized()
}
if (caches_ready) {
- Debug("cache_init", "CacheProcessor::cacheInitialized - caches_ready=0x%0lX, gnpart=%d",
- (unsigned long) caches_ready, gnpart);
+ Debug("cache_init", "CacheProcessor::cacheInitialized - caches_ready=0x%0X, gnpart=%d",
+ (unsigned int) caches_ready, gnpart);
int64 ram_cache_bytes = 0;
if (gnpart) {
for (i = 0; i < gnpart; i++) {
@@ -999,7 +999,6 @@ Part::init(char *s, off_t blocks, off_t
hit_evacuate_window = (data_blocks * cache_config_hit_evacuate_percent) / 100;
#endif
- ink_assert(sizeof(DLL<EvacuationBlock>) <= sizeof(long));
evacuate_size = (int) (len / EVACUATION_BUCKET_SIZE) + 2;
int evac_len = (int) evacuate_size * sizeof(DLL<EvacuationBlock>);
evacuate = (DLL<EvacuationBlock> *)malloc(evac_len);
@@ -1717,8 +1716,8 @@ Cache::open(bool clear, bool fix)
IOCORE_EstablishStaticConfigInt32(cache_config_min_average_object_size, "proxy.config.cache.min_average_object_size");
- Debug("cache_init", "Cache::open - proxy.config.cache.min_average_object_size = %ld",
- (long) cache_config_min_average_object_size);
+ Debug("cache_init", "Cache::open - proxy.config.cache.min_average_object_size = %d",
+ (int)cache_config_min_average_object_size);
CachePart *cp = cp_list.head;
for (; cp; cp = cp->link.next) {
@@ -2825,7 +2824,7 @@ CacheProcessor::open_write(Continuation
#endif
// cache plugin
if (cache_global_hooks != NULL && cache_global_hooks->hooks_set > 0) {
- Debug("cache_plugin", "[CacheProcessor::open_write] Cache hooks are set, old_info=%lX", (long) old_info);
+ Debug("cache_plugin", "[CacheProcessor::open_write] Cache hooks are set, old_info=%p", old_info);
HttpCacheSM *sm = (HttpCacheSM *) cont;
if (sm->master_sm && sm->master_sm->t_state.cache_vc) {
Modified: trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheDir.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheDir.cc Tue Sep 21 23:13:36 2010
@@ -344,8 +344,8 @@ dir_clean_bucket(Dir *b, int s, Part *pa
#endif
if (!dir_valid(part, e) || !dir_offset(e)) {
if (is_debug_tag_set("dir_clean"))
- Debug("dir_clean", "cleaning %X tag %X boffset %d b %X p %X l %d",
- (long) e, dir_tag(e), (int) dir_offset(e), (long) b, (long) p, dir_bucket_length(b, s, part));
+ Debug("dir_clean", "cleaning %p tag %X boffset %lld b %p p %p l %d",
+ e, dir_tag(e), dir_offset(e), b, p, dir_bucket_length(b, s, part));
if (dir_offset(e))
CACHE_DEC_DIR_USED(part->mutex);
e = dir_delete_entry(e, p, s, part);
@@ -379,7 +379,7 @@ dir_clear_range(off_t start, off_t end,
{
for (int i = 0; i < part->buckets * DIR_DEPTH * part->segments; i++) {
Dir *e = dir_index(part, i);
- if (!dir_token(e) && (int) dir_offset(e) >= start && (int) dir_offset(e) < end) {
+ if (!dir_token(e) && dir_offset(e) >= (int64)start && dir_offset(e) < (int64)end) {
CACHE_DEC_DIR_USED(part->mutex);
dir_set_offset(e, 0); // delete
}
@@ -535,7 +535,7 @@ Lagain:
goto Lcont;
}
if (dir_valid(d, e)) {
- DDebug("dir_probe_hit", "found %X %X part %d bucket %d boffset %d", key->word(0), key->word(1), d->fd, b, (int) dir_offset(e));
+ DDebug("dir_probe_hit", "found %X %X part %d bucket %d boffset %lld", key->word(0), key->word(1), d->fd, b, dir_offset(e));
dir_assign(result, e);
*last_collision = e;
ink_assert(dir_offset(e) * CACHE_BLOCK_SIZE < d->len);
@@ -557,7 +557,7 @@ Lagain:
collision = NULL;
goto Lagain;
}
- DDebug("dir_probe_miss", "missed %X %X on part %d bucket %d at %X", key->word(0), key->word(1), d->fd, b, (long) seg);
+ DDebug("dir_probe_miss", "missed %X %X on part %d bucket %d at %p", key->word(0), key->word(1), d->fd, b, seg);
CHECK_DIR(d);
return 0;
}
@@ -607,8 +607,8 @@ Lfill:
dir_set_tag(e, key->word(2));
ink_assert(part_offset(d, e) < (d->skip + d->len));
DDebug("dir_insert",
- "insert %X %X into part %d bucket %d at %X tag %X %X boffset %d",
- (long) e, key->word(0), d->fd, bi, (long) e, key->word(1), dir_tag(e), (int) dir_offset(e));
+ "insert %p %X into part %d bucket %d at %p tag %X %X boffset %lld",
+ e, key->word(0), d->fd, bi, e, key->word(1), dir_tag(e), dir_offset(e));
CHECK_DIR(d);
d->header->dirty = 1;
CACHE_INC_DIR_USED(d->mutex);
@@ -681,8 +681,8 @@ Lfill:
dir_set_tag(e, t);
ink_assert(part_offset(d, e) < d->skip + d->len);
DDebug("dir_overwrite",
- "overwrite %X %X into part %d bucket %d at %X tag %X %X boffset %d",
- (long) e, key->word(0), d->fd, bi, (long) e, t, dir_tag(e), (int) dir_offset(e));
+ "overwrite %p %X into part %d bucket %d at %p tag %X %X boffset %lld",
+ e, key->word(0), d->fd, bi, e, t, dir_tag(e), dir_offset(e));
CHECK_DIR(d);
d->header->dirty = 1;
return res;
Modified: trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc Tue Sep 21 23:13:36 2010
@@ -186,7 +186,7 @@ CacheHTTPInfoVector::marshal(char *buf,
char *start = buf;
int count = 0;
- ink_assert(!(((long) buf) & 3)); // buf must be aligned
+ ink_assert(!(((intptr_t) buf) & 3)); // buf must be aligned
for (int i = 0; i < xcount; i++) {
int tmp = data[i].alternate.marshal(buf, length);
@@ -204,7 +204,7 @@ CacheHTTPInfoVector::marshal(char *buf,
int
CacheHTTPInfoVector::unmarshal(const char *buf, int length, RefCountObj * block_ptr)
{
- ink_assert(!(((long) buf) & 3)); // buf must be aligned
+ ink_assert(!(((intptr_t) buf) & 3)); // buf must be aligned
const char *start = buf;
CacheHTTPInfo info;
@@ -232,7 +232,7 @@ CacheHTTPInfoVector::unmarshal(const cha
uint32
CacheHTTPInfoVector::get_handles(const char *buf, int length, RefCountObj * block_ptr)
{
- ink_assert(!(((long) buf) & 3)); // buf must be aligned
+ ink_assert(!(((intptr_t) buf) & 3)); // buf must be aligned
const char *start = buf;
CacheHTTPInfo info;
Modified: trafficserver/traffic/trunk/iocore/cache/CachePages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CachePages.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CachePages.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CachePages.cc Tue Sep 21 23:13:36 2010
@@ -326,7 +326,7 @@ ShowCache::handleCacheOpenRead(int event
CacheKey obj_key = obj->object_key_get();
HTTPHdr *cached_request = obj->request_get();
HTTPHdr *cached_response = obj->response_get();
- long obj_size = obj->object_size_get();
+ int64 obj_size = obj->object_size_get();
int offset, tmp, used, done;
char b[4096];
@@ -355,7 +355,7 @@ ShowCache::handleCacheOpenRead(int event
CHECK_SHOW(show("%s", b));
} while (!done);
CHECK_SHOW(show("</PRE></td></tr>\n"));
- CHECK_SHOW(show("<tr><td>Size</td><td>%lu</td>\n", obj_size));
+ CHECK_SHOW(show("<tr><td>Size</td><td>%lld</td>\n", obj_size));
CHECK_SHOW(show("<tr><td>Key</td><td>%s</td>\n", obj_key.string(tmpstr)));
t = obj->request_sent_time_get();
ink_ctime_r(&t, tmpstr);
Modified: trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc Tue Sep 21 23:13:36 2010
@@ -812,7 +812,7 @@ agg_copy(char *p, CacheVC *vc)
CacheHTTPInfo *http_info = vc->write_vector->get(vc->alternate_index);
http_info->object_size_set(vc->total_len);
}
- ink_assert(!(((unsigned long) &doc->hdr()[0]) & HDR_PTR_ALIGNMENT_MASK));
+ ink_assert(!(((uintptr_t) &doc->hdr()[0]) & HDR_PTR_ALIGNMENT_MASK));
ink_assert(vc->header_len == vc->write_vector->marshal(doc->hdr(), vc->header_len));
} else
#endif
@@ -1504,7 +1504,7 @@ CacheVC::openWriteStartDone(int event, E
err = ECACHE_BAD_META_DATA;
goto Lfailure;
}
- ink_assert((((unsigned long) &doc->hdr()[0]) & HDR_PTR_ALIGNMENT_MASK) == 0);
+ ink_assert((((uintptr_t) &doc->hdr()[0]) & HDR_PTR_ALIGNMENT_MASK) == 0);
if (write_vector->get_handles(doc->hdr(), doc->hlen, buf) != doc->hlen) {
err = ECACHE_BAD_META_DATA;
Modified: trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc Tue Sep 21 23:13:36 2010
@@ -101,7 +101,7 @@ NewCacheVC::getCacheHeaderKey(void **key
void
NewCacheVC::reenable(VIO * vio)
{
- Debug("cache_plugin", "[NewCacheVC::reenable] this=%lX vio=%lX", (long) this, (long) vio);
+ Debug("cache_plugin", "[NewCacheVC::reenable] this=%p vio=%p", this, vio);
if (_vio.op == VIO::WRITE) {
if (!_vio.buffer.reader()->read_avail()) {
ink_assert(!"useless reenable of cache write");
@@ -124,7 +124,7 @@ NewCacheVC::reenable(VIO * vio)
VIO *
NewCacheVC::do_io_read(Continuation * c, int64 nbytes, MIOBuffer * buf)
{
- Debug("cache_plugin", "[NewCacheVC::do_io_read] this=%lX c=%lX nbytes=%d", (long) this, (long) c, nbytes);
+ Debug("cache_plugin", "[NewCacheVC::do_io_read] this=%p c=%p nbytes=%d", this, c, nbytes);
switch (_state) {
//case NEW_CACHE_LOOKUP:
@@ -165,7 +165,7 @@ int
NewCacheVC::handleRead(int event, Event * e)
{
NOWARN_UNUSED(e);
- Debug("cache_plugin", "[NewCacheVC::handleRead] this=%lX event=%d", (long) this, event);
+ Debug("cache_plugin", "[NewCacheVC::handleRead] this=%p event=%d", this, event);
cancel_trigger();
if (!closed)
@@ -179,7 +179,7 @@ NewCacheVC::handleRead(int event, Event
VIO *
NewCacheVC::do_io_write(Continuation * c, int64 nbytes, IOBufferReader * buf, bool owner)
{
- Debug("cache_plugin", "[NewCacheVC::do_io_write] this=%lX c=%lX", (long) this, (long) c);
+ Debug("cache_plugin", "[NewCacheVC::do_io_write] this=%p c=%p", this, c);
// change the state based on the prior state
switch (_state) {
@@ -255,7 +255,7 @@ NewCacheVC::alloc(Continuation * cont, U
c->mutex = cont->mutex;
//c->start_time = ink_get_hrtime();
//ink_assert(c->trigger == NULL);
- Debug("cache_plugin", "[NewCacheVC::alloc] new %lX", (long) c);
+ Debug("cache_plugin", "[NewCacheVC::alloc] new %p", c);
c->_vio.op = VIO::READ;
c->_lookupUrl = url;
c->_url = url->string_get_ref(&c->_url_length);
@@ -280,7 +280,7 @@ NewCacheVC::setWriteVC(CacheHTTPInfo * o
void
NewCacheVC::do_io_close(int lerrno)
{
- Debug("cache_plugin", "[NewCacheVC::do_io_close] %lX lerrno: %d state: %d", (long) this, lerrno, _state);
+ Debug("cache_plugin", "[NewCacheVC::do_io_close] %p lerrno: %d state: %d", this, lerrno, _state);
if (!closed) {
closed = true;
@@ -323,7 +323,7 @@ NewCacheVC::set_http_info(CacheHTTPInfo
{
_state = NEW_CACHE_WRITE_HEADER;
- Debug("cache_plugin", "[NewCacheVC::set_http_info] this=%lX ainfo=%lX", (long) this, (long) ainfo);
+ Debug("cache_plugin", "[NewCacheVC::set_http_info] this=%p ainfo=%p", this, ainfo);
_writeCacheHttpInfo.copy_shallow((HTTPInfo *) ainfo);
//set the key and size from the previously chosen alternate in case it is a header-only update
//we assume that no reads happen between this and do_io_close
@@ -862,7 +862,7 @@ NewCacheVC::_writeHttpInfo()
void
NewCacheVC::_free()
{
- Debug("cache_plugin", "[NewCacheVC::_free] %lX", (long) this);
+ Debug("cache_plugin", "[NewCacheVC::_free] %p", this);
if (this->freeCalled)
return;
Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h Tue Sep 21 23:13:36 2010
@@ -532,7 +532,7 @@ new_CacheVC(Continuation *cont)
c->mutex = cont->mutex;
c->start_time = ink_get_hrtime();
ink_assert(c->trigger == NULL);
- Debug("cache_new", "new %lX", (long) c);
+ Debug("cache_new", "new %p", c);
#ifdef CACHE_STAT_PAGES
ink_assert(!c->stat_link.next);
ink_assert(!c->stat_link.prev);
@@ -544,7 +544,7 @@ new_CacheVC(Continuation *cont)
TS_INLINE int
free_CacheVC(CacheVC *cont)
{
- Debug("cache_free", "free %lX", (long) cont);
+ Debug("cache_free", "free %p", cont);
ProxyMutex *mutex = cont->mutex;
Part *part = cont->part;
CACHE_DECREMENT_DYN_STAT(cont->base_stat + CACHE_STAT_ACTIVE);
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Tue Sep 21 23:13:36 2010
@@ -30,7 +30,7 @@
extern int cluster_receive_buffer_size;
extern int cluster_send_buffer_size;
-extern unsigned long cluster_sockopt_flags;
+extern uint32 cluster_sockopt_flags;
///////////////////////////////////////////////////////////////
// Incoming message continuation for periodic callout threads
Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h Tue Sep 21 23:13:36 2010
@@ -49,7 +49,7 @@
// Macros
//
#define FOLDHASH(_ip,_seq) (_seq % REMOTE_CONNECT_HASH)
-#define ALIGN_DOUBLE(_p) ((((unsigned long) (_p)) + 7) & ~7)
+#define ALIGN_DOUBLE(_p) ((((uintptr_t) (_p)) + 7) & ~7)
#define ALLOCA_DOUBLE(_sz) ALIGN_DOUBLE(alloca((_sz) + 8))
Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h Tue Sep 21 23:13:36 2010
@@ -655,7 +655,7 @@ struct ClusterHandler:public ClusterHand
};
// Valid (ClusterVConnection *) in ClusterHandler.channels[]
-#define VALID_CHANNEL(vc) (vc && !(((long) vc) & 1))
+#define VALID_CHANNEL(vc) (vc && !(((uintptr_t) vc) & 1))
// outgoing control continuations
extern ClassAllocator<OutgoingControl> outControlAllocator;
Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h Tue Sep 21 23:13:36 2010
@@ -39,7 +39,7 @@
#define CLUSTER_STATS 1
-#define ALIGN_DOUBLE(_p) ((((unsigned long) (_p)) + 7) & ~7)
+#define ALIGN_DOUBLE(_p) ((((uintptr_t) (_p)) + 7) & ~7)
#define ALLOCA_DOUBLE(_sz) ALIGN_DOUBLE(alloca((_sz) + 8))
/*************************************************************************/
@@ -135,7 +135,7 @@
^ ~(uint32)_x.msg.unused \
^ ~((uint32)_x.msg.control_bytes << 16) ^_x.sequence_number)
-#define DOUBLE_ALIGN(_x) ((((unsigned long)_x)+7)&~7)
+#define DOUBLE_ALIGN(_x) ((((uintptr_t)_x)+7)&~7)
/*************************************************************************/
// Testing Defines
@@ -154,10 +154,10 @@
//
#if TEST_TIMING
#define TTTEST(_x) \
-fprintf(stderr, _x " at: %d\n", \
+fprintf(stderr, _x " at: %u\n", \
((unsigned int)(ink_get_hrtime()/HRTIME_MSECOND)) % 1000)
#define TTEST(_x) \
-fprintf(stderr, _x " for: %d at: %d\n", vc->channel, \
+fprintf(stderr, _x " for: %d at: %u\n", vc->channel, \
((unsigned int)(ink_get_hrtime()/HRTIME_MSECOND)) % 1000)
#define TIMEOUT_TESTS(_s,_d) \
if (*(int*)_d == 8) \
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h Tue Sep 21 23:13:36 2010
@@ -79,7 +79,7 @@ struct SocketManager
int unlink(char *buf);
int fsync(int fildes);
int ftruncate(int fildes, off_t length);
- int lockf(int fildes, int function, long size);
+ int lockf(int fildes, int function, off_t size);
int poll(struct pollfd *fds, unsigned long nfds, int timeout);
#if ATS_USE_EPOLL
int epoll_create(int size);
Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h Tue Sep 21 23:13:36 2010
@@ -532,7 +532,7 @@ SocketManager::shutdown(int s, int how)
}
TS_INLINE int
-SocketManager::lockf(int s, int f, long size)
+SocketManager::lockf(int s, int f, off_t size)
{
int res;
do {
Modified: trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/SocketManager.cc Tue Sep 21 23:13:36 2010
@@ -40,32 +40,7 @@ extern "C" int madvise(caddr_t, size_t,
#include "P_EventSystem.h"
-
SocketManager socketManager;
-int monitor_read_activity = !!getenv("MONITOR_READS");
-int monitor_write_activity = !!getenv("MONITOR_WRITES");
-
-#define MONITOR_STRING "%lX %lX %d %s\n"
-
-
-void
-monitor_disk_read(int fd, void *buf, int size, off_t offset, char *tag)
-{
- (void) fd;
- (void) buf;
- fprintf(stderr, "READ: " MONITOR_STRING, (unsigned long) offset,
- (unsigned long) offset + size, size, (tag ? tag : ""));
-}
-
-
-void
-monitor_disk_write(int fd, void *buf, int size, off_t offset, char *tag)
-{
- (void) fd;
- (void) buf;
- fprintf(stderr, "WRITE: " MONITOR_STRING, (unsigned long) offset,
- (unsigned long) offset + size, size, (tag ? tag : ""));
-}
SocketManager::SocketManager()
{
@@ -114,7 +89,7 @@ safe_madvise(caddr_t addr, size_t len, c
(void) flags;
return 0;
#else
- caddr_t a = (caddr_t) (((unsigned long) addr) & ~(socketManager.pagesize - 1));
+ caddr_t a = (caddr_t) (((uintptr_t) addr) & ~(socketManager.pagesize - 1));
size_t l = (len + (addr - a) + socketManager.pagesize - 1)
& ~(socketManager.pagesize - 1);
int res = 0;
@@ -127,7 +102,7 @@ int
safe_mlock(caddr_t addr, size_t len, caddr_t end)
{
- caddr_t a = (caddr_t) (((unsigned long) addr) & ~(socketManager.pagesize - 1));
+ caddr_t a = (caddr_t) (((uintptr_t) addr) & ~(socketManager.pagesize - 1));
size_t l = (len + (addr - a) + socketManager.pagesize - 1)
& ~(socketManager.pagesize - 1);
if ((a + l) > end)
@@ -136,12 +111,6 @@ safe_mlock(caddr_t addr, size_t len, cad
return res;
}
-typedef struct _DIP_ele
-{
- struct _DIP_ele *next;
- u_long val;
-} DIP_ele;
-
int
SocketManager::ink_bind(int s, struct sockaddr *name, int namelen, short Proto)
{
Modified: trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc Tue Sep 21 23:13:36 2010
@@ -41,7 +41,7 @@ struct AIOCallback;
#define NO_ETHREAD_ID -1
EThread::EThread()
- : generator(time(NULL) ^ (long) this),
+ : generator((uint32)((uintptr_t)time(NULL) ^ (uintptr_t) this)),
ethreads_to_be_signalled(NULL),
n_ethreads_to_be_signalled(0),
main_accept_index(-1),
@@ -54,7 +54,7 @@ EThread::EThread()
}
EThread::EThread(ThreadType att, int anid)
- : generator(time(NULL) ^ (long) this),
+ : generator((uint32)((uintptr_t)time(NULL) ^ (uintptr_t) this)),
ethreads_to_be_signalled(NULL),
n_ethreads_to_be_signalled(0),
main_accept_index(-1),
@@ -90,7 +90,7 @@ EThread::EThread(ThreadType att, int ani
}
EThread::EThread(ThreadType att, Event * e, ink_sem * sem)
- : generator(time(NULL) ^ (long) this),
+ : generator((uint32)((uintptr_t)time(NULL) ^ (uintptr_t) this)),
ethreads_to_be_signalled(NULL),
n_ethreads_to_be_signalled(0),
main_accept_index(-1),
Modified: trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h Tue Sep 21 23:13:36 2010
@@ -67,7 +67,7 @@ public:
int send_bufsize;
/// Socket options for @c sockopt.
/// 0 => do not set options.
- unsigned long sockopt_flags;
+ uint32 sockopt_flags;
/// Transparency on related connection to origin server.
bool f_outbound_transparent;
/** Transparency on client (user agent) connection.
@@ -137,7 +137,7 @@ public:
sockaddr * bound_sockaddr = 0,
int *bound_sockaddr_size = 0,
int recv_bufsize = 0,
- int send_bufsize = 0, unsigned long sockopt_flag = 0, EventType etype = ET_NET);
+ int send_bufsize = 0, uint32 sockopt_flag = 0, EventType etype = ET_NET);
/**
Accepts incoming connections on port. Accept connections on port.
Modified: trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h Tue Sep 21 23:13:36 2010
@@ -127,11 +127,11 @@ struct NetVCOptions {
/// @note These are not identical to internal socket options but
/// specifically defined for configuration. These are mask values
/// and so must be powers of 2.
- unsigned long sockopt_flags;
+ uint32 sockopt_flags;
/// Value for TCP no delay for @c sockopt_flags.
- static unsigned long const SOCK_OPT_NO_DELAY = 1;
+ static uint32 const SOCK_OPT_NO_DELAY = 1;
/// Value for keep alive for @c sockopt_flags.
- static unsigned long const SOCK_OPT_KEEP_ALIVE = 2;
+ static uint32 const SOCK_OPT_KEEP_ALIVE = 2;
EventType etype;
Modified: trafficserver/traffic/trunk/iocore/net/P_NetAccept.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_NetAccept.h?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_NetAccept.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_NetAccept.h Tue Sep 21 23:13:36 2010
@@ -94,7 +94,7 @@ struct NetAccept:public Continuation
Ptr<NetAcceptAction> action_;
int recv_bufsize;
int send_bufsize;
- unsigned long sockopt_flags;
+ uint32 sockopt_flags;
EventType etype;
UnixNetVConnection *epoll_vc; // only storage for epoll events
EventIO ep;
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc?rev=999684&r1=999683&r2=999684&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc Tue Sep 21 23:13:36 2010
@@ -72,7 +72,7 @@ NetProcessor::accept(Continuation * cont
bool accept_only,
sockaddr * bound_sockaddr,
int *bound_sockaddr_size,
- int recv_bufsize, int send_bufsize, unsigned long sockopt_flags, EventType etype)
+ int recv_bufsize, int send_bufsize, uint32 sockopt_flags, EventType etype)
{
(void) listen_socket_in; // NT only
(void) accept_pool_size; // NT only