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/05/19 23:06:42 UTC
svn commit: r946395 [5/8] - in /trafficserver/traffic/trunk:
example/app-template/ iocore/aio/ iocore/block-cache/ iocore/cache/
iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/hostdb/
iocore/hostdb/include/ iocore/net/ iocore/utils/ libinktomi+...
Modified: trafficserver/traffic/trunk/libinktomi++/ink_queue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_queue.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_queue.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_queue.h Wed May 19 21:06:35 2010
@@ -77,10 +77,10 @@ extern "C"
struct
{
void *pointer;
- ink32 version;
+ int32 version;
} s;
#endif
- ink64 data;
+ int64 data;
} head_p;
/*
@@ -139,23 +139,23 @@ extern "C"
#endif
const char *name;
- inku32 type_size, chunk_size, count, allocated, offset, alignment;
- inku32 allocated_base, count_base;
+ uint32 type_size, chunk_size, count, allocated, offset, alignment;
+ uint32 allocated_base, count_base;
} InkFreeList, *PInkFreeList;
- inkcoreapi extern volatile ink64 fastalloc_mem_in_use;
- inkcoreapi extern volatile ink64 fastalloc_mem_total;
- inkcoreapi extern volatile ink64 freelist_allocated_mem;
+ inkcoreapi extern volatile int64 fastalloc_mem_in_use;
+ inkcoreapi extern volatile int64 fastalloc_mem_total;
+ inkcoreapi extern volatile int64 freelist_allocated_mem;
/*
* alignment must be a power of 2
*/
- InkFreeList *ink_freelist_create(const char *name, inku32 type_size,
- inku32 chunk_size, inku32 offset_to_next, inku32 alignment);
+ InkFreeList *ink_freelist_create(const char *name, uint32 type_size,
+ uint32 chunk_size, uint32 offset_to_next, uint32 alignment);
inkcoreapi void ink_freelist_init(InkFreeList * fl, const char *name,
- inku32 type_size, inku32 chunk_size,
- inku32 offset_to_next, inku32 alignment);
+ uint32 type_size, uint32 chunk_size,
+ uint32 offset_to_next, uint32 alignment);
#if !defined(INK_USE_MUTEX_FOR_FREELISTS)
inkcoreapi void *ink_freelist_new(InkFreeList * f);
inkcoreapi void ink_freelist_free(InkFreeList * f, void *item);
@@ -189,7 +189,7 @@ extern "C"
#endif
volatile head_p head;
const char *name;
- inku32 offset;
+ uint32 offset;
} InkAtomicList;
#if !defined(INK_QUEUE_NT)
@@ -199,7 +199,7 @@ extern "C"
#define INK_ATOMICLIST_EMPTY(_x) (!( (FREELIST_POINTER((_x.head)))))
#endif
- inkcoreapi void ink_atomiclist_init(InkAtomicList * l, const char *name, inku32 offset_to_next);
+ inkcoreapi void ink_atomiclist_init(InkAtomicList * l, const char *name, uint32 offset_to_next);
#if !defined(INK_USE_MUTEX_FOR_ATOMICLISTS)
inkcoreapi void *ink_atomiclist_push(InkAtomicList * l, void *item);
void *ink_atomiclist_pop(InkAtomicList * l);
Added: trafficserver/traffic/trunk/libinktomi++/ink_queue_utils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_queue_utils.cc?rev=946395&view=auto
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_queue_utils.cc (added)
+++ trafficserver/traffic/trunk/libinktomi++/ink_queue_utils.cc Wed May 19 21:06:35 2010
@@ -0,0 +1,81 @@
+/** @file
+
+ A brief file description
+
+ @section license License
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#include "ink_config.h"
+#include <assert.h>
+
+#include "ink_atomic.h"
+#include "ink_unused.h"
+#include "ink_queue.h"
+
+/*
+ * This file was added during the debugging of Bug 50475.
+ * It was found that a race condition was introduced on the sparc architecture
+ * when the ink_queue.c file was moved over to ink_queue.cc. Debugging this
+ * problem resulted in the discovery that gcc was spitting out the
+ * "ldd" (load double) instruction for loading of the 64 bit field "data"
+ * while CC was spitting out two "ld" (load) instructions. The old code
+ * was calling item.data = head.data on sparcs and not putting any restriction
+ * on the order of loading of the fields.
+ *
+ * This is a problem on the sparcs because the "pointer" field was being loaded
+ * before the "version" field. This can result in a very subtle race condition
+ * which subverts the addition of the "version" field.
+ *
+ * Take this scenario
+ * item.ptr = head.ptr
+ * (call to ink_freelist_new )
+ * next.ptr = *(item.ptr) <---- Error
+ * (call to ink_freelist_free )
+ * item.version = head.version
+ * next.version = item.version ++;
+ * cas64(head, item, next)
+
+ * Note, that the cas64 call will be succesful and the next.ptr will probably
+ * be a pointer into the vtable entry. The next alloc will result in a write into
+ * the vtable area.
+ *
+ * The fix for this problem is to read the version before reading the pointer
+ * on 32 bit architectures (currently everything other than alphas). This is
+ * done using the following function. This file only contains one function
+ * to make looking at the assembly code simple.
+ *
+ * If you ever change the compiler or the compiler options to this file, make
+ * sure you look at the assembly generated to see if the version is read first.
+ * Also, make sure that you run the test_freelist microbenchmark for at least
+ * 24 hours on a dual processor box.
+ */
+
+void
+ink_queue_load_64(void *dst, void *src)
+{
+#if defined(__i386__)
+ int32 src_version = (*(head_p *) src).s.version;
+ void *src_pointer = (*(head_p *) src).s.pointer;
+
+ (*(head_p *) dst).s.version = src_version;
+ (*(head_p *) dst).s.pointer = src_pointer;
+#else
+ *(void**)dst = *(void**)src;
+#endif
+}
Modified: trafficserver/traffic/trunk/libinktomi++/ink_rand.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_rand.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_rand.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_rand.cc Wed May 19 21:06:35 2010
@@ -62,7 +62,7 @@
#define mixBits(u, v) (hiBit(u)|loBits(v)) // move hi bit of u to hi bit of v
-InkRand::InkRand(inku32 d)
+InkRand::InkRand(uint32 d)
{
seed(d);
next = state + 1; // settting next to the same as reload()
@@ -123,17 +123,17 @@ InkRand::InkRand(inku32 d)
*/
void
-InkRand::seed(inku32 d)
+InkRand::seed(uint32 d)
{
- register inku32 x = (d | 1U) & 0xFFFFFFFFU, *s = state;
+ register uint32 x = (d | 1U) & 0xFFFFFFFFU, *s = state;
register int j;
for (left = 0, *s++ = x, j = N; --j; *s++ = (x *= 69069U) & 0xFFFFFFFFU);
}
-inku32 InkRand::random()
+uint32 InkRand::random()
{
- inku32
+ uint32
y;
if (--left < 0)
@@ -153,9 +153,9 @@ InkRand::drandom()
// return ((double) random () / (double) 0xffffffff);
}
-inku32 InkRand::reload()
+uint32 InkRand::reload()
{
- register inku32 *
+ register uint32 *
p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
register int
j;
@@ -176,8 +176,8 @@ inku32 InkRand::reload()
}
int
-ink_rand_r(inku32 * p)
+ink_rand_r(uint32 * p)
{
- return (((*p) = (*p) * 1103515245 + 12345) % ((inku32) 0x7fffffff + 1));
+ return (((*p) = (*p) * 1103515245 + 12345) % ((uint32) 0x7fffffff + 1));
}
Modified: trafficserver/traffic/trunk/libinktomi++/ink_rand.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_rand.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_rand.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_rand.h Wed May 19 21:06:35 2010
@@ -60,18 +60,18 @@
class InkRand
{
public:
- InkRand(inku32 d);
+ InkRand(uint32 d);
- void seed(inku32 d);
- inkcoreapi inku32 random();
+ void seed(uint32 d);
+ inkcoreapi uint32 random();
double drandom();
private:
- inku32 reload();
+ uint32 reload();
private:
- inku32 state[624 + 1]; // N+1...N is specifed as 624 in inkrand.cc
- inku32 *next;
+ uint32 state[624 + 1]; // N+1...N is specifed as 624 in inkrand.cc
+ uint32 *next;
int left;
};
Modified: trafficserver/traffic/trunk/libinktomi++/ink_resource.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_resource.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_resource.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_resource.cc Wed May 19 21:06:35 2010
@@ -29,7 +29,7 @@
#include "ink_resource.h"
#include "ink_stack_trace.h"
-volatile ink64 resource_allocated_mem = 0;
+volatile int64 resource_allocated_mem = 0;
volatile int res_track_memory = RES_TRACK_MEMORY_DEFAULT;
#ifdef TRACK_MEMORY
@@ -75,10 +75,10 @@ volatile int res_zorch_mem = 0;
volatile int res_fence_post = 0;
#define res_memadd(_x_) \
- ink_atomic_increment64(&resource_allocated_mem, (ink64) (_x_));
+ ink_atomic_increment64(&resource_allocated_mem, (int64) (_x_));
#define res_memsub(_x_) \
- ink_atomic_increment64(&resource_allocated_mem, (ink64) -(_x_));
+ ink_atomic_increment64(&resource_allocated_mem, (int64) -(_x_));
static int
_xres_init()
@@ -234,7 +234,7 @@ res_lookup(const char *path)
-------------------------------------------------------------------------*/
static Resource *
-res_stat(const char *path, ink64 value)
+res_stat(const char *path, int64 value)
{
if (path) {
Resource *res;
@@ -319,7 +319,7 @@ _xfree(void *ptr)
if (info->res) {
res_check(info->res);
- res_inc(info->res, -((ink64) info->size));
+ res_inc(info->res, -((int64) info->size));
}
mem = (char *) info;
@@ -457,7 +457,7 @@ _xrealloc(void *ptr, unsigned int size,
if (info->res) {
res_check(info->res);
- res_inc(info->res, -((ink64) info->size));
+ res_inc(info->res, -((int64) info->size));
}
mem = (char *) info;
@@ -537,7 +537,7 @@ _xtrack(void *ptr, const char *path)
if (info->res) {
res_check(info->res);
- res_inc(info->res, -((ink64) info->size));
+ res_inc(info->res, -((int64) info->size));
}
if (res_track_memory) {
@@ -571,8 +571,8 @@ void
xdump_to_file_baseline_rel(FILE * fp)
{
Resource *res;
- ink64 value;
- ink64 diff;
+ int64 value;
+ int64 diff;
int i;
struct timeval timestamp;
char time_string[32], *time_str;
@@ -613,8 +613,8 @@ void
xdump_to_file(FILE * fp)
{
Resource *res;
- ink64 value;
- ink64 diff;
+ int64 value;
+ int64 diff;
int i;
struct timeval timestamp;
char time_string[32], *time_str;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_resource.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_resource.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_resource.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_resource.h Wed May 19 21:06:35 2010
@@ -32,7 +32,7 @@
#include "ink_port.h"
#include "ink_memory.h"
-extern volatile ink64 resource_allocated_mem;
+extern volatile int64 resource_allocated_mem;
extern volatile int res_track_memory; /* set this to zero to disable resource tracking */
#define __RES_PATH(x) #x
@@ -46,9 +46,9 @@ struct Resource
void *magic;
struct Resource *next;
const char *path;
- ink64 value;
- ink64 snapshot;
- ink64 baseline;
+ int64 value;
+ int64 snapshot;
+ int64 baseline;
};
//#define TRACK_MEMORY
Modified: trafficserver/traffic/trunk/libinktomi++/ink_sock.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_sock.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_sock.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_sock.cc Wed May 19 21:06:35 2010
@@ -238,19 +238,19 @@ fd_read_line(int fd, char *s, int len)
int
-ink_close_socket(int s)
+close_socket(int s)
{
return close(s);
}
int
-ink_write_socket(int s, const char *buffer, int length)
+write_socket(int s, const char *buffer, int length)
{
return write(s, (const void *) buffer, length);
}
int
-ink_read_socket(int s, char *buffer, int length)
+read_socket(int s, char *buffer, int length)
{
return read(s, (void *) buffer, length);
}
Modified: trafficserver/traffic/trunk/libinktomi++/ink_sock.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_sock.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_sock.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_sock.h Wed May 19 21:06:35 2010
@@ -56,11 +56,11 @@ int read_ready(int fd);
char fd_read_char(int fd);
int fd_read_line(int fd, char *s, int len);
-int ink_close_socket(int s);
-int ink_write_socket(int s, const char *buffer, int length);
-int ink_read_socket(int s, char *buffer, int length);
+int close_socket(int s);
+int write_socket(int s, const char *buffer, int length);
+int read_socket(int s, char *buffer, int length);
-inkcoreapi inku32 ink_inet_addr(const char *s);
+inkcoreapi uint32 ink_inet_addr(const char *s);
#endif /* _ink_sock_h_ */
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=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string++.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string++.cc Wed May 19 21:06:35 2010
@@ -94,15 +94,15 @@ ink_memchr(const void *as, int ac, size_
s += 4;
}
// next 8x bytes
- inku64 m = 0x7efefefefefefeffLL;
- inku64 b = ((inku64) ib);
+ uint64 m = 0x7efefefefefefeffLL;
+ uint64 b = ((uint64) ib);
b |= (b << 32);
- inku64 *p = (inku64 *) s;
+ uint64 *p = (uint64 *) s;
unsigned int n = (unsigned int) ((((unsigned int) an) - (s - (unsigned char *) as)) >> 3);
- inku64 *end = p + n;
+ uint64 *end = p + n;
while (p < end) {
- inku64 bp = *p;
- inku64 bb = bp ^ b;
+ uint64 bp = *p;
+ uint64 bb = bp ^ b;
bb = ((bb + m) ^ ~bb) & ~m;
if (bb) {
s = (unsigned char *) p;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_time.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_time.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_time.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_time.cc Wed May 19 21:06:35 2010
@@ -49,13 +49,13 @@ int getrusage(int who, struct rusage *ru
/*---------------------------------------------------------------------------*
- inku64 microseconds(which)
+ uint64 microseconds(which)
returns microsecond-resolution clock info
*---------------------------------------------------------------------------*/
-inku64
+uint64
ink_microseconds(int which)
{
struct timeval tp;
Modified: trafficserver/traffic/trunk/libinktomi++/ink_time.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_time.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_time.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_time.h Wed May 19 21:06:35 2010
@@ -70,7 +70,7 @@ typedef struct
#define MICRO_SYS 2
#define MICRO_REAL 3
-inku64 ink_microseconds(int which);
+uint64 ink_microseconds(int which);
double ink_time_wall_seconds();
int ink_time_gmt_string_to_tm(char *string, struct tm *bdt);
Modified: trafficserver/traffic/trunk/libinktomi++/load_http_hdr.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/load_http_hdr.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/load_http_hdr.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/load_http_hdr.cc Wed May 19 21:06:35 2010
@@ -53,7 +53,7 @@ enum hdr_type
};
void walk_mime_field(MIMEField f);
-void walk_mstring(MBuffer * bufp, ink32 offset);
+void walk_mstring(MBuffer * bufp, int32 offset);
void walk_mbuffer(MBuffer * bufp);
void print_http_info_impl(HTTPInfo hi);
void print_http_hdr_impl(HTTPHdr h);
@@ -319,13 +319,13 @@ walk_mbuffer(MBuffer * bufp)
}
void
-walk_mstring(MBuffer * bufp, ink32 offset)
+walk_mstring(MBuffer * bufp, int32 offset)
{
int bufindex = 0;
int dumpoffset = 0;
char fbuf[4096];
-// ink32 soffset = field_offset;
+// int32 soffset = field_offset;
// soffset <<= MARSHAL_ALIGNMENT;
// printf("offset: %d. shifted field_offset: %d\n",
// field_offset, soffset);
@@ -344,7 +344,7 @@ walk_mime_field(MIMEField f)
int dumpoffset = 0;
char fbuf[4096];
-// ink32 soffset = field_offset;
+// int32 soffset = field_offset;
// soffset <<= MARSHAL_ALIGNMENT;
// printf("offset: %d. shifted field_offset: %d\n",
// field_offset, soffset);
@@ -369,7 +369,7 @@ walk_http_resp_hdr(HTTPHdr resp)
return;
}
- ink16 field_offset = r->m_fields_offset;
+ int16 field_offset = r->m_fields_offset;
while (field_offset != MARSHAL_NULL_OFFSET) {
MIMEFieldImpl *f = MIMEFieldPtr(resp.m_buffer, field_offset);
Modified: trafficserver/traffic/trunk/libinktomi++/test_atomic.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_atomic.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_atomic.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_atomic.cc Wed May 19 21:06:35 2010
@@ -161,11 +161,11 @@ int
main(int argc, const char *argv[])
{
#ifndef LONG_ATOMICLIST_TEST
- ink32 m = 1, n = 100;
- //ink64 lm = 1LL, ln = 100LL;
+ int32 m = 1, n = 100;
+ //int64 lm = 1LL, ln = 100LL;
char *m2 = "hello", *n2;
- printf("sizeof(ink32)==%d sizeof(void *)==%d\n", (int)sizeof(ink32), (int)sizeof(void *));
+ printf("sizeof(int32)==%d sizeof(void *)==%d\n", (int)sizeof(int32), (int)sizeof(void *));
printf("CAS: %d == 1 then 2\n", m);
Modified: trafficserver/traffic/trunk/libinktomi++/test_memchr.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_memchr.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_memchr.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_memchr.cc Wed May 19 21:06:35 2010
@@ -22,7 +22,7 @@
*/
#include <stdio.h>
-typedef unsigned long long inku64;
+typedef unsigned long long uint64;
//
// fast memchr
@@ -84,15 +84,15 @@ ink_memchr(const void *as, int ac, size_
s += 4;
}
// next 8x bytes
- inku64 m = 0x7efefefefefefeffLL;
- inku64 b = ((inku64) ib);
+ uint64 m = 0x7efefefefefefeffLL;
+ uint64 b = ((uint64) ib);
b |= (b << 32);
- inku64 *p = (inku64 *) s;
+ uint64 *p = (uint64 *) s;
unsigned int n = (((unsigned int) an) - (s - (unsigned char *) as)) >> 3;
- inku64 *end = p + n;
+ uint64 *end = p + n;
while (p < end) {
- inku64 bp = *p;
- inku64 bb = bp ^ b;
+ uint64 bp = *p;
+ uint64 bb = bp ^ b;
bb = ((bb + m) ^ ~bb) & ~m;
if (bb) {
s = (unsigned char *) p;
Modified: trafficserver/traffic/trunk/libinktomi++/test_strings.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_strings.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_strings.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_strings.cc Wed May 19 21:06:35 2010
@@ -244,7 +244,7 @@ main(int argc, char *argv[])
strcpy_tests();
}
-typedef unsigned long long inku64;
+typedef unsigned long long uint64;
//
// fast memchr
@@ -306,15 +306,15 @@ ink_memchr(const void *as, int ac, size_
s += 4;
}
// next 8x bytes
- inku64 m = 0x7efefefefefefeffLL;
- inku64 b = ((inku64) ib);
+ uint64 m = 0x7efefefefefefeffLL;
+ uint64 b = ((uint64) ib);
b |= (b << 32);
- inku64 *p = (inku64 *) s;
+ uint64 *p = (uint64 *) s;
unsigned int n = (((unsigned int) an) - (s - (unsigned char *) as)) >> 3;
- inku64 *end = p + n;
+ uint64 *end = p + n;
while (p < end) {
- inku64 bp = *p;
- inku64 bb = bp ^ b;
+ uint64 bp = *p;
+ uint64 bb = bp ^ b;
bb = ((bb + m) ^ ~bb) & ~m;
if (bb) {
s = (unsigned char *) p;
Modified: trafficserver/traffic/trunk/librecords/I_RecCore.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/I_RecCore.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/I_RecCore.h (original)
+++ trafficserver/traffic/trunk/librecords/I_RecCore.h Wed May 19 21:06:35 2010
@@ -82,8 +82,8 @@ int RecRegisterConfigCounter(RecT rec_ty
int RecLinkConfigInt(const char *name, RecInt * rec_int);
int RecLinkConfigLLong(const char *name, RecLLong * rec_llong);
-int RecLinkConfigInk32(const char *name, ink32 * p_ink32);
-int RecLinkConfigInkU32(const char *name, inku32 * p_inku32);
+int RecLinkConfigInk32(const char *name, int32 * p_int32);
+int RecLinkConfigInkU32(const char *name, uint32 * p_uint32);
int RecLinkConfigFloat(const char *name, RecFloat * rec_float);
int RecLinkConfigCounter(const char *name, RecCounter * rec_counter);
int RecLinkConfigString(const char *name, RecString * rec_string);
@@ -156,7 +156,7 @@ void RecSignalAlarm(int, const char *);
#define REC_ReadConfigInt32(_var,_config_var_name) do { \
RecInt tmp = 0; \
RecGetRecordInt(_config_var_name, (RecInt*) &tmp); \
- _var = (ink32)tmp; \
+ _var = (int32)tmp; \
} while (0)
#define REC_ReadConfigInteger(_var,_config_var_name) do { \
@@ -198,12 +198,12 @@ void RecSignalAlarm(int, const char *);
#define REC_EstablishStaticConfigInt32(_var, _config_var_name) do { \
RecLinkConfigInk32(_config_var_name, &_var); \
- _var = (ink32)REC_ConfigReadInteger(_config_var_name); \
+ _var = (int32)REC_ConfigReadInteger(_config_var_name); \
} while (0)
#define REC_EstablishStaticConfigInt32U(_var, _config_var_name) do { \
RecLinkConfigInkU32(_config_var_name, &_var); \
- _var = (ink32)REC_ConfigReadInteger(_config_var_name); \
+ _var = (int32)REC_ConfigReadInteger(_config_var_name); \
} while (0)
#define REC_EstablishStaticConfigStringAlloc(_var, _config_var_name) do { \
@@ -237,7 +237,7 @@ RecString REC_readString(const char *nam
bool REC_setInteger(const char *name, int value, bool dirty = true);
bool REC_setLLong(const char *name, RecLLong value, bool dirty = true);
bool REC_setFloat(const char *name, float value, bool dirty = true);
-bool REC_setCounter(const char *name, ink64 value, bool dirty = true);
+bool REC_setCounter(const char *name, int64 value, bool dirty = true);
bool REC_setString(const char *name, char *value, bool dirty = true);
//------------------------------------------------------------------------
Modified: trafficserver/traffic/trunk/librecords/I_RecDefs.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/I_RecDefs.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/I_RecDefs.h (original)
+++ trafficserver/traffic/trunk/librecords/I_RecDefs.h Wed May 19 21:06:35 2010
@@ -47,12 +47,12 @@ enum RecErrT
#define RecStringNull NULL
-typedef ink64 RecInt;
-typedef ink64 RecLLong;
+typedef int64 RecInt;
+typedef int64 RecLLong;
typedef float RecFloat;
typedef char *RecString;
typedef const char *RecStringConst;
-typedef ink64 RecCounter;
+typedef int64 RecCounter;
enum RecT
{
@@ -140,13 +140,13 @@ union RecData
struct RecRawStat
{
- ink64 sum;
- ink64 count;
+ int64 sum;
+ int64 count;
// XXX - these will waist some space because they are only needed for the globals
// this is a fix for bug TS-162, so I am trying to do as few code changes as
// possible, this should be revisted -bcall
- ink64 last_sum; // value from the last global sync
- ink64 last_count; // value from the last global sync
+ int64 last_sum; // value from the last global sync
+ int64 last_count; // value from the last global sync
};
// WARNING! It's advised that developers do not modify the contents of
@@ -154,7 +154,7 @@ struct RecRawStat
struct RecRawStatBlock
{
- ink_off_t ethr_stat_offset; // thread local raw-stat storage
+ off_t ethr_stat_offset; // thread local raw-stat storage
RecRawStat **global; // global raw-stat storage (ptr to RecRecord)
int num_stats; // number of stats in this block
int max_stats; // maximum number of stats for this block
Modified: trafficserver/traffic/trunk/librecords/I_RecProcess.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/I_RecProcess.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/I_RecProcess.h (original)
+++ trafficserver/traffic/trunk/librecords/I_RecProcess.h Wed May 19 21:06:35 2010
@@ -72,35 +72,35 @@ int RecRawStatSyncMHrTimeAvg(const char
// Note: The following RecIncrRawStatXXX calls are fast and don't
// require any ink_atomic_xxx64()'s to be executed. Use these RawStat
// functions over other RawStat functions whenever possible.
-inline int RecIncrRawStat(RecRawStatBlock * rsb, EThread * ethread, int id, ink64 incr = 1);
-inline int RecIncrRawStatSum(RecRawStatBlock * rsb, EThread * ethread, int id, ink64 incr = 1);
-inline int RecIncrRawStatCount(RecRawStatBlock * rsb, EThread * ethread, int id, ink64 incr = 1);
+inline int RecIncrRawStat(RecRawStatBlock * rsb, EThread * ethread, int id, int64 incr = 1);
+inline int RecIncrRawStatSum(RecRawStatBlock * rsb, EThread * ethread, int id, int64 incr = 1);
+inline int RecIncrRawStatCount(RecRawStatBlock * rsb, EThread * ethread, int id, int64 incr = 1);
int RecIncrRawStatBlock(RecRawStatBlock * rsb, EThread * ethread, RecRawStat * stat_array);
-int RecSetRawStatSum(RecRawStatBlock * rsb, int id, ink64 data);
-int RecSetRawStatCount(RecRawStatBlock * rsb, int id, ink64 data);
+int RecSetRawStatSum(RecRawStatBlock * rsb, int id, int64 data);
+int RecSetRawStatCount(RecRawStatBlock * rsb, int id, int64 data);
int RecSetRawStatBlock(RecRawStatBlock * rsb, RecRawStat * stat_array);
-int RecGetRawStatSum(RecRawStatBlock * rsb, int id, ink64 * data);
-int RecGetRawStatCount(RecRawStatBlock * rsb, int id, ink64 * data);
+int RecGetRawStatSum(RecRawStatBlock * rsb, int id, int64 * data);
+int RecGetRawStatCount(RecRawStatBlock * rsb, int id, int64 * data);
//-------------------------------------------------------------------------
// Global RawStat Items (e.g. same as above, but no thread-local behavior)
//-------------------------------------------------------------------------
-int RecIncrGlobalRawStat(RecRawStatBlock * rsb, int id, ink64 incr = 1);
-int RecIncrGlobalRawStatSum(RecRawStatBlock * rsb, int id, ink64 incr = 1);
-int RecIncrGlobalRawStatCount(RecRawStatBlock * rsb, int id, ink64 incr = 1);
+int RecIncrGlobalRawStat(RecRawStatBlock * rsb, int id, int64 incr = 1);
+int RecIncrGlobalRawStatSum(RecRawStatBlock * rsb, int id, int64 incr = 1);
+int RecIncrGlobalRawStatCount(RecRawStatBlock * rsb, int id, int64 incr = 1);
-int RecSetGlobalRawStatSum(RecRawStatBlock * rsb, int id, ink64 data);
-int RecSetGlobalRawStatCount(RecRawStatBlock * rsb, int id, ink64 data);
+int RecSetGlobalRawStatSum(RecRawStatBlock * rsb, int id, int64 data);
+int RecSetGlobalRawStatCount(RecRawStatBlock * rsb, int id, int64 data);
-int RecGetGlobalRawStatSum(RecRawStatBlock * rsb, int id, ink64 * data);
-int RecGetGlobalRawStatCount(RecRawStatBlock * rsb, int id, ink64 * data);
+int RecGetGlobalRawStatSum(RecRawStatBlock * rsb, int id, int64 * data);
+int RecGetGlobalRawStatCount(RecRawStatBlock * rsb, int id, int64 * data);
RecRawStat *RecGetGlobalRawStatPtr(RecRawStatBlock * rsb, int id);
-ink64 *RecGetGlobalRawStatSumPtr(RecRawStatBlock * rsb, int id);
-ink64 *RecGetGlobalRawStatCountPtr(RecRawStatBlock * rsb, int id);
+int64 *RecGetGlobalRawStatSumPtr(RecRawStatBlock * rsb, int id);
+int64 *RecGetGlobalRawStatCountPtr(RecRawStatBlock * rsb, int id);
//-------------------------------------------------------------------------
// RecIncrRawStatXXX
@@ -122,7 +122,7 @@ raw_stat_get_tlp(RecRawStatBlock * rsb,
inline int
-RecIncrRawStat(RecRawStatBlock * rsb, EThread * ethread, int id, ink64 incr)
+RecIncrRawStat(RecRawStatBlock * rsb, EThread * ethread, int id, int64 incr)
{
RecRawStat *tlp = raw_stat_get_tlp(rsb, id, ethread);
tlp->sum += incr;
@@ -132,7 +132,7 @@ RecIncrRawStat(RecRawStatBlock * rsb, ET
/* This does not seem to work as intended ... */
inline int
-RecDecrRawStat(RecRawStatBlock * rsb, EThread * ethread, int id, ink64 decr)
+RecDecrRawStat(RecRawStatBlock * rsb, EThread * ethread, int id, int64 decr)
{
RecRawStat *tlp = raw_stat_get_tlp(rsb, id, ethread);
if (decr <= tlp->sum) { // Assure that we stay positive
@@ -143,7 +143,7 @@ RecDecrRawStat(RecRawStatBlock * rsb, ET
}
inline int
-RecIncrRawStatSum(RecRawStatBlock * rsb, EThread * ethread, int id, ink64 incr)
+RecIncrRawStatSum(RecRawStatBlock * rsb, EThread * ethread, int id, int64 incr)
{
RecRawStat *tlp = raw_stat_get_tlp(rsb, id, ethread);
tlp->sum += incr;
@@ -151,7 +151,7 @@ RecIncrRawStatSum(RecRawStatBlock * rsb,
}
inline int
-RecIncrRawStatCount(RecRawStatBlock * rsb, EThread * ethread, int id, ink64 incr)
+RecIncrRawStatCount(RecRawStatBlock * rsb, EThread * ethread, int id, int64 incr)
{
RecRawStat *tlp = raw_stat_get_tlp(rsb, id, ethread);
tlp->count += incr;
Modified: trafficserver/traffic/trunk/librecords/P_RecUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/P_RecUtils.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/P_RecUtils.h (original)
+++ trafficserver/traffic/trunk/librecords/P_RecUtils.h Wed May 19 21:06:35 2010
@@ -53,7 +53,7 @@
RecRecord *RecAlloc(RecT rec_type, const char *name, RecDataT data_type);
void RecDataClear(RecDataT data_type, RecData * data);
bool RecDataSet(RecDataT data_type, RecData * data_dst, RecData * data_src);
-bool RecDataSetFromInk64(RecDataT data_type, RecData * data_dst, ink64 data_ink64);
+bool RecDataSetFromInk64(RecDataT data_type, RecData * data_dst, int64 data_int64);
bool RecDataSetFromFloat(RecDataT data_type, RecData * data_dst, float data_float);
bool RecDataSetFromString(RecDataT data_type, RecData * data_dst, char *data_string);
Modified: trafficserver/traffic/trunk/librecords/RecCore.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/RecCore.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/RecCore.cc (original)
+++ trafficserver/traffic/trunk/librecords/RecCore.cc Wed May 19 21:06:35 2010
@@ -118,20 +118,20 @@ link_llong(const char *name, RecDataT da
}
static int
-link_ink32(const char *name, RecDataT data_type, RecData data, void *cookie)
+link_int32(const char *name, RecDataT data_type, RecData data, void *cookie)
{
REC_NOWARN_UNUSED(name);
REC_NOWARN_UNUSED(data_type);
- *(ink32 *) cookie = (ink32) data.rec_int;
+ *(int32 *) cookie = (int32) data.rec_int;
return REC_ERR_OKAY;
}
static int
-link_inku32(const char *name, RecDataT data_type, RecData data, void *cookie)
+link_uint32(const char *name, RecDataT data_type, RecData data, void *cookie)
{
REC_NOWARN_UNUSED(name);
REC_NOWARN_UNUSED(data_type);
- *(inku32 *) cookie = (inku32) data.rec_int;
+ *(uint32 *) cookie = (uint32) data.rec_int;
return REC_ERR_OKAY;
}
@@ -289,15 +289,15 @@ RecLinkConfigLLong(const char *name, Rec
}
int
-RecLinkConfigInk32(const char *name, ink32 * p_ink32)
+RecLinkConfigInk32(const char *name, int32 * p_int32)
{
- return RecRegisterConfigUpdateCb(name, link_ink32, (void *) p_ink32);
+ return RecRegisterConfigUpdateCb(name, link_int32, (void *) p_int32);
}
int
-RecLinkConfigInkU32(const char *name, inku32 * p_inku32)
+RecLinkConfigInkU32(const char *name, uint32 * p_uint32)
{
- return RecRegisterConfigUpdateCb(name, link_inku32, (void *) p_inku32);
+ return RecRegisterConfigUpdateCb(name, link_uint32, (void *) p_uint32);
}
int
@@ -1258,7 +1258,7 @@ REC_setFloat(const char *name, float val
}
bool
-REC_setCounter(const char *name, ink64 value, bool dirty)
+REC_setCounter(const char *name, int64 value, bool dirty)
{
REC_NOWARN_UNUSED(dirty);
return RecSetRecordCounter(name, value);
Modified: trafficserver/traffic/trunk/librecords/RecLocal.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/RecLocal.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/RecLocal.cc (original)
+++ trafficserver/traffic/trunk/librecords/RecLocal.cc Wed May 19 21:06:35 2010
@@ -62,7 +62,7 @@ sync_thr(void *data)
RecFileWrite(h_file, tb.bufPtr(), tb.spaceUsed(), &nbytes);
RecFileClose(h_file);
}
- ink_sleep(REC_REMOTE_SYNC_INTERVAL_SEC);
+ sleep(REC_REMOTE_SYNC_INTERVAL_SEC);
}
return NULL;
}
@@ -104,7 +104,7 @@ sync_thr(void *data)
RecFileClose(h_file);
}
}
- ink_sleep(REC_REMOTE_SYNC_INTERVAL_SEC);
+ sleep(REC_REMOTE_SYNC_INTERVAL_SEC);
}
return NULL;
}
@@ -121,7 +121,7 @@ config_update_thr(void *data)
REC_NOWARN_UNUSED(data);
while (true) {
RecExecConfigUpdateCbs();
- ink_sleep(REC_CONFIG_UPDATE_INTERVAL_SEC);
+ sleep(REC_CONFIG_UPDATE_INTERVAL_SEC);
}
return NULL;
}
Modified: trafficserver/traffic/trunk/librecords/RecProcess.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/RecProcess.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/RecProcess.cc (original)
+++ trafficserver/traffic/trunk/librecords/RecProcess.cc Wed May 19 21:06:35 2010
@@ -196,7 +196,7 @@ struct raw_stat_sync_cont:public Continu
REC_NOWARN_UNUSED(e);
while (true) {
RecExecRawStatSyncCbs();
- ink_sleep(REC_RAW_STAT_SYNC_INTERVAL_SEC);
+ sleep(REC_RAW_STAT_SYNC_INTERVAL_SEC);
}
return EVENT_DONE;
}
@@ -218,7 +218,7 @@ struct config_update_cont:public Continu
REC_NOWARN_UNUSED(e);
while (true) {
RecExecConfigUpdateCbs();
- ink_sleep(REC_CONFIG_UPDATE_INTERVAL_SEC);
+ sleep(REC_CONFIG_UPDATE_INTERVAL_SEC);
}
return EVENT_DONE;
}
@@ -257,7 +257,7 @@ struct sync_cont:public Continuation
RecFileWrite(h_file, m_tb->bufPtr(), m_tb->spaceUsed(), &nbytes);
RecFileClose(h_file);
}
- ink_sleep(REC_REMOTE_SYNC_INTERVAL_SEC);
+ sleep(REC_REMOTE_SYNC_INTERVAL_SEC);
}
return EVENT_DONE;
}
@@ -279,7 +279,7 @@ struct stat_sync_cont:public Continuatio
REC_NOWARN_UNUSED(e);
while (true) {
RecExecRawStatUpdateFuncs();
- ink_sleep(REC_STAT_UPDATE_INTERVAL_SEC);
+ sleep(REC_STAT_UPDATE_INTERVAL_SEC);
}
return EVENT_DONE;
}
@@ -402,7 +402,7 @@ RecRawStatBlock *
RecAllocateRawStatBlock(int num_stats)
{
- ink_off_t ethr_stat_offset;
+ off_t ethr_stat_offset;
RecRawStatBlock *rsb;
// allocate thread-local raw-stat memory
@@ -586,7 +586,7 @@ RecIncrRawStatBlock(RecRawStatBlock * rs
//-------------------------------------------------------------------------
int
-RecSetRawStatSum(RecRawStatBlock * rsb, int id, ink64 data)
+RecSetRawStatSum(RecRawStatBlock * rsb, int id, int64 data)
{
raw_stat_clear_sum(rsb, id);
ink_atomic_swap64(&(rsb->global[id]->sum), data);
@@ -594,7 +594,7 @@ RecSetRawStatSum(RecRawStatBlock * rsb,
}
int
-RecSetRawStatCount(RecRawStatBlock * rsb, int id, ink64 data)
+RecSetRawStatCount(RecRawStatBlock * rsb, int id, int64 data)
{
raw_stat_clear_count(rsb, id);
ink_atomic_swap64(&(rsb->global[id]->count), data);
@@ -614,7 +614,7 @@ RecSetRawStatBlock(RecRawStatBlock * rsb
//-------------------------------------------------------------------------
int
-RecGetRawStatSum(RecRawStatBlock * rsb, int id, ink64 * data)
+RecGetRawStatSum(RecRawStatBlock * rsb, int id, int64 * data)
{
RecRawStat total;
raw_stat_get_total(rsb, id, &total);
@@ -623,7 +623,7 @@ RecGetRawStatSum(RecRawStatBlock * rsb,
}
int
-RecGetRawStatCount(RecRawStatBlock * rsb, int id, ink64 * data)
+RecGetRawStatCount(RecRawStatBlock * rsb, int id, int64 * data)
{
RecRawStat total;
raw_stat_get_total(rsb, id, &total);
@@ -636,7 +636,7 @@ RecGetRawStatCount(RecRawStatBlock * rsb
//-------------------------------------------------------------------------
int
-RecIncrGlobalRawStat(RecRawStatBlock * rsb, int id, ink64 incr)
+RecIncrGlobalRawStat(RecRawStatBlock * rsb, int id, int64 incr)
{
ink_atomic_increment64(&(rsb->global[id]->sum), incr);
ink_atomic_increment64(&(rsb->global[id]->count), 1);
@@ -644,14 +644,14 @@ RecIncrGlobalRawStat(RecRawStatBlock * r
}
int
-RecIncrGlobalRawStatSum(RecRawStatBlock * rsb, int id, ink64 incr)
+RecIncrGlobalRawStatSum(RecRawStatBlock * rsb, int id, int64 incr)
{
ink_atomic_increment64(&(rsb->global[id]->sum), incr);
return REC_ERR_OKAY;
}
int
-RecIncrGlobalRawStatCount(RecRawStatBlock * rsb, int id, ink64 incr)
+RecIncrGlobalRawStatCount(RecRawStatBlock * rsb, int id, int64 incr)
{
ink_atomic_increment64(&(rsb->global[id]->count), incr);
return REC_ERR_OKAY;
@@ -662,14 +662,14 @@ RecIncrGlobalRawStatCount(RecRawStatBloc
//-------------------------------------------------------------------------
int
-RecSetGlobalRawStatSum(RecRawStatBlock * rsb, int id, ink64 data)
+RecSetGlobalRawStatSum(RecRawStatBlock * rsb, int id, int64 data)
{
ink_atomic_swap64(&(rsb->global[id]->sum), data);
return REC_ERR_OKAY;
}
int
-RecSetGlobalRawStatCount(RecRawStatBlock * rsb, int id, ink64 data)
+RecSetGlobalRawStatCount(RecRawStatBlock * rsb, int id, int64 data)
{
ink_atomic_swap64(&(rsb->global[id]->count), data);
return REC_ERR_OKAY;
@@ -680,14 +680,14 @@ RecSetGlobalRawStatCount(RecRawStatBlock
//-------------------------------------------------------------------------
int
-RecGetGlobalRawStatSum(RecRawStatBlock * rsb, int id, ink64 * data)
+RecGetGlobalRawStatSum(RecRawStatBlock * rsb, int id, int64 * data)
{
*data = rsb->global[id]->sum;
return REC_ERR_OKAY;
}
int
-RecGetGlobalRawStatCount(RecRawStatBlock * rsb, int id, ink64 * data)
+RecGetGlobalRawStatCount(RecRawStatBlock * rsb, int id, int64 * data)
{
*data = rsb->global[id]->count;
return REC_ERR_OKAY;
@@ -703,13 +703,13 @@ RecGetGlobalRawStatPtr(RecRawStatBlock *
return rsb->global[id];
}
-ink64 *
+int64 *
RecGetGlobalRawStatSumPtr(RecRawStatBlock * rsb, int id)
{
return &(rsb->global[id]->sum);
}
-ink64 *
+int64 *
RecGetGlobalRawStatCountPtr(RecRawStatBlock * rsb, int id)
{
return &(rsb->global[id]->count);
Modified: trafficserver/traffic/trunk/librecords/RecUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/RecUtils.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/RecUtils.cc (original)
+++ trafficserver/traffic/trunk/librecords/RecUtils.cc Wed May 19 21:06:35 2010
@@ -135,18 +135,18 @@ RecDataSet(RecDataT data_type, RecData *
//-------------------------------------------------------------------------
bool
-RecDataSetFromInk64(RecDataT data_type, RecData * data_dst, ink64 data_ink64)
+RecDataSetFromInk64(RecDataT data_type, RecData * data_dst, int64 data_int64)
{
switch (data_type) {
case RECD_INT:
- data_dst->rec_int = data_ink64;
+ data_dst->rec_int = data_int64;
break;
case RECD_LLONG:
- data_dst->rec_llong = data_ink64;
+ data_dst->rec_llong = data_int64;
break;
case RECD_FLOAT:
- data_dst->rec_float = (float) (data_ink64);
+ data_dst->rec_float = (float) (data_int64);
break;
case RECD_STRING:
{
@@ -154,12 +154,12 @@ RecDataSetFromInk64(RecDataT data_type,
if (data_dst->rec_string) {
xfree(data_dst->rec_string);
}
- snprintf(buf, 32, "%lld", data_ink64);
+ snprintf(buf, 32, "%lld", data_int64);
data_dst->rec_string = xstrdup(buf);
break;
}
case RECD_COUNTER:
- data_dst->rec_counter = data_ink64;
+ data_dst->rec_counter = data_int64;
break;
default:
ink_debug_assert(!"Unexpected RecD type");
Modified: trafficserver/traffic/trunk/librecords/test_I_RecLocal.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/test_I_RecLocal.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/test_I_RecLocal.cc (original)
+++ trafficserver/traffic/trunk/librecords/test_I_RecLocal.cc Wed May 19 21:06:35 2010
@@ -88,7 +88,7 @@ Test01()
RecSetRecordString("proxy.config.local.cb_test_1", "cb_test_1__original");
RecSetRecordString("proxy.config.local.cb_test_2", "cb_test_2__original");
printf(" - sleep(2*REC_CONFIG_UPDATE_INTERVAL_SEC)\n");
- ink_sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
+ sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
// Register config update callbacks
RecRegisterConfigUpdateCb("proxy.config.local.cb_test_1", cb_test_1a, (void *) 0x12345678);
@@ -99,7 +99,7 @@ Test01()
// Change proxy.config.cb_test_1
RecSetRecordString("proxy.config.local.cb_test_1", "cb_test_1__changed");
printf(" - sleep(2*REC_CONFIG_UPDATE_INTERVAL_SEC)\n");
- ink_sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
+ sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
// Check globals to make sure the right thing happened
if (g_config_update_result == 2) {
@@ -157,7 +157,7 @@ Test02()
// Initialize variables
RecSetRecordString("proxy.config.local.cb_test_3", "cb_test_3__original");
printf(" - sleep(2*REC_CONFIG_UPDATE_INTERVAL_SEC)\n");
- ink_sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
+ sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
// Register config update callbacks
RecRegisterConfigUpdateCb("proxy.config.local.cb_test_3", cb_test_3a, (void *) 0x12344321);
@@ -166,7 +166,7 @@ Test02()
// Change proxy.config.cb_test_1
RecSetRecordString("proxy.config.local.cb_test_3", "cb_test_3__changed");
printf(" - sleep(2*REC_CONFIG_UPDATE_INTERVAL_SEC)\n");
- ink_sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
+ sleep(2 * REC_CONFIG_UPDATE_INTERVAL_SEC);
// Check globals to make sure the right thing happened
if (g_config_update_result == 2) {
@@ -291,7 +291,7 @@ main(int argc, char **argv)
while (true) {
RecDumpRecordsHt(RECT_NULL);
- ink_sleep(10);
+ sleep(10);
}
return 0;
Modified: trafficserver/traffic/trunk/proxy/AbstractBuffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/AbstractBuffer.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/AbstractBuffer.cc (original)
+++ trafficserver/traffic/trunk/proxy/AbstractBuffer.cc Wed May 19 21:06:35 2010
@@ -33,7 +33,7 @@
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-ABError AbstractBuffer::checkout_write(int *write_offset, int write_size, inku64 retries)
+ABError AbstractBuffer::checkout_write(int *write_offset, int write_size, uint64 retries)
{
VolatileState
old_vs;
@@ -62,7 +62,7 @@ ABError AbstractBuffer::checkout_write(i
return AB_ERROR_STATE;
}
- if ((inku32) (new_vs.s.offset + write_size) > (inku32) size) {
+ if ((uint32) (new_vs.s.offset + write_size) > (uint32) size) {
new_vs.s.state = AB_STATE_READ_ONLY;
if (switch_state(old_vs, new_vs)) {
vs_history[AB_STATE_READ_ONLY] = old_vs;
@@ -103,7 +103,7 @@ ABError AbstractBuffer::checkout_read(in
return AB_ERROR_STATE;
}
- if ((inku32) (read_offset + read_size) > new_vs.s.offset) {
+ if ((uint32) (read_offset + read_size) > new_vs.s.offset) {
return AB_ERROR_OFFSET;
}
@@ -129,7 +129,7 @@ ABError AbstractBuffer::checkin_write(in
ink_assert(new_vs.s.writer_count > 0);
ink_assert((new_vs.s.state == AB_STATE_READ_WRITE) || (new_vs.s.state == AB_STATE_READ_ONLY));
- ink_assert((inku32) write_offset < new_vs.s.offset);
+ ink_assert((uint32) write_offset < new_vs.s.offset);
new_vs.s.writer_count -= 1;
} while (!switch_state(old_vs, new_vs));
@@ -168,7 +168,7 @@ ABError AbstractBuffer::checkin_read(int
ink_assert(new_vs.s.reader_count > 0);
ink_assert(new_vs.s.state != AB_STATE_UNUSED);
- ink_assert((inku32) read_offset < new_vs.s.offset);
+ ink_assert((uint32) read_offset < new_vs.s.offset);
new_vs.s.reader_count -= 1;
} while (!switch_state(old_vs, new_vs));
Modified: trafficserver/traffic/trunk/proxy/AbstractBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/AbstractBuffer.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/AbstractBuffer.h (original)
+++ trafficserver/traffic/trunk/proxy/AbstractBuffer.h Wed May 19 21:06:35 2010
@@ -70,13 +70,13 @@ protected:
return *this;
}
- ink64 ival;
+ int64 ival;
struct
{
- inku16 reader_count;
- inku16 writer_count;
- inku32 offset:29;
- inku32 state:3;
+ uint16 reader_count;
+ uint16 writer_count;
+ uint32 offset:29;
+ uint32 state:3;
} s;
};
@@ -105,7 +105,7 @@ public:
return vs.s.offset;
}
- virtual ABError checkout_write(int *write_offset, int write_size, inku64 retries = (inku64) - 1);
+ virtual ABError checkout_write(int *write_offset, int write_size, uint64 retries = (uint64) - 1);
virtual ABError checkout_read(int read_offset, int read_size);
virtual ABError checkin_write(int write_offset);
virtual ABError checkin_read(int read_offset);
@@ -174,7 +174,7 @@ private:
inline bool
AbstractBuffer::switch_state(VolatileState & old_vs, VolatileState & new_vs)
{
- if (ink_atomic_cas64((ink64 *) & vs.ival, old_vs.ival, new_vs.ival)) {
+ if (ink_atomic_cas64((int64 *) & vs.ival, old_vs.ival, new_vs.ival)) {
return true;
}
Modified: trafficserver/traffic/trunk/proxy/ClusterHashStandalone.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ClusterHashStandalone.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ClusterHashStandalone.cc (original)
+++ trafficserver/traffic/trunk/proxy/ClusterHashStandalone.cc Wed May 19 21:06:35 2010
@@ -66,7 +66,7 @@ static ClusterConfiguration cc;
inline unsigned int
cache_hash(INK_MD5 & md5)
{
- inku64 f = md5.fold();
+ uint64 f = md5.fold();
unsigned int mhash = f >> 32;
return mhash;
}
Modified: trafficserver/traffic/trunk/proxy/ControlMatcher.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ControlMatcher.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ControlMatcher.h (original)
+++ trafficserver/traffic/trunk/proxy/ControlMatcher.h Wed May 19 21:06:35 2010
@@ -152,7 +152,7 @@ public:
time_t xact_start;
ip_addr_t src_ip;
ip_addr_t dest_ip;
- inku16 incoming_port;
+ uint16 incoming_port;
char *tag;
};
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Wed May 19 21:06:35 2010
@@ -577,9 +577,9 @@ CoreUtils::test_HdrHeap(void *arg)
{
HdrHeap *hheap_test = (HdrHeap *) arg;
- inku32 *magic_ptr = &(hheap_test->m_magic);
- inku32 magic = 0;
- if (read_from_core((intptr_t) magic_ptr, sizeof(inku32), (char *) &magic) != 0) {
+ uint32 *magic_ptr = &(hheap_test->m_magic);
+ uint32 magic = 0;
+ if (read_from_core((intptr_t) magic_ptr, sizeof(uint32), (char *) &magic) != 0) {
if (magic == HDR_BUF_MAGIC_ALIVE ||
magic == HDR_BUF_MAGIC_DEAD || magic == HDR_BUF_MAGIC_CORRUPT || magic == HDR_BUF_MAGIC_MARSHALED) {
// This is not 64-bit correct ... /leif
@@ -1231,7 +1231,7 @@ print_read_block(OUTCONTROLMSG * o_msg)
printf(" offset: %d, length: %d \n", LE_TO_LONG(r_msg->offset), LE_TO_LONG(r_msg->length));
printf(" flags: %d, dummy: %d \n", LE_TO_LONG(r_msg->flags), LE_TO_LONG(r_msg->dummy));
printf(" Earliest: %e, Deadline: %e \n",
- LE_TO_INT64((ink64) r_msg->tEarliest), LE_TO_INT64((ink64) r_msg->tDeadline));
+ LE_TO_INT64((int64) r_msg->tEarliest), LE_TO_INT64((int64) r_msg->tDeadline));
printf(" UserIncarnation: %d, playSequence: %d \n",
LE_TO_LONG(r_msg->playIncarnation), LE_TO_LONG(r_msg->playSequence));
}
Modified: trafficserver/traffic/trunk/proxy/ICP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICP.cc Wed May 19 21:06:35 2010
@@ -741,7 +741,7 @@ ICPPeerReadCont::PeerReadStateMachine(Pe
_ICPpr->GetConfig()->Unlock();
unsigned char x[4];
- *(inku32 *) & x = (inku32) P->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) P->GetIP()->s_addr;
if (status) {
Warning("ICP bind_connect(2) failed, res=%d, ip=%d.%d.%d.%d", status, x[0], x[1], x[2], x[3]);
REC_SignalWarning(REC_SIGNAL_CONFIG_ERROR, "ICP bind_connect(2) failed");
@@ -779,7 +779,7 @@ ICPPeerReadCont::PeerReadStateMachine(Pe
&& (s->_rICPmsg->h.version != ICP_VERSION_3)) {
ICP_INCREMENT_DYN_STAT(read_not_v2_icp_stat);
Debug("icp", "Received (v=%d) !v2 && !v3 msg from sender [%s:%d]",
- (inku32) s->_rICPmsg->h.version, inet_ntoa(from.sin_addr), ntohs(from.sin_port));
+ (uint32) s->_rICPmsg->h.version, inet_ntoa(from.sin_addr), ntohs(from.sin_port));
s->_rICPmsg = NULL;
s->_buf = NULL;
@@ -889,7 +889,7 @@ ICPPeerReadCont::PeerReadStateMachine(Pe
// Partial write.
ICP_INCREMENT_DYN_STAT(query_response_partial_write_stat);
unsigned char x[4];
- *(inku32 *) & x = (inku32) s->_sender.sin_addr.s_addr;
+ *(uint32 *) & x = (uint32) s->_sender.sin_addr.s_addr;
// coverity[uninit_use_in_call]
Debug("icp_warn", "ICP response send, sent=%d res=%d, ip=%d.%d.%d.%d",
ntohs(s->_rICPmsg->h.msglen), -1, x[0], x[1], x[2], x[3]);
@@ -918,7 +918,7 @@ ICPPeerReadCont::PeerReadStateMachine(Pe
// Partial write.
ICP_INCREMENT_DYN_STAT(query_response_partial_write_stat);
unsigned char x[4];
- *(inku32 *) & x = (inku32) s->_sender.sin_addr.s_addr;
+ *(uint32 *) & x = (uint32) s->_sender.sin_addr.s_addr;
// coverity[uninit_use_in_call]
Debug("icp_warn", "ICP response send, sent=%d res=%d, ip=%d.%d.%d.%d",
ntohs(s->_rICPmsg->h.msglen), len, x[0], x[1], x[2], x[3]);
@@ -1358,7 +1358,7 @@ ICPRequestCont::ICPStateMachine(int even
// Partial or failed write.
ICP_INCREMENT_DYN_STAT(send_query_partial_write_stat);
unsigned char x[4];
- *(inku32 *) & x = (inku32) (*P->GetIP()).s_addr;
+ *(uint32 *) & x = (uint32) (*P->GetIP()).s_addr;
// coverity[uninit_use_in_call]
Debug("icp_warn",
"ICP query send, res=%d, ip=%d.%d.%d.%d", ntohs(_ICPmsg.h.msglen), x[0], x[1], x[2], x[3]);
@@ -1631,7 +1631,7 @@ ICPRequestCont::ICPResponseMessage(int e
{
ICP_INCREMENT_DYN_STAT(invalid_icp_query_response_stat);
unsigned char x[4];
- *(inku32 *) & x = (inku32) peer->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) peer->GetIP()->s_addr;
// coverity[uninit_use_in_call]
Warning("Invalid ICP response, op=%d reqno=%d ip=%d.%d.%d.%d",
m->h.opcode, m->h.requestno, x[0], x[1], x[2], x[3]);
@@ -2221,7 +2221,7 @@ ICPProcessor::SetupListenSockets()
CONNECT_WITH_UDP, NON_BLOCKING, BC_NO_CONNECT, BC_NO_BIND);
if (status) {
unsigned char x[4];
- *(inku32 *) & x = (inku32) pPS->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) pPS->GetIP()->s_addr;
Warning("ICP bind_connect failed, res=%d, ip=%d.%d.%d.%d", status, x[0], x[1], x[2], x[3]);
REC_SignalWarning(REC_SIGNAL_CONFIG_ERROR, "ICP bind_connect failed");
return 1; // Failed
@@ -2239,8 +2239,8 @@ ICPProcessor::SetupListenSockets()
NON_BLOCKING, pMC->GetTTL(), DISABLE_MC_LOOPBACK, _mcastCB_handler);
if (status) {
unsigned char x[4], y[4];
- *(inku32 *) & x = (inku32) pMC->GetIP()->s_addr;
- *(inku32 *) & y = (inku32) _LocalPeer->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) pMC->GetIP()->s_addr;
+ *(uint32 *) & y = (uint32) _LocalPeer->GetIP()->s_addr;
// coverity[uninit_use_in_call]
Warning("ICP MC send setup failed, res=%d, ip=%d.%d.%d.%d:%d bind_ip=%d.%d.%d.%d:%d",
status, x[0], x[1], x[2], x[3], pMC->GetPort(), y[0], y[1], y[2], y[3], 0);
@@ -2253,7 +2253,7 @@ ICPProcessor::SetupListenSockets()
NON_BLOCKING, pMC->GetSendChan(), _mcastCB_handler);
if (status) {
unsigned char x[4];
- *(inku32 *) & x = (inku32) pMC->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) pMC->GetIP()->s_addr;
// coverity[uninit_use_in_call]
Warning("ICP MC recv setup failed, res=%d, ip=%d.%d.%d.%d:%d",
status, x[0], x[1], x[2], x[3], pMC->GetPort());
@@ -2280,7 +2280,7 @@ ICPProcessor::SetupListenSockets()
NON_BLOCKING_CONNECT, CONNECT_WITH_UDP, NON_BLOCKING, BC_NO_CONNECT, BC_BIND);
if (status) {
unsigned char x[4];
- *(inku32 *) & x = (inku32) pPS->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) pPS->GetIP()->s_addr;
// coverity[uninit_use_in_call]
Warning("ICP bind_connect failed, res=%d, ip=%d.%d.%d.%d", status, x[0], x[1], x[2], x[3]);
REC_SignalWarning(REC_SIGNAL_CONFIG_ERROR, "ICP bind_connect for localhost failed");
@@ -2498,7 +2498,7 @@ ICPProcessor::AddPeer(Peer * P)
//
if (FindPeer(P->GetIP(), P->GetPort())) {
unsigned char x[4];
- *(inku32 *) & x = (inku32) P->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) P->GetIP()->s_addr;
// coverity[uninit_use_in_call]
Warning("bad icp.config, multiple peer definitions for ip=%d.%d.%d.%d", x[0], x[1], x[2], x[3]);
REC_SignalWarning(REC_SIGNAL_CONFIG_ERROR, "bad icp.config, multiple peer definitions");
Modified: trafficserver/traffic/trunk/proxy/ICP.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.h (original)
+++ trafficserver/traffic/trunk/proxy/ICP.h Wed May 19 21:06:35 2010
@@ -55,13 +55,13 @@
//*********************************************************************
typedef struct ICPMsgHeader
{
- inku8 opcode;
- inku8 version;
- inku16 msglen;
- inku32 requestno;
- inku32 optionflags;
- inku32 optiondata;
- inku32 shostid;
+ uint8 opcode;
+ uint8 version;
+ uint16 msglen;
+ uint32 requestno;
+ uint32 optionflags;
+ uint32 optiondata;
+ uint32 shostid;
} ICPMsgHdr_t;
//-----------------------
@@ -121,7 +121,7 @@ typedef enum
//-----------------
#define MAX_ICP_MSGSIZE (16 * 1024)
#define MAX_ICP_MSG_PAYLOAD_SIZE (MAX_ICP_MSGSIZE - sizeof(ICPmsgHdr_t))
-#define MAX_ICP_QUERY_PAYLOAD_SIZE (MAX_ICP_MSG_PAYLOAD_SIZE - sizeof(inku32))
+#define MAX_ICP_QUERY_PAYLOAD_SIZE (MAX_ICP_MSG_PAYLOAD_SIZE - sizeof(uint32))
#define MAX_DEFINED_PEERS 64
#define MSG_IOVECS 16
@@ -130,7 +130,7 @@ typedef enum
//------------
typedef struct ICPData
{
- ink8 *URL; // null terminated
+ int8 *URL; // null terminated
} ICPData_t;
//-------------
@@ -138,8 +138,8 @@ typedef struct ICPData
//-------------
typedef struct ICPQuery
{
- inku32 rhostid;
- ink8 *URL; // null terminated (outgoing)
+ uint32 rhostid;
+ int8 *URL; // null terminated (outgoing)
} ICPQuery_t;
//------------
@@ -147,7 +147,7 @@ typedef struct ICPQuery
//------------
typedef struct ICPHit
{
- ink8 *URL; // null terminated
+ int8 *URL; // null terminated
} ICPHit_t;
//------------
@@ -155,7 +155,7 @@ typedef struct ICPHit
//------------
typedef struct ICPMiss
{
- ink8 *URL; // null terminated
+ int8 *URL; // null terminated
} ICPMiss_t;
//------------------
@@ -163,10 +163,10 @@ typedef struct ICPMiss
//------------------
typedef struct ICPHitObj
{
- ink8 *URL; // null terminated
- ink8 *p_objsize; // byte aligned inku16 immediately follows URL null
- inku16 objsize; // decoded object size
- ink8 *data; // object data
+ int8 *URL; // null terminated
+ int8 *p_objsize; // byte aligned uint16 immediately follows URL null
+ uint16 objsize; // decoded object size
+ int8 *data; // object data
} ICPHitObj_t;
//------------------------
@@ -232,7 +232,7 @@ public:
private:
enum
{ UNLOCKED = 0, LOCKED = 1 };
- ink32 _lock_word;
+ int32 _lock_word;
};
#endif // USE_CAS_FOR_ATOMICLOCK
@@ -1187,7 +1187,7 @@ private:
void remove_all_pendingActions();
// Static data
- static inku32 ICPRequestSeqno;
+ static uint32 ICPRequestSeqno;
// Passed request data
Continuation *_cont;
Modified: trafficserver/traffic/trunk/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICPConfig.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICPConfig.cc Wed May 19 21:06:35 2010
@@ -1137,7 +1137,7 @@ MultiCastPeer::AddMultiCastChild(Peer *
// Make sure child (ip,port) is unique.
if (FindMultiCastChild(P->GetIP(), P->GetPort())) {
unsigned char x[4] = { 0, 0, 0, 0 };
- *(inku32 *) & x = (inku32) P->GetIP()->s_addr;
+ *(uint32 *) & x = (uint32) P->GetIP()->s_addr;
Warning("bad icp.config, multiple multicast child definitions for ip=%d.%d.%d.%d", x[0], x[1], x[2], x[3]);
return 0; // Not added, already exists
} else {
@@ -1415,7 +1415,7 @@ void
dumpICPstatEntry(int i, const char *name)
{
int l = strlen(name);
- ink64 sval, cval;
+ int64 sval, cval;
RecRawStat *p = RecGetGlobalRawStatPtr(icp_rsb, i);
sval = p->sum;
@@ -1458,7 +1458,7 @@ ICPProcessor::DumpICPConfig()
P = _PeerList[i];
id = P->GetPeerID();
type = P->GetType();
- *(inku32 *) & ip = (inku32) (P->GetIP())->s_addr;
+ *(uint32 *) & ip = (uint32) (P->GetIP())->s_addr;
icp_port = P->GetPort();
const char *str_type;
@@ -1499,7 +1499,7 @@ ICPProcessor::DumpICPConfig()
id, str_type, ip[0], ip[1], ip[2], ip[3], icp_port,
Pps->GetConfig()->GetProxyPort(), Pps->GetConfig()->GetHostname());
- *(inku32 *) & ip = (inku32) (Pps->GetConfig()->GetMultiCastIP())->s_addr;
+ *(uint32 *) & ip = (uint32) (Pps->GetConfig()->GetMultiCastIP())->s_addr;
Debug("icp",
"[%d]: MC ON=%d MC_IP=%d.%d.%d.%d MC_TTL=%d",
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Wed May 19 21:06:35 2010
@@ -779,19 +779,19 @@ FileImpl::fopen(const char *filename, co
return 0;
}
m_mode = READ;
- m_fd = ink_open(filename, O_RDONLY | _O_ATTRIB_NORMAL);
+ m_fd = open(filename, O_RDONLY | _O_ATTRIB_NORMAL);
} else if (mode[0] == 'w') {
if (mode[1] != '\0') {
return 0;
}
m_mode = WRITE;
- m_fd = ink_open(filename, O_WRONLY | O_CREAT | _O_ATTRIB_NORMAL, 0644);
+ m_fd = open(filename, O_WRONLY | O_CREAT | _O_ATTRIB_NORMAL, 0644);
} else if (mode[0] == 'a') {
if (mode[1] != '\0') {
return 0;
}
m_mode = WRITE;
- m_fd = ink_open(filename, O_WRONLY | O_CREAT | O_APPEND | _O_ATTRIB_NORMAL, 0644);
+ m_fd = open(filename, O_WRONLY | O_CREAT | O_APPEND | _O_ATTRIB_NORMAL, 0644);
}
if (m_fd < 0) {
@@ -808,7 +808,7 @@ FileImpl::fclose()
if (m_fd != -1) {
fflush();
- ink_close(m_fd);
+ close(m_fd);
m_fd = -1;
m_mode = CLOSED;
}
@@ -850,7 +850,7 @@ FileImpl::fread(void *buf, int length)
}
do {
- err = ink_read(m_fd, &m_buf[m_bufpos], amount);
+ err = read(m_fd, &m_buf[m_bufpos], amount);
} while ((err < 0) && (errno == EINTR));
if (err < 0) {
@@ -930,7 +930,7 @@ FileImpl::fflush()
while (p != e) {
do {
- err = ink_write(m_fd, p, e - p);
+ err = write(m_fd, p, e - p);
} while ((err < 0) && (errno == EINTR));
if (err < 0) {
@@ -1145,7 +1145,7 @@ INKVConnInternal::handle_event(int event
}
VIO *
-INKVConnInternal::do_io_read(Continuation * c, ink64 nbytes, MIOBuffer * buf)
+INKVConnInternal::do_io_read(Continuation * c, int64 nbytes, MIOBuffer * buf)
{
m_read_vio.buffer.writer_for(buf);
m_read_vio.op = VIO::READ;
@@ -1163,7 +1163,7 @@ INKVConnInternal::do_io_read(Continuatio
}
VIO *
-INKVConnInternal::do_io_write(Continuation * c, ink64 nbytes, IOBufferReader * buf, bool owner)
+INKVConnInternal::do_io_write(Continuation * c, int64 nbytes, IOBufferReader * buf, bool owner)
{
ink_assert(!owner);
m_write_vio.buffer.reader_for(buf);
@@ -3390,7 +3390,7 @@ INKMimeHdrFieldInsert(INKMBuffer bufp, I
if (field_handle->field_ptr->m_ptr_name == NULL) {
char noname[20];
intptr_t addr = (intptr_t) (field_handle->field_ptr);
- snprintf(noname, sizeof(noname), "@X-Noname-%016llX", (ink64)addr);
+ snprintf(noname, sizeof(noname), "@X-Noname-%016llX", (int64)addr);
INKMimeFieldNameSet(bufp, field_mloc, noname, 26);
}
@@ -5033,7 +5033,7 @@ INKCacheHookAdd(INKCacheHookID id, INKCo
void
INKHttpIcpDynamicSet(int value)
{
- ink32 old_value, new_value;
+ int32 old_value, new_value;
new_value = (value == 0) ? 0 : 1;
old_value = icp_dynamic_enabled;
@@ -6380,7 +6380,7 @@ INKHttpTxnStartTimeGet(INKHttpTxn txnp,
if (sm->milestones.ua_begin == 0)
return 0;
else {
- *start_time = (ink64) (sm->milestones.ua_begin);
+ *start_time = (int64) (sm->milestones.ua_begin);
return 1;
}
}
@@ -6392,7 +6392,7 @@ INKHttpTxnEndTimeGet(INKHttpTxn txnp, IN
if (sm->milestones.ua_close == 0)
return 0;
else {
- *end_time = (ink64) (sm->milestones.ua_close);
+ *end_time = (int64) (sm->milestones.ua_close);
return 1;
}
}
@@ -6448,7 +6448,7 @@ INKHttpTxnLookingUpTypeGet(INKHttpTxn tx
int
INKHttpCurrentClientConnectionsGet(int *num_connections)
{
- ink64 S;
+ int64 S;
HTTP_READ_DYN_SUM(http_current_client_connections_stat, S);
*num_connections = (int) S;
@@ -6458,7 +6458,7 @@ INKHttpCurrentClientConnectionsGet(int *
int
INKHttpCurrentActiveClientConnectionsGet(int *num_connections)
{
- ink64 S;
+ int64 S;
HTTP_READ_DYN_SUM(http_current_active_client_connections_stat, S);
*num_connections = (int) S;
@@ -6468,8 +6468,8 @@ INKHttpCurrentActiveClientConnectionsGet
int
INKHttpCurrentIdleClientConnectionsGet(int *num_connections)
{
- ink64 total = 0;
- ink64 active = 0;
+ int64 total = 0;
+ int64 active = 0;
HTTP_READ_DYN_SUM(http_current_client_connections_stat, total);
HTTP_READ_DYN_SUM(http_current_active_client_connections_stat, active);
@@ -6484,7 +6484,7 @@ INKHttpCurrentIdleClientConnectionsGet(i
int
INKHttpCurrentCacheConnectionsGet(int *num_connections)
{
- ink64 S;
+ int64 S;
HTTP_READ_DYN_SUM(http_current_cache_connections_stat, S);
*num_connections = (int) S;
return 1;
@@ -6493,7 +6493,7 @@ INKHttpCurrentCacheConnectionsGet(int *n
int
INKHttpCurrentServerConnectionsGet(int *num_connections)
{
- ink64 S;
+ int64 S;
HTTP_READ_DYN_SUM(http_current_server_connections_stat, S);
*num_connections = (int) S;
@@ -7153,7 +7153,7 @@ INKStatCreate(const char *the_name, INKS
switch (the_type) {
case INKSTAT_TYPE_INT64:
- n = StatDescriptor::CreateDescriptor(the_name, (ink64) 0);
+ n = StatDescriptor::CreateDescriptor(the_name, (int64) 0);
break;
case INKSTAT_TYPE_FLOAT:
@@ -7420,7 +7420,7 @@ INKStatCoupledGlobalAdd(INKCoupledStat g
switch (the_type) {
case INKSTAT_TYPE_INT64:
- n = category->CreateStat(the_name, (ink64) 0);
+ n = category->CreateStat(the_name, (int64) 0);
break;
case INKSTAT_TYPE_FLOAT:
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Wed May 19 21:06:35 2010
@@ -1211,17 +1211,17 @@ struct ShowStats:Continuation
FILE *fp;
#endif
int cycle;
- ink64 last_cc;
- ink64 last_rb;
- ink64 last_w;
- ink64 last_r;
- ink64 last_wb;
- ink64 last_nrb;
- ink64 last_nw;
- ink64 last_nr;
- ink64 last_nwb;
- ink64 last_p;
- ink64 last_o;
+ int64 last_cc;
+ int64 last_rb;
+ int64 last_w;
+ int64 last_r;
+ int64 last_wb;
+ int64 last_nrb;
+ int64 last_nw;
+ int64 last_nr;
+ int64 last_nwb;
+ int64 last_p;
+ int64 last_o;
int mainEvent(int event, Event * e)
{
(void) event;
@@ -1231,36 +1231,36 @@ struct ShowStats:Continuation
ink_statval_t sval, cval;
NET_READ_DYN_STAT(net_calls_to_readfromnet_stat, sval, cval);
- ink64 d_rb = sval - last_rb;
+ int64 d_rb = sval - last_rb;
last_rb += d_rb;
NET_READ_DYN_STAT(net_calls_to_readfromnet_afterpoll_stat, sval, cval);
- ink64 d_r = sval - last_r;
+ int64 d_r = sval - last_r;
last_r += d_r;
NET_READ_DYN_STAT(net_calls_to_writetonet_stat, sval, cval);
- ink64 d_wb = sval - last_wb;
+ int64 d_wb = sval - last_wb;
last_wb += d_wb;
NET_READ_DYN_STAT(net_calls_to_writetonet_afterpoll_stat, sval, cval);
- ink64 d_w = sval - last_w;
+ int64 d_w = sval - last_w;
last_w += d_w;
NET_READ_DYN_STAT(net_read_bytes_stat, sval, cval);
- ink64 d_nrb = sval - last_nrb;
+ int64 d_nrb = sval - last_nrb;
last_nrb += d_nrb;
- ink64 d_nr = cval - last_nr;
+ int64 d_nr = cval - last_nr;
last_nr += d_nr;
NET_READ_DYN_STAT(net_write_bytes_stat, sval, cval);
- ink64 d_nwb = sval - last_nwb;
+ int64 d_nwb = sval - last_nwb;
last_nwb += d_nwb;
- ink64 d_nw = cval - last_nw;
+ int64 d_nw = cval - last_nw;
last_nw += d_nw;
NET_READ_DYN_STAT(net_connections_currently_open_stat, sval, cval);
- ink64 d_o = cval;
+ int64 d_o = cval;
NET_READ_DYN_STAT(net_handler_run_stat, sval, cval);
- ink64 d_p = cval - last_p;
+ int64 d_p = cval - last_p;
last_p += d_p;
printf("%lld:%lld %lld:%lld %lld:%lld %lld:%lld %lld %lld\n",
d_rb, d_r, d_wb, d_w, d_nrb, d_nr, d_nwb, d_nw, d_o, d_p);
@@ -2243,7 +2243,7 @@ xmlBandwidthSchemaRead(XMLNode * node)
Debug("bw-mgmt", "Read in: limit_mbps = %lf\n", G_inkPipeInfo.interfaceMbps);
for (i = 0; i < G_inkPipeInfo.numPipes + 1; i++) {
G_inkPipeInfo.perPipeInfo[i].bwLimit =
- (ink64) (G_inkPipeInfo.perPipeInfo[i].wt * G_inkPipeInfo.interfaceMbps * 1024.0 * 1024.0);
+ (int64) (G_inkPipeInfo.perPipeInfo[i].wt * G_inkPipeInfo.interfaceMbps * 1024.0 * 1024.0);
p = (unsigned char *) &(G_inkPipeInfo.perPipeInfo[i].destIP);
Debug("bw-mgmt", "Pipe [%d]: wt = %lf, dest ip = %d.%d.%d.%d\n",
i, G_inkPipeInfo.perPipeInfo[i].wt, p[0], p[1], p[2], p[3]);
Modified: trafficserver/traffic/trunk/proxy/MuxVC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/MuxVC.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/MuxVC.cc (original)
+++ trafficserver/traffic/trunk/proxy/MuxVC.cc Wed May 19 21:06:35 2010
@@ -134,7 +134,7 @@ MuxClientVC::~MuxClientVC()
}
void
-MuxClientVC::init(MuxVC * mvc, ink32 id_arg)
+MuxClientVC::init(MuxVC * mvc, int32 id_arg)
{
ink_debug_assert(!closed);
@@ -198,7 +198,7 @@ MuxClientVC::kill()
VIO *
-MuxClientVC::do_io_read(Continuation * c, ink64 nbytes, MIOBuffer * buf)
+MuxClientVC::do_io_read(Continuation * c, int64 nbytes, MIOBuffer * buf)
{
ink_debug_assert(!closed);
@@ -237,7 +237,7 @@ MuxClientVC::do_io_read(Continuation * c
}
VIO *
-MuxClientVC::do_io_write(Continuation * c, ink64 nbytes, IOBufferReader * abuffer, bool owner)
+MuxClientVC::do_io_write(Continuation * c, int64 nbytes, IOBufferReader * abuffer, bool owner)
{
ink_debug_assert(!closed);
@@ -1338,12 +1338,12 @@ MuxVC::try_processor_list_remove()
return 0;
}
-// MuxClientVC* MuxVC::new_client(ink32 id_arg)
+// MuxClientVC* MuxVC::new_client(int32 id_arg)
//
// Caller MUST be holding MuxVC::mutex
//
MuxClientVC *
-MuxVC::new_client(ink32 id_arg)
+MuxVC::new_client(int32 id_arg)
{
ink_debug_assert(magic == MUX_VC_MAGIC_ALIVE);
@@ -1426,12 +1426,12 @@ MuxVC::remove_client(MuxClientVC * clien
}
}
-// void MuxVC::enqueue_control_message(int msg_id, ink32 cid, int data_size)
+// void MuxVC::enqueue_control_message(int msg_id, int32 cid, int data_size)
//
// Builds a control message and inserts it on the write buffer
//
int
-MuxVC::enqueue_control_message(int msg_id, ink32 cid, int data_size)
+MuxVC::enqueue_control_message(int msg_id, int32 cid, int data_size)
{
ink_debug_assert(data_size + sizeof(MuxMessage) <= USHRT_MAX);
@@ -1439,9 +1439,9 @@ MuxVC::enqueue_control_message(int msg_i
MuxMessage mm;
Debug("mux_cntl", "enqueue_control_message: %s for %d", control_msg_id_to_string(msg_id), cid);
- mm.version = (inku8) INKMUX_PROTO_VERSION_0_1;
- mm.msg_type = (inku8) msg_id;
- mm.msg_len = (inku16) (sizeof(MuxMessage) + data_size);
+ mm.version = (uint8) INKMUX_PROTO_VERSION_0_1;
+ mm.msg_type = (uint8) msg_id;
+ mm.msg_len = (uint16) (sizeof(MuxMessage) + data_size);
mm.client_id = cid;
write_buffer->write((char *) &mm, sizeof(MuxMessage));
@@ -1525,13 +1525,13 @@ MuxVC::process_clients()
}
}
-// MuxClientVC* MuxVC::find_client(ink32 client_id)
+// MuxClientVC* MuxVC::find_client(int32 client_id)
//
// Search the client list of a MuxClientVC
// matching clinet_id
//
MuxClientVC *
-MuxVC::find_client(ink32 client_id)
+MuxVC::find_client(int32 client_id)
{
MuxClientVC *current = active_clients.head;
@@ -2568,7 +2568,7 @@ public:
char *request;
private:
Arena arena;
- ink32 extract_id(const char *query);
+ int32 extract_id(const char *query);
void dump_mux(MuxVC * mvc);
void dump_mux_client(MuxClientVC * client);
};
@@ -2743,7 +2743,7 @@ MuxPagesHandler::handle_mux_details(int
ink_debug_assert(event == EVENT_IMMEDIATE || event == EVENT_INTERVAL);
Event *call_event = (Event *) data;
- ink32 mux_id = extract_id(request);
+ int32 mux_id = extract_id(request);
if (mux_id < 0) {
resp_begin("Mux Pages Error");
@@ -2857,11 +2857,11 @@ MuxPagesHandler::handle_callback(int eve
return EVENT_DONE;
}
-ink32
+int32
MuxPagesHandler::extract_id(const char *query)
{
char *p;
- ink32 id;
+ int32 id;
p = (char *) strstr(query, "id=");
if (!p) {
Modified: trafficserver/traffic/trunk/proxy/MuxVC.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/MuxVC.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/MuxVC.h (original)
+++ trafficserver/traffic/trunk/proxy/MuxVC.h Wed May 19 21:06:35 2010
@@ -81,10 +81,10 @@ enum
struct MuxMessage
{
- inku8 version;
- inku8 msg_type;
- inku16 msg_len;
- ink32 client_id;
+ uint8 version;
+ uint8 msg_type;
+ uint16 msg_len;
+ int32 client_id;
};
struct MuxClientState
@@ -104,12 +104,12 @@ public:
MuxClientVC();
~MuxClientVC();
- void init(MuxVC * mvc, ink32 id);
+ void init(MuxVC * mvc, int32 id);
void kill();
- virtual VIO *do_io_read(Continuation * c = NULL, ink64 nbytes = INK64_MAX, MIOBuffer * buf = 0);
+ virtual VIO *do_io_read(Continuation * c = NULL, int64 nbytes = INT64_MAX, MIOBuffer * buf = 0);
- virtual VIO *do_io_write(Continuation * c = NULL, ink64 nbytes = INK64_MAX, IOBufferReader * buf = 0, bool owner = false);
+ virtual VIO *do_io_write(Continuation * c = NULL, int64 nbytes = INT64_MAX, IOBufferReader * buf = 0, bool owner = false);
virtual bool is_over_ssl()
{
@@ -145,8 +145,8 @@ public:
int main_handler(int event, void *data);
Link<MuxClientVC> link;
- ink32 id;
- inku32 magic;
+ int32 id;
+ uint32 magic;
private:
@@ -163,7 +163,7 @@ private:
int send_write_shutdown_message();
bool closed;
- inku32 other_side_closed;
+ uint32 other_side_closed;
int reentrancy_count;
bool need_boost;
@@ -230,7 +230,7 @@ public:
void init_from_accept(NetVConnection * nvc, Continuation * acceptc);
void kill();
- MuxClientVC *new_client(ink32 id = 0);
+ MuxClientVC *new_client(int32 id = 0);
void remove_client(MuxClientVC * client_vc);
int state_handle_mux(int event, void *data);
@@ -270,18 +270,18 @@ private:
void process_read_msg_body();
void reset_read_msg_state();
- MuxClientVC *find_client(ink32 client_id);
+ MuxClientVC *find_client(int32 client_id);
void process_control_message();
void process_channel_open();
void process_channel_close(MuxClientVC * client);
void process_channel_inbound_shutdown(MuxClientVC * client);
- int enqueue_control_message(int msg_id, ink32 cid, int data_size = 0);
+ int enqueue_control_message(int msg_id, int32 cid, int data_size = 0);
void cleanup_on_error();
int try_processor_list_remove();
- inku32 magic;
- ink32 id;
- ink32 reentrancy_count;
+ uint32 magic;
+ int32 id;
+ int32 reentrancy_count;
bool terminate_vc;
bool on_mux_list;
bool clients_notified_of_error;
@@ -292,7 +292,7 @@ private:
VIO *write_vio;
// Vars for preventing overflow on the outbound channel
- inku64 write_bytes_added;
+ uint64 write_bytes_added;
bool writes_blocked;
Action *net_connect_action;
Modified: trafficserver/traffic/trunk/proxy/ParentSelection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ParentSelection.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ParentSelection.cc (original)
+++ trafficserver/traffic/trunk/proxy/ParentSelection.cc Wed May 19 21:06:35 2010
@@ -527,12 +527,12 @@ ParentRecord::FindParent(bool first_call
ink_assert(go_direct == true);
goto NO_PARENTS;
} else if (round_robin == true) {
- cur_index = ink_atomic_increment((ink32 *) & rr_next, 1);
+ cur_index = ink_atomic_increment((int32 *) & rr_next, 1);
cur_index = result->start_parent = cur_index % num_parents;
} else {
switch (round_robin) {
case P_STRICT_ROUND_ROBIN:
- cur_index = ink_atomic_increment((ink32 *) & rr_next, 1);
+ cur_index = ink_atomic_increment((int32 *) & rr_next, 1);
cur_index = cur_index % num_parents;
break;
case P_HASH_ROUND_ROBIN:
@@ -996,17 +996,17 @@ setup_socks_servers(ParentRecord * rec_a
int n_parents = rec_arr[j].num_parents;
for (int i = 0; i < n_parents; i++) {
- inku32 bad_ip = (inku32) - 1;
- inku8 *ip;
+ uint32 bad_ip = (uint32) - 1;
+ uint8 *ip;
ink_gethostbyname_r_data data;
struct hostent *ent = ink_gethostbyname_r(pr[i].hostname, &data);
if (ent) {
- ip = (inku8 *) ent->h_addr_list[0];
+ ip = (uint8 *) ent->h_addr_list[0];
} else {
Warning("Could not resolve socks server name \"%s\". " "Please correct it", pr[i].hostname);
- ip = (inku8 *) & bad_ip;
+ ip = (uint8 *) & bad_ip;
}
snprintf(pr[i].hostname, DOMAIN_NAME_MAX + 1, "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
}
@@ -1407,8 +1407,8 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTIO
FP RE(verify(result, PARENT_DIRECT, 0, 0), 32 + i)
}
- // ink_sleep(5); // parents should come back up; they don't
- ink_sleep(params->ParentRetryTime + 1);
+ // sleep(5); // parents should come back up; they don't
+ sleep(params->ParentRetryTime + 1);
// Fix: The following tests failed because
// br() should set xact_start correctly instead of 0.
@@ -1416,7 +1416,7 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTIO
// Test 132 - 631
for (i = 0; i < 40; i++) {
ST(132 + i) REINIT br(request, "i.am.rabbit.net");
- FP ink_sleep(1);
+ FP sleep(1);
switch ((i + 1) % 4) {
case 0:
RE(verify(result, PARENT_SPECIFIED, "fuzzy", 80), 132 + i) break;
Modified: trafficserver/traffic/trunk/proxy/ParentSelection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ParentSelection.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ParentSelection.h (original)
+++ trafficserver/traffic/trunk/proxy/ParentSelection.h Wed May 19 21:06:35 2010
@@ -77,8 +77,8 @@ struct ParentResult
int line_number;
P_table *epoch; // A pointer to the table used.
ParentRecord *rec;
- inku32 last_parent;
- inku32 start_parent;
+ uint32 last_parent;
+ uint32 start_parent;
bool wrap_around;
bool retry;
};
@@ -129,10 +129,10 @@ struct ParentConfigParams:public ConfigI
P_table *ParentTable;
ParentRecord *DefaultParent;
- ink32 ParentRetryTime;
- ink32 ParentEnable;
- ink32 FailThreshold;
- ink32 DNS_ParentOnly;
+ int32 ParentRetryTime;
+ int32 ParentEnable;
+ int32 FailThreshold;
+ int32 DNS_ParentOnly;
};
struct ParentConfig
@@ -160,9 +160,9 @@ struct pRecord
{
char hostname[DOMAIN_NAME_MAX + 1];
int port;
- ink32 failedAt;
+ int32 failedAt;
int failCount;
- ink32 upAt;
+ int32 upAt;
const char *scheme; // for which parent matches (if any)
};
@@ -198,7 +198,7 @@ public:
//private:
const char *ProcessParents(char *val);
ParentRR_t round_robin;
- volatile inku32 rr_next;
+ volatile uint32 rr_next;
bool go_direct;
};
Modified: trafficserver/traffic/trunk/proxy/PluginVC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/PluginVC.cc?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/PluginVC.cc (original)
+++ trafficserver/traffic/trunk/proxy/PluginVC.cc Wed May 19 21:06:35 2010
@@ -219,7 +219,7 @@ PluginVC::main_handler(int event, void *
}
VIO *
-PluginVC::do_io_read(Continuation * c, ink64 nbytes, MIOBuffer * buf)
+PluginVC::do_io_read(Continuation * c, int64 nbytes, MIOBuffer * buf)
{
ink_assert(!closed);
@@ -251,7 +251,7 @@ PluginVC::do_io_read(Continuation * c, i
}
VIO *
-PluginVC::do_io_write(Continuation * c, ink64 nbytes, IOBufferReader * abuffer, bool owner)
+PluginVC::do_io_write(Continuation * c, int64 nbytes, IOBufferReader * abuffer, bool owner)
{
ink_assert(!closed);
@@ -932,7 +932,7 @@ PluginVC::set_data(int id, void *data)
// PluginVCCore
-vink32
+vint32
PluginVCCore::nextid = 0;
PluginVCCore::~PluginVCCore()
@@ -1120,14 +1120,14 @@ PluginVCCore::kill_no_connect()
}
void
-PluginVCCore::set_passive_addr(inku32 ip, int port)
+PluginVCCore::set_passive_addr(uint32 ip, int port)
{
passive_addr_struct.sin_addr.s_addr = htonl(ip);
passive_addr_struct.sin_port = htons(port);
}
void
-PluginVCCore::set_active_addr(inku32 ip, int port)
+PluginVCCore::set_active_addr(uint32 ip, int port)
{
active_addr_struct.sin_addr.s_addr = htonl(ip);
active_addr_struct.sin_port = htons(port);
Modified: trafficserver/traffic/trunk/proxy/PluginVC.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/PluginVC.h?rev=946395&r1=946394&r2=946395&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/PluginVC.h (original)
+++ trafficserver/traffic/trunk/proxy/PluginVC.h Wed May 19 21:06:35 2010
@@ -83,9 +83,9 @@ public:
PluginVC();
~PluginVC();
- virtual VIO *do_io_read(Continuation * c = NULL, ink64 nbytes = INK64_MAX, MIOBuffer * buf = 0);
+ virtual VIO *do_io_read(Continuation * c = NULL, int64 nbytes = INT64_MAX, MIOBuffer * buf = 0);
- virtual VIO *do_io_write(Continuation * c = NULL, ink64 nbytes = INK64_MAX, IOBufferReader * buf = 0, bool owner = false);
+ virtual VIO *do_io_write(Continuation * c = NULL, int64 nbytes = INT64_MAX, IOBufferReader * buf = 0, bool owner = false);
virtual bool is_over_ssl()
{
@@ -130,7 +130,7 @@ private:
void update_inactive_time();
int transfer_bytes(MIOBuffer * transfer_to, IOBufferReader * transfer_from, int act_on);
- inku32 magic;
+ uint32 magic;
PluginVC_t vc_type;
PluginVCCore *core_obj;
@@ -176,8 +176,8 @@ public:
Action *connect_re(Continuation * c);
void kill_no_connect();
- void set_active_addr(inku32 ip, int port);
- void set_passive_addr(inku32 ip, int port);
+ void set_active_addr(uint32 ip, int port);
+ void set_passive_addr(uint32 ip, int port);
void set_active_data(void *data);
void set_passive_data(void *data);
@@ -206,7 +206,7 @@ private:
void *passive_data;
void *active_data;
- static vink32 nextid;
+ static vint32 nextid;
unsigned id;
};