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 02:02:52 UTC
svn commit: r945968 - in /trafficserver/traffic/trunk:
iocore/eventsystem/I_Action.h iocore/eventsystem/P_UnixEventProcessor.h
iocore/net/UnixUDPNet.cc libinktomi++/Compatability.h proxy/InkAPI.cc
Author: jplevyak
Date: Wed May 19 00:02:51 2010
New Revision: 945968
URL: http://svn.apache.org/viewvc?rev=945968&view=rev
Log:
TS-358: replace paddr_t with uintptr_t, remove ink_offsetof
george, this compiles on solaris, linux and freebsd, I hope I didn't break mac
Modified:
trafficserver/traffic/trunk/iocore/eventsystem/I_Action.h
trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h
trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
trafficserver/traffic/trunk/libinktomi++/Compatability.h
trafficserver/traffic/trunk/proxy/InkAPI.cc
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_Action.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_Action.h?rev=945968&r1=945967&r2=945968&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_Action.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_Action.h Wed May 19 00:02:51 2010
@@ -203,11 +203,11 @@ Action():continuation(NULL), cancelled(f
// #define ACTION_RESULT_HOST_DB_OFFLINE
// MAKE_ACTION_RESULT(ACTION_RESULT_HOST_DB_BASE + 0)
-#define MAKE_ACTION_RESULT(_x) (Action*)(((paddr_t)((_x<<1)+1)))
+#define MAKE_ACTION_RESULT(_x) (Action*)(((uintptr_t)((_x<<1)+1)))
#define ACTION_RESULT(_x) \
- (int)((((paddr_t)_x)&1)!=0?(((paddr_t_x)>>1):(paddr_t)0))
+ (int)((((uintptr_t)_x)&1)!=0?(((uintptr_t)>>1):(uintptr_t)0))
-#define IS_ACTION_RESULT(_x) ((((paddr_t)_x)&1) != 0)
+#define IS_ACTION_RESULT(_x) ((((uintptr_t)_x)&1) != 0)
#endif /*_Action_h_*/
Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h?rev=945968&r1=945967&r2=945968&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h Wed May 19 00:02:51 2010
@@ -44,8 +44,8 @@ thread_data_used(0)
TS_INLINE off_t
EventProcessor::allocate(int size)
{
- static off_t start = (ink_offsetof(EThread, thread_private) + 7) & ~7;
- static off_t loss = start - ink_offsetof(EThread, thread_private);
+ static off_t start = (offsetof(EThread, thread_private) + 7) & ~7;
+ static off_t loss = start - offsetof(EThread, thread_private);
size = (size + 7) & ~7; // 8 byte alignment
int old;
Modified: trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=945968&r1=945967&r2=945968&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Wed May 19 00:02:51 2010
@@ -1164,8 +1164,8 @@ UDPQueue::send(UDPPacket * p)
UDPNetHandler::UDPNetHandler()
{
mutex = new_ProxyMutex();
- ink_atomiclist_init(&udpOutQueue.atomicQueue, "Outgoing UDP Packet queue", ink_offsetof(UDPPacketInternal, alink.next));
- ink_atomiclist_init(&udpNewConnections, "UDP Connection queue", ink_offsetof(UnixUDPConnection, newconn_alink.next));
+ ink_atomiclist_init(&udpOutQueue.atomicQueue, "Outgoing UDP Packet queue", offsetof(UDPPacketInternal, alink.next));
+ ink_atomiclist_init(&udpNewConnections, "UDP Connection queue", offsetof(UnixUDPConnection, newconn_alink.next));
nextCheck = ink_get_hrtime_internal() + HRTIME_MSECONDS(1000);
lastCheck = 0;
SET_HANDLER((UDPNetContHandler) & UDPNetHandler::startNetEvent);
Modified: trafficserver/traffic/trunk/libinktomi++/Compatability.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Compatability.h?rev=945968&r1=945967&r2=945968&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Compatability.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Compatability.h Wed May 19 00:02:51 2010
@@ -64,19 +64,13 @@ template<class T> T max(const T a, const
#endif
#if (HOST_OS == linux)
-/* typedef int rlim_t; */
-typedef long paddr_t;
#ifndef __x86_64
typedef unsigned long long uint64_t;
#endif
#endif
#if ((HOST_OS == freebsd) || (HOST_OS == darwin))
-typedef long paddr_t;
-typedef unsigned int in_addr_t;
-#elif (HOST_OS == solaris)
-#include <sys/types.h> /* paddr_t should be defined here*/
-typedef uint64_t paddr_t;
+typedef uint32_t in_addr_t;
#endif
#define NEED_HRTIME
@@ -129,21 +123,6 @@ extern "C" void bcopy(const void *s1, vo
#define ink_mmap mmap
#define ink_sleep sleep
-#if (__GNUC__ >= 3) && ((HOST_OS == darwin) || (HOST_OS == solaris))
-#define ink_offsetof(TYPE, MEMBER) (__builtin_offsetof (TYPE, MEMBER))
-#else /* !GNUC */
-#if (HOST_OS == solaris)
-//#include <stddef.h> // FIXME: pulled offsetof() from here
-#if __cplusplus >= 199711L
-#define ink_offsetof(s, m) (std::size_t)(&(((s *)0)->m))
-#else
-#define ink_offsetof(s, m) (size_t)(&(((s *)0)->m))
-#endif
-#else /* !GNUC & !solaris */
-#define ink_offsetof offsetof
-#endif
-#endif
-
#include "Resource.h"
#endif
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=945968&r1=945967&r2=945968&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Wed May 19 00:02:51 2010
@@ -4961,7 +4961,7 @@ INKContSchedule(INKCont contp, unsigned
}
/* This is a hack. SHould be handled in ink_types */
- action = (INKAction) ((paddr_t) action | 0x1);
+ action = (INKAction) ((uintptr_t) action | 0x1);
return action;
}
@@ -4983,7 +4983,7 @@ INKAction INKHttpSchedule(INKCont contp
action = eventProcessor.schedule_in (sm, HRTIME_MSECONDS (timeout), ET_NET);
}
- action = (INKAction) ((paddr_t) action | 0x1);
+ action = (INKAction) ((uintptr_t) action | 0x1);
return action;
}
@@ -6607,8 +6607,8 @@ INKActionCancel(INKAction actionp)
INKContInternal *i;
/* This is a hack. SHould be handled in ink_types */
- if ((paddr_t) actionp & 0x1) {
- a = (Action *) ((paddr_t) actionp - 1);
+ if ((uintptr_t) actionp & 0x1) {
+ a = (Action *) ((uintptr_t) actionp - 1);
i = (INKContInternal *) a->continuation;
i->handle_event_count(EVENT_IMMEDIATE);
} else {