trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jplev...@apache.org
Subject svn commit: r896260 [1/2] - in /incubator/trafficserver/traffic/branches/dev: iocore/aio/ iocore/cache/ iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/hostdb/ iocore/net/ iocore/utils/ proxy/stats/
Date Tue, 05 Jan 2010 22:55:57 GMT
Author: jplevyak
Date: Tue Jan  5 22:55:39 2010
New Revision: 896260

URL: http://svn.apache.org/viewvc?rev=896260&view=rev
Log:
TS-77: remove INK_INLINE which is now unnecessary (it was for dealing with a problem on Alpha).
This also resulted in a number of Inline.cc files being reoved.

Removed:
    incubator/trafficserver/traffic/branches/dev/iocore/cache/Inline.cc
    incubator/trafficserver/traffic/branches/dev/iocore/dns/Inline.cc
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Inline.cc
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/Inline.cc
    incubator/trafficserver/traffic/branches/dev/iocore/net/Inline.cc
Modified:
    incubator/trafficserver/traffic/branches/dev/iocore/aio/I_AIO.h
    incubator/trafficserver/traffic/branches/dev/iocore/aio/P_AIO.h
    incubator/trafficserver/traffic/branches/dev/iocore/cache/I_Cache.h
    incubator/trafficserver/traffic/branches/dev/iocore/cache/Makefile.am
    incubator/trafficserver/traffic/branches/dev/iocore/cache/P_Cache.h
    incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h
    incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_Cluster.h
    incubator/trafficserver/traffic/branches/dev/iocore/dns/I_DNS.h
    incubator/trafficserver/traffic/branches/dev/iocore/dns/Makefile.am
    incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h
    incubator/trafficserver/traffic/branches/dev/iocore/dns/P_SplitDNS.h
    incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.cc
    incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EThread.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EventSystem.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_IOBuffer.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_Thread.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Makefile.am
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_IOBuffer.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_ProtectedQueue.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_Thread.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEThread.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEvent.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEventProcessor.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VConnection.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VIO.h
    incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Processor.cc
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/I_HostDB.h
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/Makefile.am
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/I_Net.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPConnection.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPPacket.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/Makefile.am
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_Net.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_NetVConnection.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPConnection.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPPacket.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetProcessor.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetVConnection.h
    incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixUDPConnection.h
    incubator/trafficserver/traffic/branches/dev/iocore/utils/I_Disk.h
    incubator/trafficserver/traffic/branches/dev/iocore/utils/MTInteractor.cc
    incubator/trafficserver/traffic/branches/dev/iocore/utils/OpQueue.cc
    incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.cc
    incubator/trafficserver/traffic/branches/dev/proxy/stats/Stats.cc

Modified: incubator/trafficserver/traffic/branches/dev/iocore/aio/I_AIO.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/aio/I_AIO.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/aio/I_AIO.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/aio/I_AIO.h Tue Jan  5 22:55:39 2010
@@ -31,10 +31,6 @@
 #if !defined (_I_AIO_h_)
 #define _I_AIO_h_
 
-#ifndef INK_INLINE
-#define INK_INLINE
-#endif
-
 #include "inktomi++.h"
 #include "I_EventSystem.h"
 #include "I_RecProcess.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/aio/P_AIO.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/aio/P_AIO.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/aio/P_AIO.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/aio/P_AIO.h Tue Jan  5 22:55:39 2010
@@ -31,11 +31,6 @@
 #ifndef _P_AIO_h_
 #define _P_AIO_h_
 
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
-
 #include "P_EventSystem.h"
 #include "I_AIO.h"
 
@@ -65,13 +60,13 @@
   }
 };
 
-INK_INLINE int
+inline int
 AIOCallback::ok()
 {
   return (ink_off_t) aiocb.aio_nbytes == (ink_off_t) aio_result;
 };
 
