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 00:33:16 UTC
svn commit: r999675 - in /trafficserver/traffic/trunk: iocore/dns/
libinktomi++/
Author: jplevyak
Date: Tue Sep 21 22:33:15 2010
New Revision: 999675
URL: http://svn.apache.org/viewvc?rev=999675&view=rev
Log:
TS-228: first phase, cleanup "long" as its size can be ambiguous depending on the compiler
Modified:
trafficserver/traffic/trunk/iocore/dns/DNS.cc
trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc
trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h
trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
trafficserver/traffic/trunk/libinktomi++/MMH.cc
trafficserver/traffic/trunk/libinktomi++/Makefile.am
trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc
trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h
trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
trafficserver/traffic/trunk/libinktomi++/ink_resolver.h
trafficserver/traffic/trunk/libinktomi++/ink_resource.cc
trafficserver/traffic/trunk/libinktomi++/ink_string++.cc
trafficserver/traffic/trunk/libinktomi++/llqueue.cc
trafficserver/traffic/trunk/libinktomi++/test_atomic.cc
trafficserver/traffic/trunk/libinktomi++/test_freelist.cc
trafficserver/traffic/trunk/libinktomi++/test_memchr.cc
trafficserver/traffic/trunk/libinktomi++/test_strings.cc
Modified: trafficserver/traffic/trunk/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNS.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNS.cc Tue Sep 21 22:33:15 2010
@@ -159,7 +159,7 @@ DNSProcessor::dns_init()
if (dns_ns_rr && dns_ns_list) {
Debug("dns", "Nameserver list specified \"%s\"\n", dns_ns_list);
- unsigned long nameserver_ip[MAX_NAMED];
+ uint32 nameserver_ip[MAX_NAMED];
int nameserver_port[MAX_NAMED];
int i, j;
char *last, *ndx;
@@ -1351,7 +1351,7 @@ dns_process(DNSHandler * handler, HostEn
short int type, cls;
GETSHORT(type, cp);
GETSHORT(cls, cp); // NOTE: Don't eliminate this, it'll break badly.
- GETLONG(temp_ttl, cp);
+ GETLONG(temp_ttl, cp); // NOTE: this is not a "long" but 32-bits (from nameser_compat.h)
if ((temp_ttl < buf->ttl) || (buf->ttl == 0))
buf->ttl = temp_ttl;
GETSHORT(n, cp);
@@ -1454,8 +1454,7 @@ dns_process(DNSHandler * handler, HostEn
buflen -= nn;
}
// attempt to use the original buffer (if it is word aligned)
- // FIXME: is this alignment check correct?
- if (!(((unsigned long) cp) % sizeof(unsigned int))) {
+ if (!(((uintptr_t) cp) % sizeof(unsigned int))) {
*hap++ = cp;
cp += n;
} else {
Modified: trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc Tue Sep 21 22:33:15 2010
@@ -47,7 +47,7 @@
//
DNSConnection::DNSConnection():
- fd(NO_FD), num(0), generator(time(NULL) ^ (long) this)
+ fd(NO_FD), num(0), generator((uint32)((uintptr_t)time(NULL) ^ (uintptr_t) this))
{
memset(&sa, 0, sizeof(struct sockaddr_in));
}
Modified: trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h Tue Sep 21 22:33:15 2010
@@ -68,7 +68,7 @@ extern unsigned int dns_sequence_number;
#define DNS_SEQUENCE_NUMBER_RESTART_OFFSET 4000
#define DNS_PRIMARY_RETRY_PERIOD HRTIME_SECONDS(5)
#define DNS_PRIMARY_REOPEN_PERIOD HRTIME_SECONDS(60)
-#define BAD_DNS_RESULT ((HostEnt*)(long)-1)
+#define BAD_DNS_RESULT ((HostEnt*)(uintptr_t)-1)
#define DEFAULT_NUM_TRY_SERVER 8
// these are from nameser.h
@@ -306,7 +306,7 @@ TS_INLINE DNSHandler::DNSHandler()
n_con(0),
options(0),
in_flight(0), name_server(0), in_write_dns(0), hostent_cache(0), last_primary_retry(0), last_primary_reopen(0),
- m_res(0), txn_lookup_timeout(0), generator(time(NULL) ^ (long) this)
+ m_res(0), txn_lookup_timeout(0), generator((uint32)((uintptr_t)time(NULL) ^ (uintptr_t)this))
{
for (int i = 0; i < MAX_NAMED; i++) {
ifd[i] = -1;
Modified: trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h Tue Sep 21 22:33:15 2010
@@ -167,7 +167,7 @@ TS_INLINE bool SplitDNSConfig::isSplitDN
-------------------------------------------------------------- */
struct DNSServer
{
- unsigned long x_server_ip[MAXNS];
+ unsigned int x_server_ip[MAXNS];
char x_dns_ip_line[MAXDNAME * 2];
char x_def_domain[MAXDNAME];
Modified: trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc Tue Sep 21 22:33:15 2010
@@ -662,7 +662,7 @@ SplitDNSRecord::Init(matcher_line * line
&m_servers.x_def_domain[0], &m_servers.x_domain_srch_list[0]))) {
snprintf(errBuf, errBufLen,
- "Failed to build res record for the servers %lu ... on port %d",
+ "Failed to build res record for the servers %u ... on port %d",
m_servers.x_server_ip[0], m_servers.x_dns_server_port[0]);
return errBuf;
Modified: trafficserver/traffic/trunk/libinktomi++/MMH.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/MMH.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/MMH.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/MMH.cc Tue Sep 21 22:33:15 2010
@@ -338,7 +338,7 @@ ink_code_incr_MMH_update(MMH_CTX * ctx,
}
{
// check alignment
- int alignment = (long) in & 0x3;
+ int alignment = (int)((intptr_t) in & 0x3);
if (alignment) {
#if defined(_BIG_ENDIAN)
#define big_endian 1
Modified: trafficserver/traffic/trunk/libinktomi++/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Makefile.am?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Makefile.am (original)
+++ trafficserver/traffic/trunk/libinktomi++/Makefile.am Tue Sep 21 22:33:15 2010
@@ -117,7 +117,6 @@ libinktomi___a_SOURCES = \
I_Version.h \
List.h \
llqueue.cc \
- llqueue.h \
lockfile.cc \
MatcherUtils.cc \
MatcherUtils.h \
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc Tue Sep 21 22:33:15 2010
@@ -138,7 +138,7 @@ int64_to_str(char *buf, unsigned int buf
int
-squid_timestamp_to_buf(char *buf, unsigned int buf_size, long timestamp_sec, long timestamp_usec)
+squid_timestamp_to_buf(char *buf, uint32 buf_size, uint64 timestamp_sec, uint64 timestamp_usec)
{
int res;
const int tmp_buf_size = 32;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.h?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h Tue Sep 21 22:33:15 2010
@@ -35,9 +35,9 @@
#include "ink_assert.h"
#include "Compatability.h"
-int squid_timestamp_to_buf(char *buf, unsigned int buf_size, long timestamp_sec, long timestamp_usec);
-char *int64_to_str(char *buf, unsigned int buf_size, int64 val,
- unsigned int *total_chars, unsigned int req_width, char pad_char);
+int squid_timestamp_to_buf(char *buf, uint32 buf_size, uint64 timestamp_sec, uint64 timestamp_usec);
+char *int64_to_str(char *buf, int32 buf_size, int64 val,
+ uint32 *total_chars, uint32 req_width, char pad_char);
#ifdef NEED_HRTIME
#include <time.h>
@@ -66,11 +66,11 @@ hrtime_rdtsc()
asm volatile (".byte 0x0f, 0x31":"=A" (rv));
return (rv);
}
-static inline unsigned long long
+static inline uint64
get_hrtime_rdtsc()
{
// do it fixed point if you have better hardware support
- return (unsigned long long) (hrtime_freq_float * hrtime_rdtsc());
+ return (uint64) (hrtime_freq_float * hrtime_rdtsc());
}
#endif
@@ -219,8 +219,8 @@ ink_hrtime_to_timeval(ink_hrtime t)
struct timeval tv;
usecs = ink_hrtime_to_usec(t);
- tv.tv_sec = (long) (usecs / 1000000);
- tv.tv_usec = (long) (usecs % 1000000);
+ tv.tv_sec = usecs / 1000000;
+ tv.tv_usec = usecs % 1000000;
return (tv);
}
@@ -228,8 +228,8 @@ static inline int
ink_hrtime_to_timeval2(ink_hrtime t, struct timeval *tv)
{
int64 usecs = ink_hrtime_to_usec(t);
- tv->tv_sec = (long) (usecs / 1000000);
- tv->tv_usec = (long) (usecs % 1000000);
+ tv->tv_sec = usecs / 1000000;
+ tv->tv_usec = usecs % 1000000;
return 0;
}
@@ -319,7 +319,7 @@ ink_based_hrtime_to_timespec(ink_hrtime
{
timespec ts;
ts.tv_sec = (time_t) (t / HRTIME_SECOND);
- ts.tv_nsec = (long) (t % HRTIME_SECOND);
+ ts.tv_nsec = (t % HRTIME_SECOND);
return ts;
}
Modified: trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_llqueue.h?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_llqueue.h Tue Sep 21 22:33:15 2010
@@ -43,8 +43,8 @@ typedef struct llqrec_s
typedef struct llq_s
{
LLQrec * head, *tail, *free;
- unsigned long len, highwater;
- ink_mutex mux;
+ uint64 len, highwater;
+ ink_mutex mux;
#if defined(darwin)
ink_sem *sema;
#else /* !darwin */
@@ -56,8 +56,8 @@ LLQ *create_queue(void);
int enqueue(LLQ * q, void *data);
void *dequeue(LLQ * q);
int queue_is_empty(LLQ * q);
-unsigned long queue_len(LLQ * Q);
-unsigned long queue_highwater(LLQ * Q);
+uint64 queue_len(LLQ * Q);
+uint64 queue_highwater(LLQ * Q);
void delete_queue(LLQ * Q); /* only deletes an empty queue but
provides symmetry. */
Modified: trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_res_init.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc Tue Sep 21 22:33:15 2010
@@ -424,7 +424,7 @@ ink_res_get_nibblesuffix2(ink_res_state
*/
/*% This function has to be reachable by res_data.c but not publically. */
int
-ink_res_init(ink_res_state statp, unsigned long *pHostList, int *pPort, char *pDefDomain, char *pSearchList) {
+ink_res_init(ink_res_state statp, unsigned int *pHostList, int *pPort, char *pDefDomain, char *pSearchList) {
register FILE *fp;
register char *cp, **pp;
register int n;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_resolver.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_resolver.h?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_resolver.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_resolver.h Tue Sep 21 22:33:15 2010
@@ -255,7 +255,7 @@ struct __ink_res_state_ext {
};
-int ink_res_init(ink_res_state, unsigned long *pHostList,
+int ink_res_init(ink_res_state, unsigned int *pHostList,
int *pPort = 0, char *pDefDomain = 0, char *pSearchList = 0);
int ink_res_mkquery(ink_res_state, int, const char *, int, int,
const unsigned char *, int, const unsigned char *, unsigned char *, int);
Modified: trafficserver/traffic/trunk/libinktomi++/ink_resource.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_resource.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_resource.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_resource.cc Tue Sep 21 22:33:15 2010
@@ -143,7 +143,7 @@ res_hash(const char *s)
unsigned int h;
unsigned int ibp;
- ink_assert(!((long) s & 3));
+ ink_assert(!((uintptr_t) s & 3));
for (h = 0;;) {
ibp = *(unsigned int *) s;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_string++.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string%2B%2B.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string++.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string++.cc Tue Sep 21 22:33:15 2010
@@ -44,7 +44,7 @@ ink_memchr(const void *as, int ac, size_
// initial segment
- int i_len = ((unsigned long) 8 - (unsigned long) as) & 7;
+ int i_len = (int)(((uintptr_t) 8 - (uintptr_t) as) & 7);
// too short to concern us
Modified: trafficserver/traffic/trunk/libinktomi++/llqueue.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/llqueue.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/llqueue.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/llqueue.cc Tue Sep 21 22:33:15 2010
@@ -32,7 +32,7 @@
#include <limits.h>
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include "llqueue.h"
+#include "ink_llqueue.h"
#include "errno.h"
#define RECORD_CHUNK 1024
@@ -158,10 +158,10 @@ enqueue(LLQ * Q, void *data)
return 1;
}
-unsigned long
+uint64
queue_len(LLQ * Q)
{
- unsigned long len;
+ uint64 len;
/* Do I really need to grab the lock here? */
/* ink_mutex_acquire(&(Q->mux)); */
@@ -170,10 +170,10 @@ queue_len(LLQ * Q)
return len;
}
-unsigned long
+uint64
queue_highwater(LLQ * Q)
{
- unsigned long highwater;
+ uint64 highwater;
/* Do I really need to grab the lock here? */
/* ink_mutex_acquire(&(Q->mux)); */
@@ -206,7 +206,7 @@ queue_highwater(LLQ * Q)
int
queue_is_empty(LLQ * Q)
{
- unsigned long len;
+ uint64 len;
len = queue_len(Q);
Modified: trafficserver/traffic/trunk/libinktomi++/test_atomic.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_atomic.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_atomic.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_atomic.cc Tue Sep 21 22:33:15 2010
@@ -63,7 +63,7 @@ volatile int al_done = 0;
void *
testalist(void *ame)
{
- int me = (int) (long) ame;
+ int me = (int) (uintptr_t) ame;
int j, k;
for (k = 0; k < MAX_ALIST_ARRAY; k++)
ink_atomiclist_push(&al[k % MAX_ALIST_TEST], &al_test[me][k]);
Modified: trafficserver/traffic/trunk/libinktomi++/test_freelist.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_freelist.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_freelist.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_freelist.cc Tue Sep 21 22:33:15 2010
@@ -50,7 +50,7 @@ test(void *d)
m3 = ink_freelist_new(flist);
if ((m1 == m2) || (m1 == m3) || (m2 == m3)) {
- printf("0x%08lx 0x%08lx 0x%08lx\n", (long) m1, (long) m2, (long) m3);
+ printf("0x%08llx 0x%08llx 0x%08llx\n", (uint64)(uintptr_t) m1, (uint64)(uintptr_t) m2, (uint64)(uintptr_t) m3);
exit(1);
}
Modified: trafficserver/traffic/trunk/libinktomi++/test_memchr.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_memchr.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_memchr.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_memchr.cc Tue Sep 21 22:33:15 2010
@@ -35,7 +35,7 @@ ink_memchr(const void *as, int ac, size_
// initial segment
- int i_len = ((unsigned long) 8 - (unsigned long) as) & 7;
+ int i_len = (int)(((uintptr_t) 8 - (uintptr_t) as) & 7);
// too short to concern us
Modified: trafficserver/traffic/trunk/libinktomi++/test_strings.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_strings.cc?rev=999675&r1=999674&r2=999675&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_strings.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_strings.cc Tue Sep 21 22:33:15 2010
@@ -257,7 +257,7 @@ ink_memchr(const void *as, int ac, size_
// initial segment
- int i_len = ((unsigned long) 8 - (unsigned long) as) & 7;
+ int i_len = (int)(((uintptr_t) 8 - (uintptr_t) as) & 7);
// too short to concern us