You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/26 15:44:17 UTC
svn commit: r948424 - in /trafficserver/traffic/trunk: configure.ac
iocore/cluster/ClusterCache.cc iocore/cluster/ClusterHandlerBase.cc
libinktomi++/ink_port.h libinktomi++/ink_queue.h libinktomi++/inktomi++.h
proxy/hdrs/HdrHeap.cc proxy/signals.cc
Author: mturk
Date: Wed May 26 13:44:16 2010
New Revision: 948424
URL: http://svn.apache.org/viewvc?rev=948424&view=rev
Log:
TS-235: Axe our int_pointer typedef and use ptrdiff_t from <stddef.h>
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/libinktomi++/ink_port.h
trafficserver/traffic/trunk/libinktomi++/ink_queue.h
trafficserver/traffic/trunk/libinktomi++/inktomi++.h
trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
trafficserver/traffic/trunk/proxy/signals.cc
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Wed May 26 13:44:16 2010
@@ -822,6 +822,7 @@ ATS_FLAG_HEADERS([sys/epoll.h \
sys/param.h \
sys/sysmacros.h \
math.h \
+ stdint.h \
net/ppp_defs.h])
AC_SUBST(sys_epollh)
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc Wed May 26 13:44:16 2010
@@ -867,7 +867,7 @@ CacheContinuation::localVCsetupEvent(int
}
} else if (((event == CLUSTER_EVENT_OPEN) || (event == CLUSTER_EVENT_OPEN_EXISTS))
- && (((int_pointer) timeout & (int_pointer) 1) == 0)) {
+ && (((ptrdiff_t) timeout & (ptrdiff_t) 1) == 0)) {
ink_hrtime now;
now = ink_get_hrtime();
CLUSTER_SUM_DYN_STAT(CLUSTER_OPEN_DELAY_TIME_STAT, now - start_time);
@@ -911,7 +911,7 @@ CacheContinuation::localVCsetupEvent(int
} else {
int send_failure_callback = 1;
- if (((int_pointer) timeout & (int_pointer) 1) == 0) {
+ if (((ptrdiff_t) timeout & (ptrdiff_t) 1) == 0) {
if (short_msg) {
Debug("cache_proto", "2open_local-s (%s) failed, seqno=%d",
(read_op ? "R" : "W"), ((CacheOpMsg_short *) getMsgBuffer())->seq_number);
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Wed May 26 13:44:16 2010
@@ -266,9 +266,9 @@ n_byte_bank(0), byte_bank_size(0), misse
size = ((MAX_TCOUNT + 1) * sizeof(IOVec)) + (2 * pagesize);
iob_iov = new_IOBufferData(BUFFER_SIZE_FOR_XMALLOC(size));
iov = (IOVec *) iob_iov->data();
-
- uint64 page_addr = (uint64) (((uint64) ((int_pointer) iov) + (uint64) pagesize) & ~(pagesize - 1));
- iov = (IOVec *) ((int_pointer) page_addr);
+ // TODO: This is align_pointer_forward
+ uint64 page_addr = (uint64) (((uint64) ((ptrdiff_t) iov) + (uint64) pagesize) & ~(pagesize - 1));
+ iov = (IOVec *) ((ptrdiff_t) page_addr);
#if (defined(__sparc) || defined(__alpha))
if (mprotect((char *) page_addr, pagesize, PROT_NONE))
@@ -285,13 +285,13 @@ n_byte_bank(0), byte_bank_size(0), misse
msg.iob_descriptor_block->alloc(BUFFER_SIZE_FOR_XMALLOC(size));
char *a = msg.iob_descriptor_block->data->data();
- page_addr = (uint64) (((uint64) ((int_pointer) a) + (uint64) pagesize) & ~(pagesize - 1));
+ page_addr = (uint64) (((uint64) ((ptrdiff_t) a) + (uint64) pagesize) & ~(pagesize - 1));
#if (defined(__sparc) || defined(__alpha))
if (mprotect((char *) page_addr, pagesize, PROT_NONE))
perror("ClusterState mprotect failed");
#endif
- a = (char *) ((int_pointer) (page_addr + (uint64) pagesize));
+ a = (char *) ((ptrdiff_t) (page_addr + (uint64) pagesize));
memset(a, 0, size - (2 * pagesize));
msg.descriptor = (Descriptor *) (a + sizeof(ClusterMsgHeader));
Modified: trafficserver/traffic/trunk/libinktomi++/ink_port.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_port.h?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_port.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_port.h Wed May 26 13:44:16 2010
@@ -33,9 +33,10 @@
#define _ink_port_h_
#include "ink_config.h"
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdint.h>
+#include <stddef.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
typedef char int8;
typedef unsigned char uint8;
@@ -46,16 +47,6 @@ typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
-#if (SIZEOF_VOID_POINTER == 8) || (SIZEOF_VOID_POINTER == 4)
-#if (SIZEOF_VOID_POINTER == 8)
-typedef long long int_pointer;
-#else
-typedef unsigned long int_pointer;
-#endif
-#else
-#error "Invalid pointer size"
-#endif
-
#ifndef INT64_MIN
#define INTU64_MAX (18446744073709551615ULL)
#define INT64_MAX (9223372036854775807LL)
Modified: trafficserver/traffic/trunk/libinktomi++/ink_queue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_queue.h?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_queue.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_queue.h Wed May 26 13:44:16 2010
@@ -34,6 +34,7 @@
***********************************************************************/
+#include "ink_platform.h"
#include "ink_port.h"
#include "ink_apidefs.h"
#include "ink_unused.h"
Modified: trafficserver/traffic/trunk/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/inktomi%2B%2B.h?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/inktomi++.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/inktomi++.h Wed May 26 13:44:16 2010
@@ -39,6 +39,7 @@
#include "ink_config.h"
#include "ink_platform.h"
+#include "ink_port.h"
#include "ink_aiocb.h"
#include "ink_align.h"
#include "ink_apidefs.h"
@@ -61,7 +62,6 @@
#include "ink_lockfile.h"
#include "ink_memory.h"
#include "ink_mutex.h"
-#include "ink_port.h"
#include "ink_queue.h"
#include "ink_rand.h"
#include "ink_resolver.h"
Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc Wed May 26 13:44:16 2010
@@ -1118,11 +1118,11 @@ HdrHeap::dump_heap(int len)
}
end = ((char *) this) + len;
- fprintf(stderr, "---- Dumping header heap @ 0x%llx - len %d ------", (uint64) ((int_pointer) this), len);
+ fprintf(stderr, "---- Dumping header heap @ 0x%llx - len %d ------", (uint64) ((ptrdiff_t) this), len);
while (tmp < end) {
if (count % 4 == 0) {
- fprintf(stderr, "\n0x%llx: ", (uint64) ((int_pointer) tmp));
+ fprintf(stderr, "\n0x%llx: ", (uint64) ((ptrdiff_t) tmp));
}
count++;
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=948424&r1=948423&r2=948424&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Wed May 26 13:44:16 2010
@@ -21,15 +21,12 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/**************************************************************************
Signal functions and handlers.
**************************************************************************/
-
#include "inktomi++.h"
-#include <unistd.h>
#include "signals.h"
#include "ProxyConfig.h"
#include "P_EventSystem.h"
@@ -93,9 +90,13 @@ public:
if (!snap)
snap = (char *) sbrk(0);
char *now = (char *) sbrk(0);
- fprintf(stderr, "sbrk %llX from first %lld from last %lld\n",
- (uint64) ((int_pointer) now), (uint64) ((int_pointer) (now - end)),
- (uint64) ((int_pointer) (now - snap)));
+ // TODO: Use logging instead directly writing to stderr
+ // This is not error condition at the first place
+ // so why stderr?
+ //
+ fprintf(stderr, "sbrk 0x%llx from first %lld from last %lld\n",
+ (uint64) ((ptrdiff_t) now), (uint64) ((ptrdiff_t) (now - end)),
+ (uint64) ((ptrdiff_t) (now - snap)));
#ifdef DEBUG
int fmdelta = fastmemtotal - fastmemsnap;
fprintf(stderr, "fastmem %lld from last %lld\n", (int64) fastmemtotal, (int64) fmdelta);
@@ -118,6 +119,10 @@ public:
{
SET_HANDLER(&TrackerContinuation::periodic);
use_baseline = 0;
+ // TODO: ATS prefix all those environment struff or
+ // even better use config since env can be
+ // different for parent and child process users.
+ //
if (getenv("MEMTRACK_BASELINE"))
{
use_baseline = 1;