-INK_INLINE int
+inline int
 AIOCallbackInternal::io_complete(int event, void *data)
 {
   (void) event;

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/I_Cache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/I_Cache.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/I_Cache.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/I_Cache.h Tue Jan  5 22:55:39 2010
@@ -24,10 +24,6 @@
 #ifndef _I_CACHE_H__
 #define _I_CACHE_H__
 
-#ifndef INK_INLINE
-#define INK_INLINE
-#endif
-
 #include "inktomi++.h"
 #include "I_EventSystem.h"
 #include "I_AIO.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/Makefile.am?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/Makefile.am Tue Jan  5 22:55:39 2010
@@ -33,7 +33,6 @@
   I_Cache.h \
   I_CacheDefs.h \
   I_Store.h \
-  Inline.cc \
   NewCacheVC.cc \
   NewCacheVC.h \
   P_Cache.h \

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/P_Cache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/P_Cache.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/P_Cache.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/P_Cache.h Tue Jan  5 22:55:39 2010
@@ -24,11 +24,6 @@
 #ifndef _P_CACHE_H__
 #define _P_CACHE_H__
 
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
-
 #define PATH_NAME_MAX 511
 #include "inktomi++.h"
 #include "P_EventSystem.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/P_CacheInternal.h Tue Jan  5 22:55:39 2010
@@ -951,7 +951,7 @@
 
 
 #ifdef HTTP_CACHE
-INK_INLINE Action *
+inline Action *
 Cache::open_read(Continuation * cont, CacheURL * url, CacheHTTPHdr * request,
                  CacheLookupHttpConfig * params, CacheFragType type)
 {
@@ -962,7 +962,7 @@
   return open_read(cont, &md5, request, params, type, (char *) hostname, len);
 }
 
-INK_INLINE void
+inline void
 Cache::generate_key(INK_MD5 * md5, URL * url, CacheHTTPHdr * request)
 {
 #ifdef BROKEN_HACK_FOR_VARY_ON_UA
@@ -1007,7 +1007,7 @@
   url->MD5_get(md5);
 }
 
-INK_INLINE Action *
+inline Action *
 Cache::open_write(Continuation * cont, CacheURL * url, CacheHTTPHdr * request,
                   CacheHTTPInfo * old_info, time_t pin_in_cache, CacheFragType type)
 {
@@ -1021,7 +1021,7 @@
 }
 #endif
 
-INK_INLINE unsigned int
+inline unsigned int
 cache_hash(INK_MD5 & md5)
 {
   inku64 f = md5.fold();
@@ -1040,7 +1040,7 @@
 #include "P_ClusterInline.h"
 #endif
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::lookup(Continuation * cont, CacheKey * key, bool local_only,
                        CacheFragType frag_type, char *hostname, int host_len)
 {
@@ -1057,7 +1057,7 @@
   return caches[frag_type]->lookup(cont, key, frag_type, hostname, host_len);
 }
 
-INK_INLINE inkcoreapi Action *
+inline inkcoreapi Action *
 CacheProcessor::open_read(Continuation * cont, CacheKey * key, CacheFragType frag_type, char *hostname, int host_len)
 {
 #ifdef CLUSTER_CACHE
@@ -1070,7 +1070,7 @@
   return caches[frag_type]->open_read(cont, key, frag_type, hostname, host_len);
 }
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::open_read_buffer(Continuation * cont, MIOBuffer * buf, CacheKey * key, CacheFragType frag_type,
                                  char *hostname, int host_len)
 {
@@ -1086,7 +1086,7 @@
 }
 
 
-INK_INLINE inkcoreapi Action *
+inline inkcoreapi Action *
 CacheProcessor::open_write(Continuation * cont, int expected_size, CacheKey * key,
                            CacheFragType frag_type, bool overwrite, time_t pin_in_cache, char *hostname, int host_len)
 {
@@ -1105,7 +1105,7 @@
 
 }
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::open_write_buffer(Continuation * cont, MIOBuffer * buf, CacheKey * key, bool overwrite,
                                   CacheFragType frag_type, char *hostname, int host_len)
 {
@@ -1120,7 +1120,7 @@
   return NULL;
 }
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::remove(Continuation * cont, CacheKey * key,
                        bool rm_user_agents, bool rm_link, CacheFragType frag_type, char *hostname, int host_len)
 {
@@ -1136,14 +1136,14 @@
   return caches[frag_type]->remove(cont, key, rm_user_agents, rm_link, frag_type, hostname, host_len);
 }
 
-INK_INLINE Action *
+inline Action *
 scan(Continuation * cont, char *hostname = 0, int host_len = 0, int KB_per_second = 2500)
 {
   return caches[CACHE_FRAG_TYPE_HTTP]->scan(cont, hostname, host_len, KB_per_second);
 }
 
 #ifdef HTTP_CACHE
-INK_INLINE Action *
+inline Action *
 CacheProcessor::lookup(Continuation * cont, URL * url, bool local_only, CacheFragType frag_type)
 {
   (void) local_only;
@@ -1157,7 +1157,7 @@
 
 
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::open_read_buffer(Continuation * cont, MIOBuffer * buf,
                                  URL * url, CacheHTTPHdr * request, CacheLookupHttpConfig * params, CacheFragType type)
 {
@@ -1172,7 +1172,7 @@
 }
 
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::open_write_buffer(Continuation * cont, MIOBuffer * buf, URL * url,
                                   CacheHTTPHdr * request, CacheHTTPHdr * response, CacheFragType type)
 {
@@ -1191,7 +1191,7 @@
 
 
 #ifdef CLUSTER_CACHE
-INK_INLINE Action *
+inline Action *
 CacheProcessor::open_read_internal(int opcode,
                                    Continuation * cont, MIOBuffer * buf,
                                    CacheURL * url,
@@ -1224,7 +1224,7 @@
 #endif
 
 #ifdef CLUSTER_CACHE
-INK_INLINE Action *
+inline Action *
 CacheProcessor::link(Continuation * cont, CacheKey * from, CacheKey * to,
                      CacheFragType type, char *hostname, int host_len)
 {
@@ -1238,7 +1238,7 @@
   return caches[type]->link(cont, from, to, type, hostname, host_len);
 }
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::deref(Continuation * cont, CacheKey * key, CacheFragType type, char *hostname, int host_len)
 {
   if (cache_clustering_enabled > 0) {
@@ -1251,19 +1251,19 @@
 }
 #endif
 
-INK_INLINE Action *
+inline Action *
 CacheProcessor::scan(Continuation * cont, char *hostname, int host_len, int KB_per_second)
 {
   return caches[CACHE_FRAG_TYPE_HTTP]->scan(cont, hostname, host_len, KB_per_second);
 }
 
-INK_INLINE int
+inline int
 CacheProcessor::IsCacheEnabled()
 {
   return CacheProcessor::initialized;
 }
 
-INK_INLINE unsigned int
+inline unsigned int
 CacheProcessor::IsCacheReady(CacheFragType type)
 {
   if (IsCacheEnabled() != CACHE_INITIALIZED)
@@ -1271,13 +1271,13 @@
   return (cache_ready & type);
 }
 
-INK_INLINE Cache *
+inline Cache *
 local_cache()
 {
   return theCache;
 }
 
-INK_INLINE int
+inline int
 cache_history_dump()
 {
   return 0;

Modified: incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_Cluster.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_Cluster.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_Cluster.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cluster/P_Cluster.h Tue Jan  5 22:55:39 2010
@@ -23,10 +23,6 @@
 
 #ifndef _P_CLUSTER_H__
 #define _P_CLUSTER_H__
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
 
 #include "inktomi++.h"
 #include "P_EventSystem.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/I_DNS.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/I_DNS.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/I_DNS.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/I_DNS.h Tue Jan  5 22:55:39 2010
@@ -32,10 +32,6 @@
 #ifndef _I_DNS_h_
 #define _I_DNS_h_
 
-#ifndef INK_INLINE
-#define INK_INLINE
-#endif
-
 #include "I_EventSystem.h"
 #include "I_HostDB.h"
 #include "I_Net.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/Makefile.am?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/Makefile.am Tue Jan  5 22:55:39 2010
@@ -28,7 +28,6 @@
   I_DNSProcessor.h \
   I_SplitDNS.h \
   I_SplitDNSProcessor.h \
-  Inline.cc \
   P_DNS.h \
   P_DNSConnection.h \
   P_DNSProcessor.h \

Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h Tue Jan  5 22:55:39 2010
@@ -30,15 +30,8 @@
 #if !defined (_P_DNS_h_)
 #define _P_DNS_h_
 
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
-
-
 #include "I_DNS.h"
 #include "inktomi++.h"
-//#include <arpa/nameser.h>
 #include "P_EventSystem.h"
 #include "I_Cache.h"
 #include "P_Net.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/P_SplitDNS.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/P_SplitDNS.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/P_SplitDNS.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/P_SplitDNS.h Tue Jan  5 22:55:39 2010
@@ -31,11 +31,6 @@
 #ifndef _P_SPLIT_DNS_H_
 #define _P_SPLIT_DNS_H_
 
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
-
 #include "P_DNS.h"
 #include "I_SplitDNS.h"
 #include "I_Lock.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.cc?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.cc Tue Jan  5 22:55:39 2010
@@ -39,12 +39,6 @@
 
 ClassAllocator<SRV> SRVAllocator("SRVAllocator");
 
-INK_INLINE bool
-operator<(const SRV & left, const SRV & right)
-{
-  return (left.getPriority() < right.getPriority());    /* lower priorities first :) */
-}
-
 /* 
 To select a target to be contacted next, arrange all SRV RRs
 (that have not been ordered yet) in any order, except that all

Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/SRV.h Tue Jan  5 22:55:39 2010
@@ -102,7 +102,12 @@
 
 };
 
-INK_INLINE bool operator<(const SRV & left, const SRV & right);
+inline bool
+operator<(const SRV & left, const SRV & right)
+{
+  return (left.getPriority() < right.getPriority());    /* lower priorities first :) */
+}
+
 extern ClassAllocator<SRV> SRVAllocator;
 
 class SRVHosts

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EThread.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EThread.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EThread.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EThread.h Tue Jan  5 22:55:39 2010
@@ -353,5 +353,5 @@
 
 #define ETHREAD_GET_PTR(thread, offset) ((void*)((char*)(thread)+(offset)))
 
-INK_INLINE EThread *this_ethread();
+inline EThread *this_ethread();
 #endif /*_EThread_h_*/

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EventSystem.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EventSystem.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EventSystem.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_EventSystem.h Tue Jan  5 22:55:39 2010
@@ -27,10 +27,6 @@
 
 #include "inktomi++.h"
 
-#ifndef INK_INLINE
-#define INK_INLINE
-#endif
-
 #include "I_IOBuffer.h"
 #include "I_Action.h"
 #include "I_Continuation.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_IOBuffer.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_IOBuffer.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_IOBuffer.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_IOBuffer.h Tue Jan  5 22:55:39 2010
@@ -1202,7 +1202,7 @@
   MIOBufferAccessor & operator =(const MIOBufferAccessor &);
 };
 
-INK_INLINE MIOBuffer * new_MIOBuffer_internal(
+inline MIOBuffer * new_MIOBuffer_internal(
 #ifdef TRACK_BUFFER_USER
                                                const char *loc,
 #endif
@@ -1224,7 +1224,7 @@
 };
 #endif
 
-INK_INLINE MIOBuffer * new_empty_MIOBuffer_internal(
+inline MIOBuffer * new_empty_MIOBuffer_internal(
 #ifdef TRACK_BUFFER_USER
                                                      const char *loc,
 #endif
@@ -1253,15 +1253,15 @@
 #define new_MIOBuffer               new_MIOBuffer_internal
 #define new_empty_MIOBuffer         new_empty_MIOBuffer_internal
 #endif
-INK_INLINE void free_MIOBuffer(MIOBuffer * mio);
+inline void free_MIOBuffer(MIOBuffer * mio);
 //////////////////////////////////////////////////////////////////////
 
-INK_INLINE IOBufferBlock * new_IOBufferBlock_internal(
+inline IOBufferBlock * new_IOBufferBlock_internal(
 #ifdef TRACK_BUFFER_USER
                                                        const char *loc
 #endif
   );
-INK_INLINE IOBufferBlock * new_IOBufferBlock_internal(
+inline IOBufferBlock * new_IOBufferBlock_internal(
 #ifdef TRACK_BUFFER_USER
                                                        const char *loc,
 #endif
@@ -1295,20 +1295,20 @@
 #endif
 ////////////////////////////////////////////////////////////
 
-INK_INLINE IOBufferData *new_IOBufferData_internal(
+inline IOBufferData *new_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                                                     const char *location,
 #endif
                                                     int size_index = default_large_iobuffer_size,
                                                     AllocType type = DEFAULT_ALLOC);
 
-INK_INLINE IOBufferData *new_xmalloc_IOBufferData_internal(
+inline IOBufferData *new_xmalloc_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                                                             const char *location,
 #endif
                                                             void *b, int size);
 
-INK_INLINE IOBufferData *new_constant_IOBufferData_internal(
+inline IOBufferData *new_constant_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                                                              const char *loc,
 #endif
@@ -1345,8 +1345,8 @@
 #define  new_constant_IOBufferData new_constant_IOBufferData_internal
 #endif
 
-INK_INLINE int iobuffer_size_to_index(unsigned int size, int max = max_iobuffer_size);
-INK_INLINE int index_to_buffer_size(int idx);
+inline int iobuffer_size_to_index(unsigned int size, int max = max_iobuffer_size);
+inline int index_to_buffer_size(int idx);
 /**
   Clone a IOBufferBlock chain. Used to snarf a IOBufferBlock chain
   w/o copy.
@@ -1357,7 +1357,7 @@
   @return ptr to head of new IOBufferBlock chain.
 
 */
-INK_INLINE IOBufferBlock *iobufferblock_clone(IOBufferBlock * b, int offset, int len);
+inline IOBufferBlock *iobufferblock_clone(IOBufferBlock * b, int offset, int len);
 /**
   Skip over specified bytes in chain. Used for dropping references.
 
@@ -1369,5 +1369,5 @@
   @return ptr to head of new IOBufferBlock chain.
 
 */
-INK_INLINE IOBufferBlock *iobufferblock_skip(IOBufferBlock * b, int *poffset, int *plen, int write);
+inline IOBufferBlock *iobufferblock_skip(IOBufferBlock * b, int *poffset, int *plen, int write);
 #endif

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_Thread.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_Thread.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_Thread.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/I_Thread.h Tue Jan  5 22:55:39 2010
@@ -133,8 +133,8 @@
   }
 };
 
-INK_INLINE ink_hrtime ink_get_hrtime();
-INK_INLINE ink_hrtime ink_get_based_hrtime();
-INK_INLINE Thread *this_thread();
+inline ink_hrtime ink_get_hrtime();
+inline ink_hrtime ink_get_based_hrtime();
+inline Thread *this_thread();
 
 #endif /*_I_Thread_h*/

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Makefile.am?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Makefile.am Tue Jan  5 22:55:39 2010
@@ -19,7 +19,6 @@
   I_EventSystem.h \
   I_IOBuffer.h \
   I_Lock.h \
-  Inline.cc \
   IOBuffer.cc \
   I_PriorityEventQueue.h \
   I_Processor.h \

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h Tue Jan  5 22:55:39 2010
@@ -30,10 +30,6 @@
 **************************************************************************/
 #ifndef _P_EventSystem_h
 #define _P_EventSystem_h
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
 
 #include "I_EventSystem.h"
 

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_IOBuffer.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_IOBuffer.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_IOBuffer.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_IOBuffer.h Tue Jan  5 22:55:39 2010
@@ -33,7 +33,7 @@
 // +1 for each power of 2
 //
 //////////////////////////////////////////////////////////////
-INK_INLINE int
+inline int
 buffer_size_to_index(unsigned int size, int max = max_iobuffer_size)
 {
   int r = max;
@@ -42,7 +42,7 @@
   return r;
 }
 
-INK_INLINE int
+inline int
 iobuffer_size_to_index(unsigned int size, int max)
 {
   if (size > (unsigned int)BUFFER_SIZE_FOR_INDEX(max)) {
@@ -57,7 +57,7 @@
   return buffer_size_to_index(size, max);
 }
 
-INK_INLINE int
+inline int
 index_to_buffer_size(int idx)
 {
   if (BUFFER_SIZE_INDEX_IS_FAST_ALLOCATED(idx))
@@ -71,7 +71,7 @@
   return 0;
 }
 
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 iobufferblock_clone(IOBufferBlock * b, int offset, int len)
 {
 
@@ -108,7 +108,7 @@
   return start_buf;
 }
 
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 iobufferblock_skip(IOBufferBlock * b, int *poffset, int *plen, int write)
 {
   int offset = *poffset;
@@ -139,7 +139,7 @@
 struct Resource;
 extern Resource *res_lookup(const char *path);
 
-INK_INLINE void
+inline void
 iobuffer_mem_inc(const char *_loc, int _size_index)
 {
   if (!res_track_memory)
@@ -166,7 +166,7 @@
   ink_debug_assert(r >= 0);
 }
 
-INK_INLINE void
+inline void
 iobuffer_mem_dec(const char *_loc, int _size_index)
 {
   if (!res_track_memory)
@@ -194,22 +194,22 @@
 
 //////////////////////////////////////////////////////////////////
 //
-// INK_INLINE functions definitions
+// inline functions definitions
 //
 //////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
 //
 //  class IOBufferData --
-//         INK_INLINE functions definitions
+//         inline functions definitions
 //
 //////////////////////////////////////////////////////////////////
-INK_INLINE int
+inline int
 IOBufferData::block_size()
 {
   return index_to_buffer_size(_size_index);
 }
 
-INK_INLINE IOBufferData *
+inline IOBufferData *
 new_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                            const char *location,
@@ -228,7 +228,7 @@
   return d;
 }
 
-INK_INLINE IOBufferData *
+inline IOBufferData *
 new_constant_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                                     const char *loc,
@@ -242,7 +242,7 @@
                                     b, size, BUFFER_SIZE_INDEX_FOR_CONSTANT_SIZE(size));
 }
 
-INK_INLINE IOBufferData *
+inline IOBufferData *
 new_xmalloc_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                                    const char *location,
@@ -256,7 +256,7 @@
                                     b, size, BUFFER_SIZE_INDEX_FOR_XMALLOC_SIZE(size));
 }
 
-INK_INLINE IOBufferData *
+inline IOBufferData *
 new_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                            const char *location,
@@ -270,7 +270,7 @@
                                     b, size, iobuffer_size_to_index(size));
 }
 
-INK_INLINE IOBufferData *
+inline IOBufferData *
 new_IOBufferData_internal(
 #ifdef TRACK_BUFFER_USER
                            const char *loc,
@@ -289,7 +289,7 @@
 // from being compiled correctly at -O3
 // so it is DUPLICATED in IOBuffer.cc
 // ****** IF YOU CHANGE THIS FUNCTION change that one as well.
-INK_INLINE void
+inline void
 IOBufferData::alloc(int size_index, AllocType type)
 {
   if (_data)
@@ -322,7 +322,7 @@
 // ****** IF YOU CHANGE THIS FUNCTION change that one as well.
 
 
-INK_INLINE void
+inline void
 IOBufferData::dealloc()
 {
 #ifdef TRACK_BUFFER_USER
@@ -348,7 +348,7 @@
   _mem_type = NO_ALLOC;
 }
 
-INK_INLINE void
+inline void
 IOBufferData::free()
 {
   dealloc();
@@ -358,10 +358,10 @@
 //////////////////////////////////////////////////////////////////
 //
 //  class IOBufferBlock --
-//         INK_INLINE functions definitions
+//         inline functions definitions
 //
 //////////////////////////////////////////////////////////////////
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 new_IOBufferBlock_internal(
 #ifdef TRACK_BUFFER_USER
                             const char *location
@@ -375,7 +375,7 @@
   return b;
 }
 
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 new_IOBufferBlock_internal(
 #ifdef TRACK_BUFFER_USER
                             const char *location,
@@ -390,7 +390,7 @@
   return b;
 }
 
-INK_INLINE
+inline
 IOBufferBlock::IOBufferBlock():
 _start(0),
 _end(0),
@@ -403,28 +403,28 @@
   return;
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::consume(int len)
 {
   _start += len;
   ink_assert(_start <= _end);
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::fill(int len)
 {
   _end += len;
   ink_assert(_end <= _buf_end);
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::reset()
 {
   _end = _start = buf();
   _buf_end = buf() + data->block_size();
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::alloc(int i)
 {
   ink_debug_assert(BUFFER_SIZE_ALLOCATED(i));
@@ -436,7 +436,7 @@
   reset();
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::clear()
 {
   data = NULL;
@@ -456,7 +456,7 @@
   _buf_end = _end = _start = NULL;
 }
 
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 IOBufferBlock::clone()
 {
 #ifdef TRACK_BUFFER_USER
@@ -474,20 +474,20 @@
   return b;
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::dealloc()
 {
   clear();
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::free()
 {
   dealloc();
   ioBlockAllocator.free(this);
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::set_internal(void *b, int len, int asize_index)
 {
 #ifdef TRACK_BUFFER_USER
@@ -504,7 +504,7 @@
   _end = _start + len;
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::set(IOBufferData * d, int len, int offset)
 {
   data = d;
@@ -513,7 +513,7 @@
   _buf_end = _start + d->block_size();
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::realloc_set_internal(void *b, int buf_size, int asize_index)
 {
   int data_size = size();
@@ -523,25 +523,25 @@
   _end = _start + data_size;
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::realloc(void *b, int buf_size)
 {
   realloc_set_internal(b, buf_size, BUFFER_SIZE_NOT_ALLOCATED);
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::realloc_xmalloc(void *b, int buf_size)
 {
   realloc_set_internal(b, buf_size, -buf_size);
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::realloc_xmalloc(int buf_size)
 {
   realloc_set_internal(xmalloc(buf_size), buf_size, -buf_size);
 }
 
-INK_INLINE void
+inline void
 IOBufferBlock::realloc(int i)
 {
   if (i == data->_size_index)
@@ -557,10 +557,10 @@
 //////////////////////////////////////////////////////////////////
 //
 //  class IOBufferReader --
-//         INK_INLINE functions definitions
+//         inline functions definitions
 //
 //////////////////////////////////////////////////////////////////
-INK_INLINE void
+inline void
 IOBufferReader::skip_empty_blocks()
 {
   while (block->next && block->next->read_avail() && start_offset >= block->size()) {
@@ -569,31 +569,31 @@
   }
 }
 
-INK_INLINE bool
+inline bool
 IOBufferReader::low_water()
 {
   return mbuf->low_water();
 }
 
-INK_INLINE bool
+inline bool
 IOBufferReader::high_water()
 {
   return read_avail() >= mbuf->water_mark;
 }
 
-INK_INLINE bool
+inline bool
 IOBufferReader::current_low_water()
 {
   return mbuf->current_low_water();
 }
 
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 IOBufferReader::get_current_block()
 {
   return (block);
 }
 
-INK_INLINE char *
+inline char *
 IOBufferReader::start()
 {
   if (block == 0)
@@ -602,7 +602,7 @@
   return block->start() + start_offset;
 }
 
-INK_INLINE char *
+inline char *
 IOBufferReader::end()
 {
   if (block == 0)
@@ -611,7 +611,7 @@
   return block->end();
 }
 
-INK_INLINE int
+inline int
 IOBufferReader::block_read_avail()
 {
   if (block == 0)
@@ -620,7 +620,7 @@
   return (int) (block->end() - (block->start() + start_offset));
 }
 
-INK_INLINE int
+inline int
 IOBufferReader::block_count()
 {
   int count = 0;
@@ -632,7 +632,7 @@
   return count;
 }
 
-INK_INLINE int
+inline int
 IOBufferReader::read_avail()
 {
   int t = 0;
@@ -647,7 +647,7 @@
   return t;
 }
 
-INK_INLINE void
+inline void
 IOBufferReader::consume(int n)
 {
   start_offset += n;
@@ -667,7 +667,7 @@
   ink_debug_assert(read_avail() >= 0);
 }
 
-INK_INLINE char &
+inline char &
 IOBufferReader::operator[] (int i)
 {
   static char
@@ -692,7 +692,7 @@
   return _error;
 }
 
-INK_INLINE void
+inline void
 IOBufferReader::clear()
 {
   accessor = NULL;
@@ -702,7 +702,7 @@
   size_limit = MAXINT;
 }
 
-INK_INLINE void
+inline void
 IOBufferReader::reset()
 {
   block = mbuf->_writer;
@@ -713,7 +713,7 @@
 ////////////////////////////////////////////////////////////////
 //
 //  class MIOBuffer --
-//      INK_INLINE functions definitions
+//      inline functions definitions
 //
 ////////////////////////////////////////////////////////////////
 inkcoreapi extern ClassAllocator<MIOBuffer> ioAllocator;
@@ -730,7 +730,7 @@
 //  MIOBufferData) will be freed by this class.
 //
 ////////////////////////////////////////////////////////////////
-INK_INLINE
+inline
 MIOBuffer::MIOBuffer(void *b, int bufsize, int aWater_mark)
 {
   set(b, bufsize);
@@ -742,7 +742,7 @@
   return;
 }
 
-INK_INLINE
+inline
 MIOBuffer::MIOBuffer(int default_size_index)
 {
   clear();
@@ -753,7 +753,7 @@
   return;
 }
 
-INK_INLINE
+inline
 MIOBuffer::MIOBuffer()
 {
   clear();
@@ -763,7 +763,7 @@
   return;
 }
 
-INK_INLINE
+inline
 MIOBuffer::~
 MIOBuffer()
 {
@@ -771,7 +771,7 @@
   dealloc_all_readers();
 }
 
-INK_INLINE MIOBuffer * new_MIOBuffer_internal(
+inline MIOBuffer * new_MIOBuffer_internal(
 #ifdef TRACK_BUFFER_USER
                                                const char *location,
 #endif
@@ -785,7 +785,7 @@
   return b;
 }
 
-INK_INLINE void
+inline void
 free_MIOBuffer(MIOBuffer * mio)
 {
   mio->_writer = NULL;
@@ -793,7 +793,7 @@
   ioAllocator.free(mio);
 }
 
-INK_INLINE MIOBuffer * new_empty_MIOBuffer_internal(
+inline MIOBuffer * new_empty_MIOBuffer_internal(
 #ifdef TRACK_BUFFER_USER
                                                      const char *location,
 #endif
@@ -807,13 +807,13 @@
   return b;
 }
 
-INK_INLINE void
+inline void
 free_empty_MIOBuffer(MIOBuffer * mio)
 {
   ioAllocator.free(mio);
 }
 
-INK_INLINE IOBufferReader *
+inline IOBufferReader *
 MIOBuffer::alloc_accessor(MIOBufferAccessor * anAccessor)
 {
   int i;
@@ -832,7 +832,7 @@
   return e;
 }
 
-INK_INLINE IOBufferReader *
+inline IOBufferReader *
 MIOBuffer::alloc_reader()
 {
   int i;
@@ -851,12 +851,12 @@
   return e;
 }
 
-INK_INLINE int
+inline int
 MIOBuffer::block_size()
 {
   return index_to_buffer_size(size_index);
 }
-INK_INLINE IOBufferReader *
+inline IOBufferReader *
 MIOBuffer::clone_reader(IOBufferReader * r)
 {
   int i;
@@ -878,7 +878,7 @@
   return e;
 }
 
-INK_INLINE int
+inline int
 MIOBuffer::block_write_avail()
 {
   IOBufferBlock *b = first_write_block();
@@ -900,7 +900,7 @@
 //  block.
 //
 ////////////////////////////////////////////////////////////////
-INK_INLINE void
+inline void
 MIOBuffer::append_block_internal(IOBufferBlock * b)
 {
   // It would be nice to remove an empty buffer at the beginning,
@@ -923,7 +923,7 @@
     _writer = _writer->next;
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::append_block(IOBufferBlock * b)
 {
   ink_assert(b->read_avail());
@@ -938,7 +938,7 @@
 //  and make the new block the current block (writer).
 //
 ////////////////////////////////////////////////////////////////
-INK_INLINE void
+inline void
 MIOBuffer::append_block(int asize_index)
 {
   ink_debug_assert(BUFFER_SIZE_ALLOCATED(asize_index));
@@ -952,20 +952,20 @@
   return;
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::add_block()
 {
   append_block(size_index);
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::check_add_block()
 {
   if (!high_water() && current_low_water())
     add_block();
 }
 
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 MIOBuffer::get_current_block()
 {
   return first_write_block();
@@ -981,7 +981,7 @@
 //  or below the watermark space available.
 //
 //////////////////////////////////////////////////////////////////
-INK_INLINE int
+inline int
 MIOBuffer::current_write_avail()
 {
   int t = 0;
@@ -1002,14 +1002,14 @@
 //  the current block then a new block is appended.
 //
 //////////////////////////////////////////////////////////////////
-INK_INLINE int
+inline int
 MIOBuffer::write_avail()
 {
   check_add_block();
   return current_write_avail();
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::fill(int len)
 {
   int f = _writer->write_avail();
@@ -1023,7 +1023,7 @@
   _writer->fill(len);
 }
 
-INK_INLINE int
+inline int
 MIOBuffer::max_block_count()
 {
   int maxb = 0;
@@ -1038,7 +1038,7 @@
   return maxb;
 }
 
-INK_INLINE int
+inline int
 MIOBuffer::max_read_avail()
 {
   int s = 0;
@@ -1057,7 +1057,7 @@
   return s;
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::set(void *b, int len)
 {
 #ifdef TRACK_BUFFER_USER
@@ -1069,7 +1069,7 @@
   init_readers();
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::set_xmalloced(void *b, int len)
 {
 #ifdef TRACK_BUFFER_USER
@@ -1081,7 +1081,7 @@
   init_readers();
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::append_xmalloced(void *b, int len)
 {
 #ifdef TRACK_BUFFER_USER
@@ -1093,7 +1093,7 @@
   append_block_internal(x);
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::append_fast_allocated(void *b, int len, int fast_size_index)
 {
 #ifdef TRACK_BUFFER_USER
@@ -1105,7 +1105,7 @@
   append_block_internal(x);
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::alloc(int i)
 {
 #ifdef TRACK_BUFFER_USER
@@ -1118,14 +1118,14 @@
   init_readers();
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::alloc_xmalloc(int buf_size)
 {
   char *b = (char *) xmalloc(buf_size);
   set_xmalloced(b, buf_size);
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::dealloc_reader(IOBufferReader * e)
 {
   if (e->accessor) {
@@ -1136,19 +1136,19 @@
   e->clear();
 }
 
-INK_INLINE IOBufferReader *
+inline IOBufferReader *
 IOBufferReader::clone()
 {
   return mbuf->clone_reader(this);
 }
 
-INK_INLINE void
+inline void
 IOBufferReader::dealloc()
 {
   mbuf->dealloc_reader(this);
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::dealloc_all_readers()
 {
   for (int i = 0; i < MAX_MIOBUFFER_READERS; i++)
@@ -1156,13 +1156,13 @@
       dealloc_reader(&readers[i]);
 }
 
-INK_INLINE void
+inline void
 MIOBuffer::set_size_index(int size)
 {
   size_index = iobuffer_size_to_index(size);
 }
 
-INK_INLINE void
+inline void
 MIOBufferAccessor::reader_for(MIOBuffer * abuf)
 {
   mbuf = abuf;
@@ -1172,7 +1172,7 @@
     entry = NULL;
 }
 
-INK_INLINE void
+inline void
 MIOBufferAccessor::reader_for(IOBufferReader * areader)
 {
   if (entry == areader)
@@ -1182,21 +1182,21 @@
   ink_assert(mbuf);
 }
 
-INK_INLINE void
+inline void
 MIOBufferAccessor::writer_for(MIOBuffer * abuf)
 {
   mbuf = abuf;
   entry = NULL;
 }
 
-INK_INLINE void
+inline void
 MIOBufferAccessor::clear()
 {
   entry = NULL;
   mbuf = NULL;
 }
 
-INK_INLINE
+inline
 MIOBufferAccessor::~
 MIOBufferAccessor()
 {

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_ProtectedQueue.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_ProtectedQueue.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_ProtectedQueue.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_ProtectedQueue.h Tue Jan  5 22:55:39 2010
@@ -33,7 +33,7 @@
 #include "I_EventSystem.h"
 
 
-INK_INLINE
+inline
 ProtectedQueue::ProtectedQueue()
 {
   Event e;
@@ -42,7 +42,7 @@
   ink_cond_init(&might_have_data);
 }
 
-INK_INLINE void
+inline void
 ProtectedQueue::signal()
 {
   // Need to get the lock before you can signal the thread
@@ -51,7 +51,7 @@
   ink_mutex_release(&lock);
 }
 
-INK_INLINE int
+inline int
 ProtectedQueue::try_signal()
 {
   // Need to get the lock before you can signal the thread
@@ -65,7 +65,7 @@
 }
 
 // Called from the same thread (don't need to signal)
-INK_INLINE void
+inline void
 ProtectedQueue::enqueue_local(Event * e)
 {
   ink_assert(!e->in_the_prot_queue && !e->in_the_priority_queue);
@@ -73,7 +73,7 @@
   localQueue.enqueue(e);
 }
 
-INK_INLINE void
+inline void
 ProtectedQueue::remove(Event * e)
 {
   ink_assert(e->in_the_prot_queue);
@@ -82,7 +82,7 @@
   e->in_the_prot_queue = 0;
 }
 
-INK_INLINE Event *
+inline Event *
 ProtectedQueue::dequeue_local()
 {
   Event *e = localQueue.dequeue();

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_Thread.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_Thread.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_Thread.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_Thread.h Tue Jan  5 22:55:39 2010
@@ -36,31 +36,31 @@
   ///////////////////////////////////////////////
   // Common Interface impl                     //
   ///////////////////////////////////////////////
-INK_INLINE
+inline
 Thread::~
 Thread()
 {
 }
 
-INK_INLINE void
+inline void
 Thread::set_specific()
 {
   ink_thread_setspecific(Thread::thread_data_key, this);
 }
 
-INK_INLINE Thread *
+inline Thread *
 this_thread()
 {
   return (Thread *) ink_thread_getspecific(Thread::thread_data_key);
 }
 
-INK_INLINE ink_hrtime
+inline ink_hrtime
 ink_get_hrtime()
 {
   return Thread::cur_time;
 }
 
-INK_INLINE ink_hrtime
+inline ink_hrtime
 ink_get_based_hrtime()
 {
   return Thread::cur_time;

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEThread.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEThread.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEThread.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEThread.h Tue Jan  5 22:55:39 2010
@@ -37,14 +37,14 @@
 
 const int DELAY_FOR_RETRY = HRTIME_MSECONDS(10);
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_spawn(Continuation * cont)
 {
   Event *e = EVENT_ALLOC(eventAllocator, this);
   return schedule(e->init(cont, 0, 0));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_imm(Continuation * cont, int callback_event, void *cookie)
 {
   Event *e =::eventAllocator.alloc();
@@ -53,7 +53,7 @@
   return schedule(e->init(cont, 0, 0));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_at(Continuation * cont, ink_hrtime t, int callback_event, void *cookie)
 {
   Event *e =::eventAllocator.alloc();
@@ -62,7 +62,7 @@
   return schedule(e->init(cont, t, 0));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_in(Continuation * cont, ink_hrtime t, int callback_event, void *cookie)
 {
   Event *e =::eventAllocator.alloc();
@@ -71,7 +71,7 @@
   return schedule(e->init(cont, ink_get_based_hrtime() + t, 0));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_every(Continuation * cont, ink_hrtime t, int callback_event, void *cookie)
 {
   Event *e =::eventAllocator.alloc();
@@ -80,7 +80,7 @@
   return schedule(e->init(cont, ink_get_based_hrtime() + t, t));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule(Event * e)
 {
   e->ethread = this;
@@ -94,7 +94,7 @@
   return e;
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_imm_local(Continuation * cont, int callback_event, void *cookie)
 {
   Event *e = EVENT_ALLOC(eventAllocator, this);
@@ -103,7 +103,7 @@
   return schedule_local(e->init(cont, 0, 0));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_at_local(Continuation * cont, ink_hrtime t, int callback_event, void *cookie)
 {
   Event *e = EVENT_ALLOC(eventAllocator, this);
@@ -112,7 +112,7 @@
   return schedule_local(e->init(cont, t, 0));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_in_local(Continuation * cont, ink_hrtime t, int callback_event, void *cookie)
 {
   Event *e = EVENT_ALLOC(eventAllocator, this);
@@ -121,7 +121,7 @@
   return schedule_local(e->init(cont, ink_get_based_hrtime() + t, 0));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_every_local(Continuation * cont, ink_hrtime t, int callback_event, void *cookie)
 {
   Event *e = EVENT_ALLOC(eventAllocator, this);
@@ -130,7 +130,7 @@
   return schedule_local(e->init(cont, ink_get_based_hrtime() + t, t));
 }
 
-INK_INLINE Event *
+inline Event *
 EThread::schedule_local(Event * e)
 {
   if (tt != REGULAR) {
@@ -148,13 +148,13 @@
   return e;
 }
 
-INK_INLINE EThread *
+inline EThread *
 this_ethread()
 {
   return (EThread *) this_thread();
 }
 
-INK_INLINE void
+inline void
 EThread::free_event(Event * e)
 {
   ink_assert(!e->in_the_priority_queue && !e->in_the_prot_queue);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEvent.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEvent.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEvent.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEvent.h Tue Jan  5 22:55:39 2010
@@ -24,7 +24,7 @@
 #ifndef _P_UnixEvent_h_
 #define _P_UnixEvent_h_
 
-INK_INLINE Event *
+inline Event *
 Event::init(Continuation * c, ink_hrtime atimeout_at, ink_hrtime aperiod)
 {
   continuation = c;
@@ -35,14 +35,14 @@
   return this;
 }
 
-INK_INLINE void
+inline void
 Event::free()
 {
   mutex = NULL;
   eventAllocator.free(this);
 }
 
-INK_INLINE
+inline
 Event::Event():
   ethread(0),
   in_the_prot_queue(false),

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEventProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEventProcessor.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEventProcessor.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixEventProcessor.h Tue Jan  5 22:55:39 2010
@@ -28,7 +28,7 @@
 const int LOAD_BALANCE_INTERVAL = 1;
 
 
-INK_INLINE
+inline
 EventProcessor::EventProcessor():
 n_ethreads(0),
 n_thread_groups(0),
@@ -41,7 +41,7 @@
   memset(next_thread_for_type, 0, sizeof(next_thread_for_type));
 }
 
-INK_INLINE off_t
+inline off_t
 EventProcessor::allocate(int size)
 {
   static off_t start = (offsetof(EThread, thread_private) + 7) & ~7;
@@ -58,7 +58,7 @@
   return (off_t) (old + start);
 }
 
-INK_INLINE EThread *
+inline EThread *
 EventProcessor::assign_thread(EventType etype)
 {
   int next;
@@ -69,7 +69,7 @@
   return (eventthread[etype][next]);
 }
 
-INK_INLINE Event *
+inline Event *
 EventProcessor::schedule(Event * e, EventType etype)
 {
   e->ethread = assign_thread(etype);
@@ -83,7 +83,7 @@
 
 #if 0
 /* getting rid of this, i dont see anybody using this */
-INK_INLINE Event *
+inline Event *
 EventProcessor::schedule_spawn(Continuation * cont)
 {
   Event *e = eventAllocator.alloc();
@@ -91,7 +91,7 @@
 }
 #endif
 
-INK_INLINE Event *
+inline Event *
 EventProcessor::schedule_imm(Continuation * cont, EventType et, int callback_event, void *cookie)
 {
   Event *e = eventAllocator.alloc();
@@ -103,7 +103,7 @@
   return schedule(e->init(cont, 0, 0), et);
 }
 
-INK_INLINE Event *
+inline Event *
 EventProcessor::schedule_at(Continuation * cont, ink_hrtime t, EventType et, int callback_event, void *cookie)
 {
   ink_assert(t > 0);
@@ -113,7 +113,7 @@
   return schedule(e->init(cont, t, 0), et);
 }
 
-INK_INLINE Event *
+inline Event *
 EventProcessor::schedule_in(Continuation * cont, ink_hrtime t, EventType et, int callback_event, void *cookie)
 {
   Event *e = eventAllocator.alloc();
@@ -122,7 +122,7 @@
   return schedule(e->init(cont, ink_get_based_hrtime() + t, 0), et);
 }
 
-INK_INLINE Event *
+inline Event *
 EventProcessor::schedule_every(Continuation * cont, ink_hrtime t, EventType et, int callback_event, void *cookie)
 {
   ink_assert(t != 0);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h Tue Jan  5 22:55:39 2010
@@ -43,7 +43,7 @@
 // 1024 - stdin, stderr, stdout
 #define EPOLL_MAX_DESCRIPTOR_SIZE                32768
 
-INK_INLINE bool
+inline bool
 transient_error()
 {
   bool transient = (errno == EINTR);
@@ -60,7 +60,7 @@
 //
 // Timing done in the connectionManager
 //
-INK_INLINE int
+inline int
 SocketManager::accept(int s, struct sockaddr *addr, socklen_t *addrlen)
 {
   int r;
@@ -76,7 +76,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::open(char *path, int oflag, mode_t mode)
 {
   int s;
@@ -91,7 +91,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::read(int fd, void *buf, int size, void *pOLP)
 {
   int r = 0;
@@ -108,7 +108,7 @@
 
 void monitor_disk_read(int fd, void *buf, int size, off_t offset, char *tag);
 
-INK_INLINE int
+inline int
 SocketManager::pread(int fd, void *buf, int size, off_t offset, char *tag)
 {
   if (monitor_read_activity)
@@ -123,7 +123,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::read_from_middle_of_file(int fd, void *buf, int size, off_t offset, char *tag)
 {
   int r;
@@ -138,7 +138,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::readv(int fd, struct iovec *vector, size_t count, teFDType eT)
 {
   int r;
@@ -153,7 +153,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::vector_io(int fd, struct iovec *vector, size_t count, int read_request, void *pOLP)
 {
   const int max_iovecs_per_request = 16;
@@ -195,14 +195,14 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::read_vector(int fd, struct iovec *vector, size_t count, void *pOLP)
 {
   return vector_io(fd, vector, count, 1, pOLP);
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::recv(int fd, void *buf, int size, int flags)
 {
   int r;
@@ -216,7 +216,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::recvfrom(int fd, void *buf, int size, int flags, struct sockaddr *addr, socklen_t *addrlen)
 {
   int r;
@@ -230,7 +230,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::write(int fd, void *buf, int size, void *pOLP)
 {
   int r;
@@ -246,7 +246,7 @@
 
 void monitor_disk_write(int fd, void *buf, int size, off_t offset, char *tag);
 
-INK_INLINE int
+inline int
 SocketManager::pwrite(int fd, void *buf, int size, off_t offset, char *tag)
 {
   int r;
@@ -261,7 +261,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::write_to_middle_of_file(int fd, void *buf, int size, off_t offset, char *tag)
 {
   int r;
@@ -278,7 +278,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::writev(int fd, struct iovec *vector, size_t count, teFDType eT)
 {
   int r;
@@ -292,14 +292,14 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::write_vector(int fd, struct iovec *vector, size_t count, void *pOLP)
 {
   return vector_io(fd, vector, count, 0, pOLP);
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::send(int fd, void *buf, int size, int flags)
 {
   int r;
@@ -312,7 +312,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::sendto(int fd, void *buf, int len, int flags, struct sockaddr *to, int tolen)
 {
   int r;
@@ -325,7 +325,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::sendmsg(int fd, struct msghdr *m, int flags, void *pOLP)
 {
   int r;
@@ -338,7 +338,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::lseek(int fd, off_t offset, int whence)
 {
   int r;
@@ -351,7 +351,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::fstat(int fd, struct stat *buf)
 {
   int r;
@@ -365,7 +365,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::unlink(char *buf)
 {
   int r;
@@ -378,7 +378,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::fsync(int fildes)
 {
   int r;
@@ -391,7 +391,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::ftruncate(int fildes, off_t length)
 {
   int r;
@@ -404,7 +404,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::poll(struct pollfd *fds, unsigned long nfds, int timeout)
 {
   int r;
@@ -418,7 +418,7 @@
 }
 
 #if defined(USE_EPOLL)
-INK_INLINE int
+inline int
 SocketManager::epoll_create(int size)
 {
   int r;
@@ -434,7 +434,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::epoll_close(int epfd)
 {
   int r = 0;
@@ -450,7 +450,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
 {
   int r;
@@ -464,7 +464,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
 {
   int r;
@@ -478,14 +478,14 @@
 }
 
 #elif defined(USE_KQUEUE)
-INK_INLINE int
+inline int
 SocketManager::kqueue()
 {
   return ::kqueue();
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::kevent(int kq, const struct kevent *changelist, int nchanges,
                       struct kevent *eventlist, int nevents,
                       const struct timespec *timeout)
@@ -507,7 +507,7 @@
 #endif
 
 
-INK_INLINE int
+inline int
 SocketManager::get_sndbuf_size(int s)
 {
   int bsz = 0;
@@ -519,7 +519,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::get_rcvbuf_size(int s)
 {
   int bsz = 0;
@@ -531,42 +531,42 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::set_sndbuf_size(int s, int bsz)
 {
   return safe_setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &bsz, sizeof(bsz));
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::set_rcvbuf_size(int s, int bsz)
 {
   return safe_setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &bsz, sizeof(bsz));
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::getsockname(int s, struct sockaddr *sa, socklen_t *sz)
 {
   return::getsockname(s, sa, sz);
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::socket(int domain, int type, int protocol, bool bNonBlocking)
 {
   return::socket(domain, type, protocol);
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::mc_socket(int domain, int type, int protocol, bool bNonBlocking)
 {
   return SocketManager::socket(domain, type, protocol, bNonBlocking);
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::shutdown(int s, int how)
 {
   int res;
@@ -579,7 +579,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::lockf(int s, int f, long size)
 {
   int res;
@@ -592,7 +592,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::dup(int s)
 {
   int res;
@@ -606,7 +606,7 @@
 }
 
 
-INK_INLINE int
+inline int
 SocketManager::fast_close(int s)
 {
   int res;

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VConnection.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VConnection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VConnection.h Tue Jan  5 22:55:39 2010
@@ -26,7 +26,7 @@
 #define P_VConnection_h
 #include "I_EventSystem.h"
 
-INK_INLINE const char *
+inline const char *
 get_vc_event_name(int event)
 {
   switch (event) {
@@ -56,7 +56,7 @@
 }
 
 
-INK_INLINE
+inline
 VConnection::VConnection(ProxyMutex * aMutex)
   :
 Continuation(aMutex),
@@ -65,7 +65,7 @@
   SET_HANDLER(0);
 }
 
-INK_INLINE
+inline
 VConnection::~
 VConnection()
 {
@@ -75,7 +75,7 @@
 //
 //      DEPRECATED DEPRECATED DEPRECATED
 //
-//      INK_INLINE VIO * VConnection::do_io()
+//      inline VIO * VConnection::do_io()
 //
 //      This method enqueues a VIO operation onto the VIO queue, and
 //      activates the I/O operation if and operation of that type isn't
@@ -94,7 +94,7 @@
   return vc->do_io_write(cont, nbytes, reader, true);
 }
 
-INK_INLINE VIO *
+inline VIO *
 VConnection::do_io(int op, Continuation * c, int nbytes, MIOBuffer * cb, int data)
 {
   switch (op) {
@@ -122,15 +122,15 @@
   return NULL;
 }
 
-INK_INLINE void
+inline void
 VConnection::set_continuation(VIO *, Continuation *)
 {
 }
-INK_INLINE void
+inline void
 VConnection::reenable(VIO *)
 {
 }
-INK_INLINE void
+inline void
 VConnection::reenable_re(VIO * vio)
 {
   reenable(vio);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VIO.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VIO.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VIO.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_VIO.h Tue Jan  5 22:55:39 2010
@@ -26,7 +26,7 @@
 #define  P_VIO_h
 #include "I_VIO.h"
 
-INK_INLINE
+inline
 VIO::VIO(int aop)
   :
 _cont(NULL),
@@ -45,7 +45,7 @@
 //  VIO::VIO()
 //
 /////////////////////////////////////////////////////////////
-INK_INLINE
+inline
 VIO::VIO()
   :
 _cont(0),
@@ -59,37 +59,37 @@
   return;
 }
 
-INK_INLINE Continuation *
+inline Continuation *
 VIO::get_continuation()
 {
   return _cont;
 }
-INK_INLINE void
+inline void
 VIO::set_writer(MIOBuffer * writer)
 {
   buffer.writer_for(writer);
 }
-INK_INLINE void
+inline void
 VIO::set_reader(IOBufferReader * reader)
 {
   buffer.reader_for(reader);
 }
-INK_INLINE MIOBuffer *
+inline MIOBuffer *
 VIO::get_writer()
 {
   return buffer.writer();
 }
-INK_INLINE IOBufferReader *
+inline IOBufferReader *
 VIO::get_reader()
 {
   return (buffer.reader());
 }
-INK_INLINE int
+inline int
 VIO::ntodo()
 {
   return nbytes - ndone;
 }
-INK_INLINE void
+inline void
 VIO::done()
 {
   if (buffer.reader())
@@ -103,7 +103,7 @@
 //  VIO::set_continuation()
 //
 /////////////////////////////////////////////////////////////
-INK_INLINE void
+inline void
 VIO::set_continuation(Continuation * acont)
 {
   if (vc_server)
@@ -123,7 +123,7 @@
 //  VIO::reenable()
 //
 /////////////////////////////////////////////////////////////
-INK_INLINE void
+inline void
 VIO::reenable()
 {
   if (vc_server)
@@ -135,7 +135,7 @@
 //  VIO::reenable_re()
 //
 /////////////////////////////////////////////////////////////
-INK_INLINE void
+inline void
 VIO::reenable_re()
 {
   if (vc_server)

Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Processor.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Processor.cc?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Processor.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/Processor.cc Tue Jan  5 22:55:39 2010
@@ -40,7 +40,7 @@
   
  ****************************************************************************/
 
-#include "I_EventSystem.h"
+#include "P_EventSystem.h"
 //////////////////////////////////////////////////////////////////////////////
 //
 //      Processor::Processor()

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc Tue Jan  5 22:55:39 2010
@@ -94,7 +94,7 @@
   remoteHostDBQueue[MULTI_CACHE_PARTITIONS];
 
 
-static INK_INLINE int
+static inline int
 corrupt_debugging_callout(HostDBInfo * e, RebuildMC & r)
 {
   Debug("hostdb", "corrupt %d part %d", (char *) &e->app.rr.offset - r.data, r.partition);
@@ -102,7 +102,7 @@
 }
 
 
-INK_INLINE void
+inline void
 hostdb_cont_free(HostDBContinuation * cont)
 {
   if (cont->pending_action)

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/I_HostDB.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/I_HostDB.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/I_HostDB.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/I_HostDB.h Tue Jan  5 22:55:39 2010
@@ -32,10 +32,6 @@
 #ifndef _I_HostDB_h_
 #define _I_HostDB_h_
 
-#ifndef INK_INLINE
-#define INK_INLINE
-#endif
-
 #include "I_EventSystem.h"
 #include "I_Net.h"
 #include "I_Cache.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/Makefile.am?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/Makefile.am Tue Jan  5 22:55:39 2010
@@ -23,7 +23,6 @@
 libinkhostdb_a_SOURCES = \
   HostDB.cc \
   I_HostDBProcessor.h \
-  Inline.cc \
   MultiCache.cc \
   P_HostDB.h \
   P_HostDBProcessor.h \

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h Tue Jan  5 22:55:39 2010
@@ -31,11 +31,6 @@
 #ifndef _P_HostDB_h_
 #define _P_HostDB_h_
 
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
-
 #ifdef SPLIT_DNS
 #include "P_SplitDNS.h"
 #include "P_Cluster.h"

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDBProcessor.h Tue Jan  5 22:55:39 2010
@@ -158,7 +158,7 @@
   HostDBCache();
 };
 
-INK_INLINE HostDBInfo *
+inline HostDBInfo *
 HostDBRoundRobin::find_ip(unsigned int ip)
 {
   bool bad = (n <= 0 || n > HOST_DB_MAX_ROUND_ROBIN_INFO || good <= 0 || good > HOST_DB_MAX_ROUND_ROBIN_INFO);
@@ -176,7 +176,7 @@
   return NULL;
 }
 
-INK_INLINE HostDBInfo *
+inline HostDBInfo *
 HostDBRoundRobin::select_best(unsigned int client_ip, HostDBInfo * r)
 {
   (void) r;
@@ -203,7 +203,7 @@
   return &info[best];
 }
 
-INK_INLINE HostDBInfo *
+inline HostDBInfo *
 HostDBRoundRobin::select_best_http(unsigned int client_ip, time_t now, ink32 fail_window)
 {
   bool bad = (n <= 0 || n > HOST_DB_MAX_ROUND_ROBIN_INFO || good <= 0 || good > HOST_DB_MAX_ROUND_ROBIN_INFO);
@@ -383,24 +383,24 @@
 extern HostDBCache hostDB;
 //extern Queue<HostDBContinuation>  remoteHostDBQueue[MULTI_CACHE_PARTITIONS];
 
-INK_INLINE unsigned int
+inline unsigned int
 master_hash(INK_MD5 & md5)
 {
   return (int) (md5[1] >> 32);
 }
-INK_INLINE bool
+inline bool
 is_dotted_form_hostname(char *c)
 {
   return -1 != (int) ink_inet_addr(c);
 }
 
-INK_INLINE Queue<HostDBContinuation> &
+inline Queue<HostDBContinuation> &
 HostDBCache::pending_dns_for_hash(INK_MD5 & md5)
 {
   return pending_dns[partition_of_bucket((int) (fold_md5(md5) % hostDB.buckets))];
 }
 
-INK_INLINE int
+inline int
 HostDBContinuation::key_partition()
 {
   return hostDB.partition_of_bucket(fold_md5(md5) % hostDB.buckets);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_MultiCache.h Tue Jan  5 22:55:39 2010
@@ -482,7 +482,7 @@
   return (md5.fold());
 }
 
-template<class C> INK_INLINE int MultiCache<C>::level_of_block(C * b)
+template<class C> inline int MultiCache<C>::level_of_block(C * b)
 {
   if ((char *) b - data >= level_offset[1]) {
     if ((char *) b - data >= level_offset[2])
@@ -492,7 +492,7 @@
   return 0;
 }
 
-template<class C> INK_INLINE C * MultiCache<C>::cache_bucket(inku64 folded_md5, int level)
+template<class C> inline C * MultiCache<C>::cache_bucket(inku64 folded_md5, int level)
 {
   int bucket = (int) (folded_md5 % buckets);
   char *offset = data + level_offset[level] + bucketsize[level] * bucket;
@@ -502,7 +502,7 @@
 //
 // Insert an entry
 //
-template<class C> INK_INLINE C * MultiCache<C>::insert_block(inku64 folded_md5, C * new_block, int level)
+template<class C> inline C * MultiCache<C>::insert_block(inku64 folded_md5, C * new_block, int level)
 {
   C *b = cache_bucket(folded_md5, level);
   C *block = NULL, *empty = NULL;
@@ -573,7 +573,7 @@
 //
 // This function ejects some number of entries.
 //
-template<class C> INK_INLINE void MultiCache<C>::flush(C * b, int bucket, int level)
+template<class C> inline void MultiCache<C>::flush(C * b, int bucket, int level)
 {
   C *block = NULL;
   if (level < levels - 1) {
@@ -594,7 +594,7 @@
 //
 // Match a cache line and a folded md5 key
 //
-template<class C> INK_INLINE bool MultiCache<C>::match(inku64 folded_md5, C * block)
+template<class C> inline bool MultiCache<C>::match(inku64 folded_md5, C * block)
 {
   return block->tag() == make_tag(folded_md5);
 }
@@ -602,7 +602,7 @@
 //
 // This code is a bit of a mess and should probably be rewritten
 //
-template<class C> INK_INLINE void MultiCache<C>::delete_block(C * b)
+template<class C> inline void MultiCache<C>::delete_block(C * b)
 {
   if (b->backed) {
     int l = level_of_block(b);
@@ -620,7 +620,7 @@
 //
 // Lookup an entry up to some level in the cache
 //
-template<class C> INK_INLINE C * MultiCache<C>::lookup_block(inku64 folded_md5, int level)
+template<class C> inline C * MultiCache<C>::lookup_block(inku64 folded_md5, int level)
 {
   C *b = cache_bucket(folded_md5, 0);
   inku64 tag = make_tag(folded_md5);
@@ -646,7 +646,7 @@
   return NULL;
 }
 
-template<class C> INK_INLINE void MultiCache<C>::rebuild_element(int bucket, char *elem, RebuildMC & r)
+template<class C> inline void MultiCache<C>::rebuild_element(int bucket, char *elem, RebuildMC & r)
 {
   C *e = (C *) elem;
   if (!e->is_empty()) {
@@ -671,7 +671,7 @@
   }
 }
 
-template<class C> INK_INLINE void MultiCache<C>::copy_heap(int partition, MultiCacheHeapGC * gc)
+template<class C> inline void MultiCache<C>::copy_heap(int partition, MultiCacheHeapGC * gc)
 {
   int b = first_bucket_of_partition(partition);
   int n = buckets_of_partition(partition);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/I_Net.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/I_Net.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/I_Net.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/I_Net.h Tue Jan  5 22:55:39 2010
@@ -41,11 +41,6 @@
 #ifndef __I_NET_H_
 #define __I_NET_H_
 
-
-#ifndef INK_INLINE
-#define INK_INLINE
-#endif
-
 #include "I_Version.h"
 #include "I_EventSystem.h"
 #include <netinet/in.h>

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPConnection.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPConnection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPConnection.h Tue Jan  5 22:55:39 2010
@@ -112,5 +112,5 @@
   virtual void UDPConnection_is_abstract() = 0;
 };
 
-INK_INLINE UDPConnection *new_UDPConnection(int fd);
+inline UDPConnection *new_UDPConnection(int fd);
 #endif //__I_UDPCONNECTION_H_

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPPacket.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPPacket.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPPacket.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/I_UDPPacket.h Tue Jan  5 22:55:39 2010
@@ -85,7 +85,7 @@
    @param buf if !NULL, then len bytes copied from buf and made into packet.
    @param len # of bytes to copy from buf
  */
-INK_INLINE UDPPacket *new_UDPPacket(struct sockaddr_in *to, ink_hrtime when = 0, char *buf = NULL, int len = 0);
+inline UDPPacket *new_UDPPacket(struct sockaddr_in *to, ink_hrtime when = 0, char *buf = NULL, int len = 0);
 /**
    Create a new packet to be sent over UDPConnection. This clones and
    makes a reference to an existing IOBufferBlock chain.
@@ -97,19 +97,19 @@
    for packet
    @param len # of bytes to reference from block
  */
-INK_INLINE UDPPacket *new_UDPPacket(struct sockaddr_in *to,
+inline UDPPacket *new_UDPPacket(struct sockaddr_in *to,
                                     ink_hrtime when = 0, IOBufferBlock * block = NULL, int len = 0);
 /**
    Create a new packet to be sent over UDPConnection.  Packet has no
    destination or data.
 */
-INK_INLINE UDPPacket *new_UDPPacket();
+inline UDPPacket *new_UDPPacket();
 
 /**
    Create a new packet to be delivered to application.
    Internal function only
 */
-INK_INLINE UDPPacket *new_incoming_UDPPacket(struct sockaddr_in *from, char *buf, int len);
+inline UDPPacket *new_incoming_UDPPacket(struct sockaddr_in *from, char *buf, int len);
 
 //@}
 #endif //__I_UDPPACKET_H_

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/Makefile.am?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/Makefile.am Tue Jan  5 22:55:39 2010
@@ -26,7 +26,6 @@
   I_Net.h \
   I_NetProcessor.h \
   I_NetVConnection.h \
-  Inline.cc \
   I_Socks.h \
   I_UDPConnection.h \
   I_UDPNet.h \

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_Net.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_Net.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_Net.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_Net.h Tue Jan  5 22:55:39 2010
@@ -30,11 +30,6 @@
 #ifndef __P_NET_H__
 #define __P_NET_H__
 
-#ifndef INLINE_CC
-#undef INK_INLINE
-#define INK_INLINE inline
-#endif
-
 // Net Stats 
 
 enum Net_Stats

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_NetVConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_NetVConnection.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_NetVConnection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_NetVConnection.h Tue Jan  5 22:55:39 2010
@@ -23,7 +23,7 @@
 
 #include "I_NetVConnection.h"
 
-INK_INLINE const struct sockaddr_in &
+inline const struct sockaddr_in &
 NetVConnection::get_remote_addr()
 {
   if (!got_remote_addr) {
@@ -33,20 +33,20 @@
   return remote_addr;
 }
 
-INK_INLINE unsigned int
+inline unsigned int
 NetVConnection::get_remote_ip()
 {
   return (unsigned int) get_remote_addr().sin_addr.s_addr;
 }
 
 
-INK_INLINE int
+inline int
 NetVConnection::get_remote_port()
 {
   return ntohs(get_remote_addr().sin_port);
 }
 
-INK_INLINE const struct sockaddr_in &
+inline const struct sockaddr_in &
 NetVConnection::get_local_addr()
 {
   if (!got_local_addr) {
@@ -58,13 +58,13 @@
   return local_addr;
 }
 
-INK_INLINE unsigned int
+inline unsigned int
 NetVConnection::get_local_ip()
 {
   return (unsigned int) get_local_addr().sin_addr.s_addr;
 }
 
-INK_INLINE int
+inline int
 NetVConnection::get_local_port()
 {
   return ntohs(get_local_addr().sin_port);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPConnection.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPConnection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPConnection.h Tue Jan  5 22:55:39 2010
@@ -103,13 +103,13 @@
 }
 
 
-INK_INLINE SOCKET
+inline SOCKET
 UDPConnection::getFd()
 {
   return ((UDPConnectionInternal *) this)->fd;
 }
 
-INK_INLINE void
+inline void
 UDPConnection::setBinding(struct sockaddr_in *s)
 {
   UDPConnectionInternal *p = (UDPConnectionInternal *) this;
@@ -117,7 +117,7 @@
   p->binding_valid = 1;
 }
 
-INK_INLINE int
+inline int
 UDPConnection::getBinding(struct sockaddr_in *s)
 {
   UDPConnectionInternal *p = (UDPConnectionInternal *) this;
@@ -125,62 +125,62 @@
   return p->binding_valid;
 }
 
-INK_INLINE int
+inline int
 UDPConnection::get_ndone()
 {
   return ((UDPConnectionInternal *) this)->nBytesDone;
 }
 
-INK_INLINE int
+inline int
 UDPConnection::get_ntodo()
 {
   return ((UDPConnectionInternal *) this)->nBytesTodo;
 }
 
 // return the b/w allocated to this UDPConnection in Mbps
-INK_INLINE double
+inline double
 UDPConnection::get_allocatedBandwidth()
 {
   return (((UDPConnectionInternal *) this)->flowRateBps * 8.0) / (1024.0 * 1024.0);
 }
 
-INK_INLINE void
+inline void
 UDPConnection::destroy()
 {
   ((UDPConnectionInternal *) this)->tobedestroyed = 1;
 }
 
-INK_INLINE int
+inline int
 UDPConnection::shouldDestroy()
 {
   return ((UDPConnectionInternal *) this)->tobedestroyed;
 }
 
-INK_INLINE void
+inline void
 UDPConnection::AddRef()
 {
   ink_atomic_increment(&((UDPConnectionInternal *) this)->refcount, 1);
 }
 
-INK_INLINE int
+inline int
 UDPConnection::GetRefCount()
 {
   return ((UDPConnectionInternal *) this)->refcount;
 }
 
-INK_INLINE int
+inline int
 UDPConnection::GetSendGenerationNumber()
 {
   return ((UDPConnectionInternal *) this)->sendGenerationNum;
 }
 
-INK_INLINE int
+inline int
 UDPConnection::getPortNum(void)
 {
   return ((UDPConnectionInternal *) this)->binding.sin_port;
 }
 
-INK_INLINE ink64
+inline ink64
 UDPConnection::cancel(void)
 {
   UDPConnectionInternal *p = (UDPConnectionInternal *) this;
@@ -190,13 +190,13 @@
   return p->lastSentPktTSSeqNum;
 };
 
-INK_INLINE void
+inline void
 UDPConnection::SetLastSentPktTSSeqNum(ink64 sentSeqNum)
 {
   ((UDPConnectionInternal *) this)->lastSentPktTSSeqNum = sentSeqNum;
 };
 
-INK_INLINE void
+inline void
 UDPConnection::setContinuation(Continuation * c)
 {
   // it is not safe to switch among continuations that don't share locks

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPPacket.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPPacket.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPPacket.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UDPPacket.h Tue Jan  5 22:55:39 2010
@@ -136,7 +136,7 @@
   }
 }
 
-INK_INLINE void
+inline void
 UDPPacket::setReliabilityPkt()
 {
   UDPPacketInternal *p = (UDPPacketInternal *) this;
@@ -144,14 +144,14 @@
   p->isReliabilityPkt = true;
 }
 
-INK_INLINE void
+inline void
 UDPPacket::setPktTSSeq(ink64 seqno)
 {
   UDPPacketInternal *p = (UDPPacketInternal *) this;
   p->pktTSSeqNum = seqno;
 }
 
-INK_INLINE void
+inline void
 UDPPacket::append_block(IOBufferBlock * block)
 {
   UDPPacketInternal *p = (UDPPacketInternal *) this;
@@ -169,7 +169,7 @@
   }
 }
 
-INK_INLINE char *
+inline char *
 UDPPacket::asBuf(int *len)
 {
   UDPPacketInternal *p = (UDPPacketInternal *) this;
@@ -182,7 +182,7 @@
   }
 }
 
-INK_INLINE int
+inline int
 UDPPacket::getPktLength()
 {
   UDPPacketInternal *p = (UDPPacketInternal *) this;
@@ -197,19 +197,19 @@
   return p->pktLength;
 }
 
-INK_INLINE void
+inline void
 UDPPacket::free()
 {
   ((UDPPacketInternal *) this)->free();
 }
 
-INK_INLINE void
+inline void
 UDPPacket::setContinuation(Continuation * c)
 {
   ((UDPPacketInternal *) this)->cont = c;
 }
 
-INK_INLINE void
+inline void
 UDPPacket::setConnection(UDPConnection * c)
 {
   /*Code reviewed by Case Larsen.  Previously, we just had
@@ -231,25 +231,25 @@
   conn->AddRef();
 }
 
-INK_INLINE IOBufferBlock *
+inline IOBufferBlock *
 UDPPacket::getIOBlockChain(void)
 {
   return ((UDPPacketInternal *) this)->chain;
 }
 
-INK_INLINE UDPConnection *
+inline UDPConnection *
 UDPPacket::getConnection(void)
 {
   return ((UDPPacketInternal *) this)->conn;
 }
 
-INK_INLINE void
+inline void
 UDPPacket::setArrivalTime(ink_hrtime t)
 {
   ((UDPPacketInternal *) this)->arrival_time = t;
 }
 
-INK_INLINE UDPPacket *
+inline UDPPacket *
 new_UDPPacket(struct sockaddr_in *to, ink_hrtime when, char *buf, int len)
 {
   UDPPacketInternal *p = udpPacketAllocator.alloc();
@@ -272,7 +272,7 @@
   return p;
 }
 
-INK_INLINE UDPPacket *
+inline UDPPacket *
 new_UDPPacket(struct sockaddr_in * to, ink_hrtime when, IOBufferBlock * buf, int len)
 {
   (void) len;
@@ -294,7 +294,7 @@
   return p;
 }
 
-INK_INLINE UDPPacket *
+inline UDPPacket *
 new_UDPPacket(struct sockaddr_in * to, ink_hrtime when, Ptr<IOBufferBlock> buf)
 {
   UDPPacketInternal *p = udpPacketAllocator.alloc();
@@ -310,13 +310,13 @@
   return p;
 }
 
-INK_INLINE UDPPacket *
+inline UDPPacket *
 new_UDPPacket(ink_hrtime when, Ptr<IOBufferBlock> buf)
 {
   return new_UDPPacket(NULL, when, buf);
 }
 
-INK_INLINE UDPPacket *
+inline UDPPacket *
 new_incoming_UDPPacket(struct sockaddr_in * from, char *buf, int len)
 {
   UDPPacketInternal *p = udpPacketAllocator.alloc();
@@ -337,7 +337,7 @@
   return p;
 }
 
-INK_INLINE UDPPacket *
+inline UDPPacket *
 new_UDPPacket()
 {
   UDPPacketInternal *p = udpPacketAllocator.alloc();

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h Tue Jan  5 22:55:39 2010
@@ -246,7 +246,7 @@
 
 enum ThrottleType
 { ACCEPT, CONNECT };
-INK_INLINE int
+inline int
 net_connections_to_throttle(ThrottleType t)
 {
 
@@ -270,7 +270,7 @@
   return (int) (currently_open * headroom);
 }
 
-INK_INLINE void
+inline void
 check_shedding_warning()
 {
   ink_hrtime t = ink_get_hrtime();
@@ -280,13 +280,13 @@
   }
 }
 
-INK_INLINE int
+inline int
 emergency_throttle(ink_hrtime now)
 {
   return emergency_throttle_time > now;
 }
 
-INK_INLINE int
+inline int
 check_net_throttle(ThrottleType t, ink_hrtime now)
 {
   int connections = net_connections_to_throttle(t);
@@ -299,7 +299,7 @@
   return false;
 }
 
-INK_INLINE void
+inline void
 check_throttle_warning()
 {
   ink_hrtime t = ink_get_hrtime();
@@ -321,7 +321,7 @@
 // descriptors.  Close the connection immediately, the upper levels
 // will recover.
 //
-INK_INLINE int
+inline int
 check_emergency_throttle(Connection & con)
 {
   int fd = con.fd;
@@ -339,7 +339,7 @@
 }
 
 
-INK_INLINE int
+inline int
 change_net_connections_throttle(const char *token, RecDataT data_type, RecData value, void *data)
 {
   (void) token;
@@ -361,7 +361,7 @@
 // 1  - transient
 // 0  - report as warning
 // -1 - fatal
-INK_INLINE int
+inline int
 accept_error_seriousness(int res)
 {
   switch (res) {
@@ -398,7 +398,7 @@
   }
 }
 
-INK_INLINE void
+inline void
 check_transient_accept_error(int res)
 {
   ink_hrtime t = ink_get_hrtime();

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetProcessor.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetProcessor.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetProcessor.h Tue Jan  5 22:55:39 2010
@@ -95,7 +95,7 @@
 };
 
 
-INK_INLINE Action *
+inline Action *
 NetProcessor::connect_re(Continuation * cont, unsigned int ip, int port, unsigned int _interface, NetVCOptions * opts)
 {
   return ((UnixNetProcessor *) this)->connect_re_internal(cont, ip, port, _interface, opts);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetVConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetVConnection.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetVConnection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNetVConnection.h Tue Jan  5 22:55:39 2010
@@ -41,7 +41,7 @@
 class NetHandler;
 class PollDescriptor;
 
-INK_INLINE void
+inline void
 NetVCOptions::reset()
 {
   local_port = 0;
@@ -56,7 +56,7 @@
   etype = ET_NET;
 }
 
-INK_INLINE void
+inline void
 NetVCOptions::set_sock_param(int _recv_bufsize, int _send_bufsize, unsigned long _opt_flags)
 {
   socket_recv_bufsize = _recv_bufsize;
@@ -249,7 +249,7 @@
 typedef int (UnixNetVConnection::*NetVConnHandler) (int, void *);
 
 
-INK_INLINE void
+inline void
 UnixNetVConnection::set_remote_addr()
 {
   remote_addr.sin_family = con.sa.sin_family;
@@ -257,26 +257,26 @@
   remote_addr.sin_addr.s_addr = ip;
 }
 
-INK_INLINE void
+inline void
 UnixNetVConnection::set_local_addr()
 {
   int local_sa_size = sizeof(local_addr);
   safe_getsockname(con.fd, (sockaddr *) & local_addr, &local_sa_size);
 }
 
-INK_INLINE ink_hrtime
+inline ink_hrtime
 UnixNetVConnection::get_active_timeout()
 {
   return active_timeout_in;
 }
 
-INK_INLINE ink_hrtime
+inline ink_hrtime
 UnixNetVConnection::get_inactivity_timeout()
 {
   return inactivity_timeout_in;
 }
 
-INK_INLINE void
+inline void
 UnixNetVConnection::set_inactivity_timeout(ink_hrtime timeout)
 {
   inactivity_timeout_in = timeout;
@@ -299,7 +299,7 @@
 #endif
 }
 
-INK_INLINE void
+inline void
 UnixNetVConnection::set_active_timeout(ink_hrtime timeout)
 {
   active_timeout_in = timeout;
@@ -318,7 +318,7 @@
     active_timeout = 0;
 }
 
-INK_INLINE void
+inline void
 UnixNetVConnection::cancel_inactivity_timeout()
 {
   inactivity_timeout_in = 0;
@@ -332,7 +332,7 @@
 #endif
 }
 
-INK_INLINE void
+inline void
 UnixNetVConnection::cancel_active_timeout()
 {
   if (active_timeout) {
@@ -342,7 +342,7 @@
   }
 }
 
-INK_INLINE
+inline
 UnixNetVConnection::~
 UnixNetVConnection()
 {

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixUDPConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixUDPConnection.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixUDPConnection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixUDPConnection.h Tue Jan  5 22:55:39 2010
@@ -100,7 +100,7 @@
   m_errno = e;
 }
 
-INK_INLINE Action *
+inline Action *
 UDPConnection::recv(Continuation * c)
 {
   UnixUDPConnection *p = (UnixUDPConnection *) this;
@@ -113,7 +113,7 @@
 }
 
 
-INK_INLINE UDPConnection *
+inline UDPConnection *
 new_UDPConnection(int fd)
 {
   return (fd >= 0) ? NEW(new UnixUDPConnection(fd)) : 0;

Modified: incubator/trafficserver/traffic/branches/dev/iocore/utils/I_Disk.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/utils/I_Disk.h?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/utils/I_Disk.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/utils/I_Disk.h Tue Jan  5 22:55:39 2010
@@ -33,10 +33,6 @@
 #ifndef _I_Disk_h_
 #define _I_Disk_h_
 
-#ifndef INK_INLINE
-#define INK_INLINE
-#endif
-
 #include "I_EventSystem.h"
 //
 // Events

Modified: incubator/trafficserver/traffic/branches/dev/iocore/utils/MTInteractor.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/utils/MTInteractor.cc?rev=896260&r1=896259&r2=896260&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/utils/MTInteractor.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/utils/MTInteractor.cc Tue Jan  5 22:55:39 2010
@@ -24,6 +24,7 @@
 
 
 #include "I_MTInteractor.h"
+#include "P_EventSystem.h"
 
 // for debugging
 #define LOCK_FAIL_RATE 0.05



Mime
View raw message