You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/03/03 01:11:10 UTC

svn commit: r918279 [1/2] - in /incubator/trafficserver/traffic/trunk: ./ iocore/cache/ iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/hostdb/ iocore/net/ iocore/utils/ libinktomi++/ librecords/ proxy/ proxy/congest/ proxy/hdrs/ proxy/http2/ pr...

Author: georgep
Date: Wed Mar  3 00:11:08 2010
New Revision: 918279

URL: http://svn.apache.org/viewvc?rev=918279&view=rev
Log:
TS-125: This patch converts the use of offsetof in List.h into the use of a 
template argument to handle specialization of SLL/DLL/Queue wrt the Link field.
With GCC 4.4 at least, this change produces exactly the same efficient code on 
test_List.cc.
This patch also contains more fixes for Sun Studio Compiler suite.
Author: John P.
Review: George P.
Tested: OpenSolaris(osol0906 w/ GCC4.3.2 & Sun Studio), OSX(10.5), 
        Linux(Ubuntu904) and FreeBSD(7.2)

Added:
    incubator/trafficserver/traffic/trunk/libinktomi++/test_List.cc
Modified:
    incubator/trafficserver/traffic/trunk/configure.ac
    incubator/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
    incubator/trafficserver/traffic/trunk/iocore/cache/I_Cache.h
    incubator/trafficserver/traffic/trunk/iocore/cache/I_Store.h
    incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc
    incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h
    incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h
    incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h
    incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheHosting.h
    incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
    incubator/trafficserver/traffic/trunk/iocore/cache/P_CachePart.h
    incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h
    incubator/trafficserver/traffic/trunk/iocore/cache/P_RamCache.h
    incubator/trafficserver/traffic/trunk/iocore/cache/RamCache.cc
    incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
    incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
    incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
    incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc
    incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
    incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h
    incubator/trafficserver/traffic/trunk/iocore/dns/DNS.cc
    incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSConnection.h
    incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
    incubator/trafficserver/traffic/trunk/iocore/dns/SRV.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc
    incubator/trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h
    incubator/trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h
    incubator/trafficserver/traffic/trunk/iocore/net/P_UDPNet.h
    incubator/trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h
    incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
    incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h
    incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetState.h
    incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
    incubator/trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h
    incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc
    incubator/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
    incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPConnection.cc
    incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
    incubator/trafficserver/traffic/trunk/iocore/utils/I_OpQueue.h
    incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h
    incubator/trafficserver/traffic/trunk/libinktomi++/DAllocator.h
    incubator/trafficserver/traffic/trunk/libinktomi++/List.h
    incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am
    incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h
    incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc
    incubator/trafficserver/traffic/trunk/proxy/ICP.cc
    incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
    incubator/trafficserver/traffic/trunk/proxy/InkAPIInternal.h
    incubator/trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
    incubator/trafficserver/traffic/trunk/proxy/InkXml.h
    incubator/trafficserver/traffic/trunk/proxy/Main.cc
    incubator/trafficserver/traffic/trunk/proxy/Plugin.h
    incubator/trafficserver/traffic/trunk/proxy/Update.h
    incubator/trafficserver/traffic/trunk/proxy/congest/Congestion.cc
    incubator/trafficserver/traffic/trunk/proxy/congest/CongestionDB.h
    incubator/trafficserver/traffic/trunk/proxy/congest/MT_hashtable.h
    incubator/trafficserver/traffic/trunk/proxy/hdrs/SDKAllocator.h
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpConnectionCount.h
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.h
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.h
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpServerSession.h
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpSessionManager.cc
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpSessionManager.h
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.h
    incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.h
    incubator/trafficserver/traffic/trunk/proxy/logging/LogField.h
    incubator/trafficserver/traffic/trunk/proxy/logging/LogFile.cc
    incubator/trafficserver/traffic/trunk/proxy/logging/LogFilter.h
    incubator/trafficserver/traffic/trunk/proxy/logging/LogFormat.h
    incubator/trafficserver/traffic/trunk/proxy/logging/LogHost.h
    incubator/trafficserver/traffic/trunk/proxy/logstats.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/FileManager.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/Rollback.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.h
    incubator/trafficserver/traffic/trunk/proxy/stats/CoupledStats.h

Modified: incubator/trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/configure.ac?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/configure.ac (original)
+++ incubator/trafficserver/traffic/trunk/configure.ac Wed Mar  3 00:11:08 2010
@@ -424,7 +424,8 @@
     ;;
   solaris*)
     if test "x${base_cc}" = "xcc" ;then
-      common_opt="-mt -m64 -D__WORDSIZE=64" # FIXME: This should be detected
+      common_opt="-mt -m64 -D__WORDSIZE=64" # FIXME: arch should be detected
+      CCASFLAGS="-Wa,-32" # TODO: add 64bit support to atomic ops
       debug_opt="-g $common_opt"
       release_opt="-g $common_opt -xO3"
       cxx_opt="-library=stlport4 -erroff"    
@@ -470,9 +471,9 @@
   [CFLAGS="$CFLAGS -march=$with_architecture"; CXXFLAGS="$CXXFLAGS -march=$with_architecture"]
 )
 
-AC_CHECK_SIZEOF(int *) # test for 64-bit pointers, this permits CFLAGS=-m32 for 32-bit compiles on 64-bit systems
+AC_CHECK_SIZEOF(int *) # test for 64-bit pointers, this permits GCC CFLAGS=-m32 for 32-bit compiles on 64-bit systems
 
-# add a default march if there is not one set
+# GCC: add a default march if there is not one set
 if test "x${GCC}" = "xyes"; then
  if test "${ac_cv_sizeof_int_p}" = "4"; then
   case $CFLAGS in

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc Wed Mar  3 00:11:08 2010
@@ -75,7 +75,7 @@
     if (!(d->writers.head->first_key == cont->first_key))
       continue;
     if (allow_if_writers && d->num_writers < d->max_writers) {
-      d->writers.push(cont, cont->opendir_link);
+      d->writers.push(cont);
       d->num_writers++;
       cont->od = d;
       cont->write_vector = &d->vector;
@@ -86,7 +86,7 @@
   OpenDirEntry *od = THREAD_ALLOC(openDirEntryAllocator,
                                   cont->mutex->thread_holding);
   od->readers.head = NULL;
-  od->writers.push(cont, cont->opendir_link);
+  od->writers.push(cont);
   od->num_writers = 1;
   od->max_writers = max_writers;
   od->vector.data.data = &od->vector.data.fast_data[0];
@@ -107,7 +107,7 @@
   NOWARN_UNUSED(e);
   NOWARN_UNUSED(event);
 
-  Queue<CacheVC> newly_delayed_readers;
+  Queue<CacheVC, Link_CacheVC_opendir_link> newly_delayed_readers;
   EThread *t = mutex->thread_holding;
   CacheVC *c = NULL;
   while ((c = delayed_readers.dequeue())) {
@@ -137,7 +137,7 @@
 OpenDir::close_write(CacheVC *cont)
 {
   ink_debug_assert(cont->part->mutex->thread_holding == this_ethread());
-  cont->od->writers.remove(cont, cont->opendir_link);
+  cont->od->writers.remove(cont);
   cont->od->num_writers--;
   if (!cont->od->writers.head) {
     unsigned int h = cont->first_key.word(0);

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/I_Cache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/I_Cache.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/I_Cache.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/I_Cache.h Wed Mar  3 00:11:08 2010
@@ -38,6 +38,7 @@
 						   PUBLIC_MODULE_HEADER)
 
 class CacheLookupHttpConfig;
+class CacheVC;
 #ifdef HTTP_CACHE
 class URL;
 class HTTPHdr;

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/I_Store.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/I_Store.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/I_Store.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/I_Store.h Wed Mar  3 00:11:08 2010
@@ -53,7 +53,7 @@
   bool isRaw;
   ink64 offset;                 // used only if (file == true)
   int disk_id;
-    Link<Span> link;
+  LINK(Span, link);
 
 private:
     bool is_mmapable_internal;

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc Wed Mar  3 00:11:08 2010
@@ -834,10 +834,16 @@
 
     // tmp buffer since we can't marshal into a miobuffer
     if ((_size = _httpInfoVector.marshal_length()) > 0) {
+#if defined(__GNUC__)
       void *buffer[_size];
-
+#else
+      void *buffer = xmalloc(_size);
+#endif
       _httpInfoVector.marshal((char *) buffer, _size);
       _httpInfoBuffer->write((const char *) buffer, (int) _size);
+#if !defined(__GNUC__)
+      xfree(buffer);
+#endif
     }
     //setCtrlInPlugin(true);
     _cacheWriteHook->invoke(INK_EVENT_CACHE_WRITE_HEADER, this);

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h Wed Mar  3 00:11:08 2010
@@ -36,8 +36,6 @@
 class HttpTunnel;
 
 //----------------------------------------------------------------------------
-class NewCacheVC;
-extern ClassAllocator<NewCacheVC> newCacheVConnectionAllocator;
 
 class NewCacheVC:public CacheVConnection
 {
@@ -293,6 +291,7 @@
   Event *trigger;
 };
 
+extern ClassAllocator<NewCacheVC> newCacheVConnectionAllocator;
 
 
 #endif // __NEWCACHEVC_H__

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h Wed Mar  3 00:11:08 2010
@@ -215,10 +215,11 @@
 // alternates from this vector is done under the Part::lock. The alternate
 // is deleted/inserted into the vector just before writing the vector disk 
 // (CacheVC::updateVector). 
+LINK_FORWARD_DECLARATION(CacheVC, opendir_link); // forward declaration
 struct OpenDirEntry
 {
-  DLL<CacheVC> writers;         // list of all the current writers
-  DLL<CacheVC> readers;         // list of all the current readers - not used
+  DLL<CacheVC, Link_CacheVC_opendir_link> writers;       // list of all the current writers
+  DLL<CacheVC, Link_CacheVC_opendir_link> readers;         // list of all the current readers - not used
   CacheHTTPInfoVector vector;   // Vector for the http document. Each writer 
                                 // maintains a pointer to this vector and 
                                 // writes it down to disk. 
@@ -233,7 +234,7 @@
   volatile bool reading_vec;    // somebody is currently reading the vector
   volatile bool writing_vec;    // somebody is currently writing the vector
 
-  Link<OpenDirEntry> link;
+  LINK(OpenDirEntry, link);
 
   int wait(CacheVC *c, int msec);
 
@@ -245,7 +246,7 @@
 
 struct OpenDir:Continuation
 {
-  Queue<CacheVC> delayed_readers;
+  Queue<CacheVC, Link_CacheVC_opendir_link> delayed_readers;
   DLL<OpenDirEntry> bucket[OPEN_DIR_BUCKETS];
 
   int open_write(CacheVC *c, int allow_if_writers, int max_writers);

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h Wed Mar  3 00:11:08 2010
@@ -59,8 +59,8 @@
 {
   DiskPartBlock *b;
   int new_block;                /* whether an existing part or a new one */
-    Link<DiskPartBlockQueue> link;
-    DiskPartBlockQueue():b(NULL), new_block(0)
+  LINK(DiskPartBlockQueue, link);
+  DiskPartBlockQueue():b(NULL), new_block(0)
   {
   }
 };

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheHosting.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheHosting.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheHosting.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheHosting.h Wed Mar  3 00:11:08 2010
@@ -182,7 +182,7 @@
   bool in_percent;
   int percent;
   CachePart *cachep;
-    Link<ConfigPart> link;
+  LINK(ConfigPart, link);
 };
 
 struct ConfigPartitions
@@ -190,7 +190,7 @@
   int num_partitions;
   int num_http_partitions;
   int num_stream_partitions;
-    Queue<ConfigPart> cp_queue;
+  Queue<ConfigPart> cp_queue;
   void read_config_file();
   void BuildListFromString(char *config_file_path, char *file_buf);
   void clear_all(void)

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h Wed Mar  3 00:11:08 2010
@@ -373,9 +373,9 @@
   OpenDirEntry *od;
   AIOCallbackInternal io;
   int alternate_index;          // preferred position in vector
-  Link<CacheVC> opendir_link;
+  LINK(CacheVC, opendir_link);
 #ifdef CACHE_STAT_PAGES
-  Link<CacheVC> stat_link;
+  LINK(CacheVC, stat_link);
 #endif
   // end Region B
 
@@ -1298,4 +1298,6 @@
   return theCache;
 }
 
+LINK_DEFINITION(CacheVC, opendir_link);
+
 #endif /* _P_CACHE_INTERNAL_H__ */

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_CachePart.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_CachePart.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_CachePart.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_CachePart.h Wed Mar  3 00:11:08 2010
@@ -122,7 +122,7 @@
   // we need to have a list of evacuationkeys because of collision.
   EvacuationKey evac_frags;
   CacheVC *earliest_evacuator;
-  Link<EvacuationBlock> link;
+  LINK(EvacuationBlock, link);
 };
 
 struct Part:public Continuation
@@ -148,8 +148,8 @@
   int hit_evacuate_window;
   AIOCallbackInternal io;
 
-  Queue<CacheVC> agg;
-  Queue<CacheVC> stat_cache_vcs;
+  Queue<CacheVC, Continuation::Link_link> agg;
+  Queue<CacheVC, Continuation::Link_link> stat_cache_vcs;
   char *agg_buffer;
   int agg_todo_size;
   int agg_buf_pos;
@@ -277,7 +277,7 @@
   int num_parts;
   Part **parts;
   DiskPart **disk_parts;
-    Link<CachePart> link;
+  LINK(CachePart, link);
   // per partition stats
   RecRawStatBlock *part_rsb;
 

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h Wed Mar  3 00:11:08 2010
@@ -35,7 +35,7 @@
 {
   CacheKey key;
   ink_time_t time;
-  Link<PinnedDocEntry> link;
+  LINK(PinnedDocEntry, link);
 };
 
 struct PinnedDocTable:Continuation

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_RamCache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_RamCache.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_RamCache.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_RamCache.h Wed Mar  3 00:11:08 2010
@@ -38,21 +38,21 @@
   INK_MD5 key;
   inku32 auxkey1;
   inku32 auxkey2;
-    Link<RamCacheEntry> lru_link;
-    Link<RamCacheEntry> hash_link;
-    Ptr<IOBufferData> data;
+  LINK(RamCacheEntry, lru_link);
+  LINK(RamCacheEntry, hash_link);
+  Ptr<IOBufferData> data;
 };
 
 struct RamCachePartition
 {
   int cur_bytes;
   int cur_objects;
-    DLL<RamCacheEntry> *bucket;
-    Queue<RamCacheEntry> lru;
+  DList(RamCacheEntry, hash_link) *bucket;
+  Que(RamCacheEntry, lru_link) lru;
   unsigned short *seen;
   ProxyMutexPtr lock;
 
-    RamCachePartition():cur_bytes(0), cur_objects(0), bucket(0), seen(0), lock(NULL)
+  RamCachePartition():cur_bytes(0), cur_objects(0), bucket(0), seen(0), lock(NULL)
   {
   }
 };

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/RamCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/RamCache.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/RamCache.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/RamCache.cc Wed Mar  3 00:11:08 2010
@@ -62,9 +62,9 @@
     partition = NEW(new RamCachePartition[n_partitions]);
   else
     partition = &one_partition;
-  int s = partition_size * sizeof(DLL<RamCacheEntry>);
+  int s = partition_size * sizeof(DList(RamCacheEntry, hash_link));
   for (int i = 0; i < n_partitions; i++) {
-    partition[i].bucket = (DLL<RamCacheEntry> *)xmalloc(s);
+    partition[i].bucket = (DList(RamCacheEntry, hash_link) *)xmalloc(s);
     memset(partition[i].bucket, 0, s);
     if (m)
       partition[i].lock = m;
@@ -90,8 +90,8 @@
   RamCacheEntry *e = p->bucket[i].head;
   while (e) {
     if (e->key == *key && e->auxkey1 == auxkey1 && e->auxkey2 == auxkey2) {
-      p->lru.remove(e, e->lru_link);
-      p->lru.enqueue(e, e->lru_link);
+      p->lru.remove(e);
+      p->lru.enqueue(e);
       (*ret_data) = e->data;
       DDebug("ram_cache", "get %X %d %d HIT", k, auxkey1, auxkey2);
       return 1;
@@ -120,7 +120,7 @@
 {
   inku32 oo = ee->key.word(3) / n_partitions;
   inku32 ii = oo % partition_size;
-  p->bucket[ii].remove(ee, ee->hash_link);
+  p->bucket[ii].remove(ee);
   p->cur_bytes -= ee->data->block_size();
   ProxyMutex *mutex = part->mutex;
   CACHE_SUM_DYN_STAT(cache_ram_cache_bytes_stat, -ee->data->block_size());
@@ -161,7 +161,7 @@
         DDebug("ram_cache", "put %X %d %d PRESENT", k, auxkey1, auxkey2);
         return 1;               // already present
       } else {
-        p->lru.remove(e, e->lru_link);
+        p->lru.remove(e);
         remove_entry(e, p, t);
       }
     }
@@ -173,13 +173,13 @@
   e->auxkey2 = auxkey2;
   e->data = data;
   ink_assert(p->bucket[i].head != e);
-  p->bucket[i].push(e, e->hash_link);
+  p->bucket[i].push(e);
   ink_assert(e->hash_link.next != e);
-  p->lru.enqueue(e, e->lru_link);
+  p->lru.enqueue(e);
   p->cur_bytes += data->block_size();
   CACHE_SUM_DYN_STAT(cache_ram_cache_bytes_stat, data->block_size());
   while (p->cur_bytes > bytes) {
-    RamCacheEntry *ee = p->lru.dequeue(p->lru.head, p->lru.head->lru_link);
+    RamCacheEntry *ee = p->lru.dequeue();
     if (ee)
       remove_entry(ee, p, t);
     else

Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc Wed Mar  3 00:11:08 2010
@@ -177,7 +177,7 @@
 public:
   struct Entry
   {
-    Link<Entry> link;
+    LINK(Entry, link);
     bool mark_for_delete;
     INK_MD5 key;
     ClusterVConnection *vc;

Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc Wed Mar  3 00:11:08 2010
@@ -277,9 +277,9 @@
   if (vc->active_timeout)
     vc->active_timeout->cancel(vc);
   if (vc->read.queue)
-    ClusterVC_remove(vc, &vc->read);
+    ClusterVC_remove_read(vc);
   if (vc->write.queue)
-    ClusterVC_remove(vc, &vc->write);
+    ClusterVC_remove_write(vc);
   vc->read.vio.mutex = NULL;
   vc->write.vio.mutex = NULL;
 
@@ -289,7 +289,7 @@
   free_channel(vc);
 
   if (vc->byte_bank_q.head) {
-    delayed_reads.remove(vc, vc->read.link);
+    delayed_reads.remove(vc);
 
     // Deallocate byte bank descriptors
     ByteBankDescriptor *d;
@@ -1067,11 +1067,11 @@
         ClusterVConnState *ns = &channels[c]->write;
         if (ns->queue) {
           ClusterVConnection *vc = channels[c];
-          ClusterVC_remove(vc, ns);
+          ClusterVC_remove_write(vc);
           cluster_set_priority(this, ns, 1);
           Debug(CL_PROTO, "(%d) upping write priority %d read %d free %d",
                 c, ns->priority, channels[c]->read.priority, channels[c]->remote_free);
-          ClusterVC_enqueue(write_vcs[cur_vcs], vc, ns);
+          ClusterVC_enqueue_write(write_vcs[cur_vcs], vc);
         }
       }
     }
@@ -1089,8 +1089,8 @@
 
   // Start byte bank completion action if not active
   if (!pending_byte_bank_completion) {
-    ClusterVC_remove(vc, &vc->read);
-    delayed_reads.push(vc, vc->read.link);
+    ClusterVC_remove_read(vc);
+    delayed_reads.push(vc);
     CLUSTER_INCREMENT_DYN_STAT(CLUSTER_LEVEL1_BANK_STAT);
   } else {
     CLUSTER_INCREMENT_DYN_STAT(CLUSTER_MULTILEVEL_BANK_STAT);
@@ -1368,8 +1368,7 @@
   // We have processed a complete VC read request message for a channel,
   // perform completion actions.
   //
-  ClusterVConnState *
-    s = &vc->read;
+  ClusterVConnState *s = &vc->read;
 
   if (vc->pending_remote_fill) {
     Debug(CL_TRACE, "complete_channel_read chan=%d len=%d", vc->channel, len);
@@ -1407,10 +1406,10 @@
     // VC received data, move VC to current bucket since 
     // it may have freespace data to send (READ_VC_PRIORITY).
     //
-    ClusterVC_remove(vc, s);
+    ClusterVC_remove_read(vc);
     cluster_set_priority(this, s, 1);
     Debug(CL_PROTO, "(%d) upping read priority %d", vc->channel, s->priority);
-    ClusterVC_enqueue(read_vcs[cur_vcs], vc, s);
+    ClusterVC_enqueue_read(read_vcs[cur_vcs], vc);
   }
   return true;
 }
@@ -1425,7 +1424,7 @@
   //
   ClusterVConnection *vc = NULL;
   DLL<ClusterVConnectionBase> l;
-  while ((vc = (ClusterVConnection *) delayed_reads.pop(vc, vc->read.link))) {
+  while ((vc = (ClusterVConnection *) delayed_reads.pop())) {
     MUTEX_TRY_LOCK_SPIN(lock, vc->read.vio.mutex, thread, READ_LOCK_SPIN_COUNT);
     if (lock) {
       if (vc_ok_read(vc)) {
@@ -1436,7 +1435,7 @@
           if (vc->read.queue) {
             // Previous complete_channel_read() put us back on the list,
             //  remove our self to process another byte bank completion
-            ClusterVC_remove(vc, &vc->read);
+            ClusterVC_remove_read(vc);
           }
           Debug("cluster_vc_xfer",
                 "Delayed read, credit ch %d 0x%x %d bytes", vc->channel, vc, d->get_block()->read_avail());
@@ -1450,9 +1449,8 @@
           }
         }
       }
-    } else {
-      l.push(vc, vc->read.link);
-    }
+    } else
+      l.push(vc);
   }
   delayed_reads = l;
 }
@@ -1538,7 +1536,7 @@
     int n;
     ClusterVConnection *vc;
     while ((vc = (ClusterVConnection *) write_vcs[cur_vcs].head)) {
-      ClusterVC_remove(vc, &vc->write);
+      ClusterVC_remove_write(vc);
 
       ink_assert(!((ProxyMutex *) vc->write_locked));
       MUTEX_TRY_LOCK_SPIN(lock, vc->write.vio.mutex, thread, WRITE_LOCK_SPIN_COUNT);

Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Wed Mar  3 00:11:08 2010
@@ -1080,8 +1080,8 @@
              DOT_SEPARATED(ip), clusteringVersion._major, clusteringVersion._minor);
 #endif
         thread = e->ethread;
-        read_vcs = NEW(new Queue<ClusterVConnectionBase>[CLUSTER_BUCKETS]);
-        write_vcs = NEW(new Queue<ClusterVConnectionBase>[CLUSTER_BUCKETS]);
+        read_vcs = NEW((new Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_read_link>[CLUSTER_BUCKETS]));
+        write_vcs = NEW((new Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_write_link>[CLUSTER_BUCKETS]));
         SET_HANDLER((ClusterContHandler) & ClusterHandler::beginClusterEvent);
 
         // enable schedule_imm() on i/o completion (optimization)

Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc Wed Mar  3 00:11:08 2010
@@ -82,9 +82,9 @@
   int new_bucket = ch->cur_vcs + ns->priority;
   new_bucket %= CLUSTER_BUCKETS;
   if (ns == &vc->read) {
-    ClusterVC_enqueue(ch->read_vcs[new_bucket], vc, ns);
+    ClusterVC_enqueue_read(ch->read_vcs[new_bucket], vc);
   } else {
-    ClusterVC_enqueue(ch->write_vcs[new_bucket], vc, ns);
+    ClusterVC_enqueue_write(ch->write_vcs[new_bucket], vc);
   }
 }
 
@@ -94,7 +94,10 @@
   //
   // Remove from bucket, computer priority and schedule into target bucket
   //
-  ClusterVC_remove(vc, ns);
+  if (ns == &vc->read)
+    ClusterVC_remove_read(vc);
+  else
+    ClusterVC_remove_write(vc);
   cluster_set_priority(ch, ns, ns->priority);
   cluster_schedule(ch, vc, ns);
 }
@@ -120,7 +123,10 @@
     }
   }
   cluster_lower_priority(ch, ns);
-  ClusterVC_remove(vc, ns);
+  if (ns == &vc->read)
+    ClusterVC_remove_read(vc);
+  else
+    ClusterVC_remove_write(vc);
   cluster_schedule(ch, vc, ns);
 }
 
@@ -165,14 +171,14 @@
   int new_bucket = (ch->cur_vcs + CLUSTER_BUMP_LENGTH) % CLUSTER_BUCKETS;
   if (ns == &vc->read) {
     if (this_bucket != CLUSTER_BUMP_NO_REMOVE) {
-      ClusterVC_remove(vc, ns);
+      ClusterVC_remove_read(vc);
     }
-    ClusterVC_enqueue(ch->read_vcs[new_bucket], vc, ns);
+    ClusterVC_enqueue_read(ch->read_vcs[new_bucket], vc);
   } else {
     if (this_bucket != CLUSTER_BUMP_NO_REMOVE) {
-      ClusterVC_remove(vc, ns);
+      ClusterVC_remove_write(vc);
     }
-    ClusterVC_enqueue(ch->write_vcs[new_bucket], vc, ns);
+    ClusterVC_enqueue_write(ch->write_vcs[new_bucket], vc);
   }
 }
 

Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h Wed Mar  3 00:11:08 2010
@@ -174,7 +174,7 @@
   ClusterConfiguration();
   unsigned char hash_table[CLUSTER_HASH_TABLE_SIZE];
   ink_hrtime changed;
-  SLink<ClusterConfiguration> link;
+  SLINK(ClusterConfiguration, link);
 };
 
 inline bool
@@ -333,33 +333,12 @@
   void *queue;
   int ifd;
   Event *delay_timeout;
-    Link<ClusterVConnectionBase> link;
+  Link<ClusterVConnectionBase> link;
 
   // void enqueue(void * q, ClusterVConnection * vc);
-    ClusterVConnState();
+  ClusterVConnState();
 };
 
-//
-// Inline function to enqueue VC's.
-// This would be better as a member function of ClusterVConnState,
-// but C++'s primitive compilation model makes that impossible.
-//
-inline void
-ClusterVConnState_enqueue(Queue<ClusterVConnectionBase> &q, ClusterVConnectionBase * vc, ClusterVConnState * cs)
-{
-  ink_assert(!cs->queue);
-  cs->queue = &q;
-  q.enqueue(vc, cs->link);
-}
-
-inline void
-ClusterVConnState_remove(ClusterVConnectionBase * vc, ClusterVConnState * cs)
-{
-  ink_assert(cs->queue);
-  ((Queue<ClusterVConnectionBase> *)cs->queue)->remove(vc, cs->link);
-  cs->queue = NULL;
-}
-
 struct ClusterVConnectionBase:CacheVConnection
 {
   //
@@ -406,6 +385,8 @@
   volatile int closed;
   ClusterVConnState read;
   ClusterVConnState write;
+  LINKM(ClusterVConnectionBase, read, link);
+  LINKM(ClusterVConnectionBase, write, link);
   ink_hrtime inactivity_timeout_in;
   ink_hrtime active_timeout_in;
   Event *inactivity_timeout;
@@ -493,7 +474,7 @@
   static void ByteBankDescriptor_free(ByteBankDescriptor *);
 
 public:
-  Link<ByteBankDescriptor> link;
+  LINK(ByteBankDescriptor, link);
 
 private:
   Ptr<IOBufferBlock> block;  // holder of bank bytes
@@ -1134,8 +1115,7 @@
 inline void
 cluster_ping(ClusterMachine * m, PingReturnFunction fn, void *data, int len)
 {
-  PingMessage *msg = (PingMessage *)
-    alloca(PingMessage::sizeof_fixedlen_msg() + len);
+  PingMessage *msg = (PingMessage *)alloca(PingMessage::sizeof_fixedlen_msg() + len);
   msg->init();
   msg->fn = fn;
   memcpy(msg->data, data, len);
@@ -1157,18 +1137,38 @@
 void build_cluster_hash_table(ClusterConfiguration *);
 
 inline void
-ClusterVC_enqueue(Queue<ClusterVConnectionBase> &q, ClusterVConnectionBase * vc, ClusterVConnState * cs)
+ClusterVC_enqueue_read(Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_read_link> &q, ClusterVConnectionBase * vc)
+{
+  ClusterVConnState * cs = &vc->read;
+  ink_assert(!cs->queue);
+  cs->queue = &q;
+  q.enqueue(vc);
+}
+
+inline void
+ClusterVC_enqueue_write(Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_write_link> &q, ClusterVConnectionBase * vc)
 {
+  ClusterVConnState * cs = &vc->write;
   ink_assert(!cs->queue);
   cs->queue = &q;
-  q.enqueue(vc, cs->link);
+  q.enqueue(vc);
+}
+
+inline void
+ClusterVC_remove_read(ClusterVConnectionBase * vc)
+{
+  ClusterVConnState * cs = &vc->read;
+  ink_assert(cs->queue);
+  ((Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_read_link> *)cs->queue)->remove(vc);
+  cs->queue = NULL;
 }
 
 inline void
-ClusterVC_remove(ClusterVConnectionBase * vc, ClusterVConnState * cs)
+ClusterVC_remove_write(ClusterVConnectionBase * vc)
 {
+  ClusterVConnState * cs = &vc->write;
   ink_assert(cs->queue);
-  ((Queue<ClusterVConnectionBase> *)cs->queue)->remove(vc, cs->link);
+  ((Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_write_link> *)cs->queue)->remove(vc);
   cs->queue = NULL;
 }
 

Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterHandler.h Wed Mar  3 00:11:08 2010
@@ -346,7 +346,7 @@
   int last_ndone;               // last do_io ndone
   int total_bytes_xfered;
   IOVec *iov;                   // io vector for readv, writev
-    Ptr<IOBufferData> iob_iov;
+  Ptr<IOBufferData> iob_iov;
 
   // Write byte bank structures
   char *byte_bank;              // bytes buffered for transit
@@ -358,7 +358,7 @@
   ink_hrtime last_time;
   ink_hrtime start_time;
 
-    Ptr<IOBufferBlock> block[MAX_TCOUNT];
+  Ptr<IOBufferBlock> block[MAX_TCOUNT];
   struct MIOBuffer *mbuf;
   int state;                    // See enum defs below
 
@@ -388,8 +388,8 @@
     WRITE_COMPLETE
   } write_state_t;
 
-    ClusterState(ClusterHandler *, bool);
-   ~ClusterState();
+  ClusterState(ClusterHandler *, bool);
+  ~ClusterState();
   IOBufferData *get_data();
   void build_do_io_vector();
   int doIO();
@@ -407,13 +407,13 @@
   //
   // Private
   //
-  Queue<ClusterVConnectionBase> *read_vcs;
-  Queue<ClusterVConnectionBase> *write_vcs;
+  Queue<ClusterVConnectionBase, ClusterVConnection::Link_read_link> *read_vcs;
+  Queue<ClusterVConnectionBase, ClusterVConnection::Link_write_link> *write_vcs;
   int cur_vcs;
   int min_priority;
   Event *trigger_event;
 
-    ClusterHandlerBase():Continuation(NULL), read_vcs(NULL), write_vcs(NULL), cur_vcs(0), min_priority(1)
+  ClusterHandlerBase():Continuation(NULL), read_vcs(NULL), write_vcs(NULL), cur_vcs(0), min_priority(1)
   {
   }
 };
@@ -437,13 +437,13 @@
   struct ChannelData
   {
     int channel_number;
-      Link<ChannelData> link;
+    LINK(ChannelData, link);
   };
 
   int n_channels;
   ClusterVConnection **channels;
   struct ChannelData **channel_data;
-    Queue<ChannelData> free_local_channels;
+  Queue<ChannelData> free_local_channels;
 
   bool connector;
   int cluster_connect_state;    // see clcon_state_t enum
@@ -469,11 +469,11 @@
   InkAtomicList outgoing_control_al[CLUSTER_CMSG_QUEUES];
   InkAtomicList external_incoming_control;
   InkAtomicList external_incoming_open_local;
-    ClusterCalloutContinuation * callout_cont[MAX_COMPLETION_CALLBACK_EVENTS];
+  ClusterCalloutContinuation * callout_cont[MAX_COMPLETION_CALLBACK_EVENTS];
   Event *callout_events[MAX_COMPLETION_CALLBACK_EVENTS];
   Event *cluster_periodic_event;
-    Queue<OutgoingControl> outgoing_control[CLUSTER_CMSG_QUEUES];
-    Queue<IncomingControl> incoming_control;
+  Queue<OutgoingControl> outgoing_control[CLUSTER_CMSG_QUEUES];
+  Queue<IncomingControl> incoming_control;
   ClusterState read;
   ClusterState write;
 
@@ -484,7 +484,7 @@
   ink_hrtime last_cluster_op_enable;
   ink_hrtime last_trace_dump;
 
-    DLL<ClusterVConnectionBase> delayed_reads;
+  DLL<ClusterVConnectionBase> delayed_reads;
   ClusterLoadMonitor *clm;
   bool disable_remote_cluster_ops;
 

Modified: incubator/trafficserver/traffic/trunk/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/dns/DNS.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/dns/DNS.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/dns/DNS.cc Wed Mar  3 00:11:08 2010
@@ -955,7 +955,7 @@
         DNSEntry *dup = get_entry(dnsH, qname, qtype);
         if (dup) {
           Debug("dns", "collapsing NS request");
-          dup->dups.enqueue(this, this->dup_link);
+          dup->dups.enqueue(this);
         } else {
           Debug("dns", "adding first to collapsing queue");
           dnsH->entries.enqueue(this);
@@ -1112,9 +1112,9 @@
 
   DNSEntry *dup = NULL;
 
-  while ((dup = e->dups.dequeue(e, e->dup_link))) {
+  while ((dup = e->dups.dequeue())) {
     if (dup->post(h, ent, false)) {
-      e->dups.enqueue(dup, dup->dup_link);
+      e->dups.enqueue(dup);
       goto Lretry;
     }
   }

Modified: incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSConnection.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSConnection.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSConnection.h Wed Mar  3 00:11:08 2010
@@ -61,7 +61,7 @@
   int fd;
   struct sockaddr_in sa;
   int num;
-  Link<DNSConnection> link;
+  LINK(DNSConnection, link);
   EventIO eio;
 
   int connect(unsigned int ip, int port,

Modified: incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h Wed Mar  3 00:11:08 2010
@@ -183,8 +183,8 @@
   bool written_flag;
   bool once_written_flag;
   bool last;
-  Queue<DNSEntry> dups;
-  Link<DNSEntry> dup_link;
+  LINK(DNSEntry, dup_link);
+  Que(DNSEntry, dup_link) dups;
 
   int mainEvent(int event, Event * e);
   int delayEvent(int event, Event * e);

Modified: incubator/trafficserver/traffic/trunk/iocore/dns/SRV.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/dns/SRV.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/dns/SRV.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/dns/SRV.h Wed Mar  3 00:11:08 2010
@@ -41,8 +41,8 @@
   char host[MAXDNAME];
 
 public:
-    Link<SRV> link;          /* we need this in order to queue these things up in SRVHosts, but I agree, it's pretty lame */
-    SRV():weight(0), port(0), priority(0), ttl(0)
+  LINK(SRV, link);
+  SRV():weight(0), port(0), priority(0), ttl(0)
   {
     memset(host, 0, MAXDNAME);
   }

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h Wed Mar  3 00:11:08 2010
@@ -128,7 +128,7 @@
     assembled.
 
   */
-  Link<Continuation> link;
+  LINK(Continuation, link);
 
   /**
     Receives the event code and data for an Event.

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h Wed Mar  3 00:11:08 2010
@@ -261,7 +261,7 @@
     Event & operator =(const Event &);
 
 public:
-    Link<Event> link;
+  LINK(Event, link);
 
   /*-------------------------------------------------------*\
   | UNIX/non-NT Interface                                   |

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h Wed Mar  3 00:11:08 2010
@@ -1130,7 +1130,7 @@
   ink64 water_mark;
 
   // DEPRECATED
-  Link<MIOBuffer> link;
+  //DLINK(MIOBuffer, link);
 
   Ptr<IOBufferBlock> _writer;
   IOBufferReader readers[MAX_MIOBUFFER_READERS];

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc Wed Mar  3 00:11:08 2010
@@ -147,7 +147,7 @@
 
   e = (Event *) ink_atomiclist_popall(&al);
   // invert the list, to preserve order
-  SList(Event, link) l, t;
+  SLL<Event, Event::Link_link> l, t;
   t.head = e;
   while ((e = t.pop()))
     l.push(e);

Modified: incubator/trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/hostdb/P_HostDBProcessor.h Wed Mar  3 00:11:08 2010
@@ -153,8 +153,8 @@
     //return 16.0;
     return 24.0;
   }
-  Queue<HostDBContinuation> pending_dns[MULTI_CACHE_PARTITIONS];
-  Queue<HostDBContinuation> &pending_dns_for_hash(INK_MD5 & md5);
+  Queue<HostDBContinuation, Continuation::Link_link> pending_dns[MULTI_CACHE_PARTITIONS];
+  Queue<HostDBContinuation, Continuation::Link_link> &pending_dns_for_hash(INK_MD5 & md5);
   HostDBCache();
 };
 

Modified: incubator/trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h Wed Mar  3 00:11:08 2010
@@ -72,7 +72,7 @@
 
   int from_size;
 
-  Link<UDPPacket> link;
+  LINK(UDPPacket, link);
 };
 
 /**

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UDPNet.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UDPNet.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UDPNet.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UDPNet.h Wed Mar  3 00:11:08 2010
@@ -85,7 +85,7 @@
   // Interface exported to the outside world
   void send(UDPPacket * p);
 
-  Que(UDPPacketInternal, link) reliabilityPktQueue;
+  Queue<UDPPacketInternal> reliabilityPktQueue;
   InkAtomicList atomicQueue;
   ink_hrtime last_report;
   ink_hrtime last_service;
@@ -124,8 +124,8 @@
   int nPackets;
 
   ink_hrtime lastPullLongTermQ;
-  Que(UDPPacketInternal, link) longTermQ;
-  Que(UDPPacketInternal, link) bucket[N_SLOTS];
+  Queue<UDPPacketInternal> longTermQ;
+  Queue<UDPPacketInternal> bucket[N_SLOTS];
   ink_hrtime delivery_time[N_SLOTS];
   int now_slot;
 
@@ -213,7 +213,7 @@
   void FreeCancelledPackets(int numSlots)
   {
     UDPPacketInternal *p;
-    Que(UDPPacketInternal, link) tempQ;
+    Queue<UDPPacketInternal> tempQ;
     int i, s;
 
     for (i = 0; i < numSlots; i++) {
@@ -239,7 +239,7 @@
     int prev;
 
     if (ink_hrtime_to_msec(t - lastPullLongTermQ) >= SLOT_TIME_MSEC * ((N_SLOTS - 1) / 2)) {
-      Que(UDPPacketInternal, link) tempQ;
+      Queue<UDPPacketInternal> tempQ;
       UDPPacketInternal *p;
       // pull in all the stuff from long-term slot
       lastPullLongTermQ = t;
@@ -356,9 +356,9 @@
 {
 public:
   // to be polled for read
-  Que(UnixUDPConnection, polling_link) udp_polling;
+  Queue(UnixUDPConnection, polling_link) udp_polling;
   // to be called back with data
-  Que(UnixUDPConnection, callback_link) udp_callbacks;
+  Queue(UnixUDPConnection, callback_link) udp_callbacks;
   // outgoing packets
   InkAtomicList udpAtomicQueue;
   UDPQueue udpOutQueue;

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h Wed Mar  3 00:11:08 2010
@@ -51,7 +51,7 @@
 
   virtual void free();
 
-  SLink<UDPPacketInternal> alink;  // atomic link
+  SLINK(UDPPacketInternal, alink);  // atomic link
   // packet scheduling stuff: keep it a doubly linked list
   inku64 pktSendStartTime;
   inku64 pktSendFinishTime;

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Wed Mar  3 00:11:08 2010
@@ -243,12 +243,12 @@
 {
 public:
   Event *trigger_event;
-  Que(UnixNetVConnection, read.ready_link) read_ready_list;
-  Que(UnixNetVConnection, write.ready_link) write_ready_list;
+  QueM(UnixNetVConnection, NetState, read, ready_link) read_ready_list;
+  QueM(UnixNetVConnection, NetState, write, ready_link) write_ready_list;
   Que(UnixNetVConnection, link) open_list;
   Que(DNSConnection, link) dnsqueue;
-  ASLL(UnixNetVConnection, read.enable_link) read_enable_list;
-  ASLL(UnixNetVConnection, write.enable_link) write_enable_list;
+  ASLLM(UnixNetVConnection, NetState, read, enable_link) read_enable_list;
+  ASLLM(UnixNetVConnection, NetState, write, enable_link) write_enable_list;
 
   time_t sec;
   int cycles;

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h Wed Mar  3 00:11:08 2010
@@ -78,11 +78,9 @@
 
   char *throttle_error_message;
   Event *accept_thread_event;
-  ASLL(NetAccept, link) accepts_on_thread;
+  AtomicSLL<NetAccept, NetAccept::Link_link> accepts_on_thread;
 
-  int accept_epoll_fd;          //added by YTS Team, yamsat
-
-  //offsets for per thread data structures
+  // offsets for per thread data structures
   ink_off_t netHandler_offset;
   ink_off_t pollCont_offset;
 

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetState.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetState.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetState.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetState.h Wed Mar  3 00:11:08 2010
@@ -57,4 +57,5 @@
 
   NetState() : enabled(0), vio(VIO::NONE), in_enabled_list(0), triggered(0) {}
 };
+
 #endif

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h Wed Mar  3 00:11:08 2010
@@ -193,6 +193,12 @@
   volatile int closed;
   NetState read;
   NetState write;
+
+  LINKM(UnixNetVConnection, read, ready_link);
+  SLINKM(UnixNetVConnection, read, enable_link);
+  LINKM(UnixNetVConnection, write, ready_link);
+  SLINKM(UnixNetVConnection, write, enable_link);
+
   ink_hrtime inactivity_timeout_in;
   ink_hrtime active_timeout_in;
 #ifdef INACTIVITY_TIMEOUT

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h Wed Mar  3 00:11:08 2010
@@ -44,9 +44,9 @@
   void errorAndDie(int e);
   int callbackHandler(int event, void *data);
 
-  Link<UnixUDPConnection> polling_link;
-  Link<UnixUDPConnection> callback_link;
-  SLink<UnixUDPConnection> newconn_alink;
+  LINK(UnixUDPConnection, polling_link);
+  LINK(UnixUDPConnection, callback_link);
+  SLINK(UnixUDPConnection, newconn_alink);
 
   InkAtomicList inQueue;
   int onCallbackQueue;

Modified: incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc Wed Mar  3 00:11:08 2010
@@ -285,7 +285,7 @@
 {
   UnixNetVConnection *vc = NULL;
 
-  SList(UnixNetVConnection, read.enable_link) rq(nh->read_enable_list.popall());
+  SListM(UnixNetVConnection, NetState, read, enable_link) rq(nh->read_enable_list.popall());
   while ((vc = rq.pop())) {
     vc->ep.modify(EVENTIO_READ);
     vc->ep.refresh(EVENTIO_READ);
@@ -294,7 +294,7 @@
       nh->read_ready_list.in_or_enqueue(vc);
   }
 
-  SList(UnixNetVConnection, write.enable_link) wq(nh->write_enable_list.popall());
+  SListM(UnixNetVConnection, NetState, write, enable_link) wq(nh->write_enable_list.popall());
   while ((vc = wq.pop())) {
     vc->ep.modify(EVENTIO_WRITE);
     vc->ep.refresh(EVENTIO_WRITE);

Modified: incubator/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc Wed Mar  3 00:11:08 2010
@@ -42,11 +42,6 @@
 ClassAllocator<UnixNetVConnection> netVCAllocator("netVCAllocator");
 
 //
-// Prototypes
-//
-void net_update_priority(NetHandler *nh, UnixNetVConnection *vc, NetState *ns, int ndone);
-
-//
 // Reschedule a UnixNetVConnection by moving it
 // onto or off of the ready_list
 //

Modified: incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPConnection.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPConnection.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPConnection.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPConnection.cc Wed Mar  3 00:11:08 2010
@@ -80,7 +80,7 @@
     if (p) {
       Debug("udpnet", "UDPConnection::callbackHandler");
       UDPPacketInternal *pnext = NULL;
-      Que(UDPPacketInternal, link) result;
+      Queue<UDPPacketInternal> result;
       while (p) {
         pnext = p->alink.next;
         p->alink.next = NULL;

Modified: incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Wed Mar  3 00:11:08 2010
@@ -838,7 +838,7 @@
   if (p) {
 
     UDPPacketInternal *pnext = NULL;
-    Que(UDPPacketInternal, link) stk;
+    Queue<UDPPacketInternal> stk;
 
     while (p) {
       pnext = p->alink.next;
@@ -1094,9 +1094,11 @@
   }
 
   Debug("udp-send", "Sending 0x%x", p);
+#if (HOST_OS != solaris)
   msg.msg_control = 0;
   msg.msg_controllen = 0;
   msg.msg_flags = 0;
+#endif
   msg.msg_name = (caddr_t) & p->to;
   msg.msg_namelen = sizeof(p->to);
   iov_len = 0;

Modified: incubator/trafficserver/traffic/trunk/iocore/utils/I_OpQueue.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/utils/I_OpQueue.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/utils/I_OpQueue.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/utils/I_OpQueue.h Wed Mar  3 00:11:08 2010
@@ -56,7 +56,7 @@
   int id;
   int event;
   void *data;
-  Link<Callback> link;
+  LINK(Callback, link);
 };
 
 /**

Modified: incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/Compatability.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h Wed Mar  3 00:11:08 2010
@@ -137,9 +137,18 @@
 
 #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"
 

Modified: incubator/trafficserver/traffic/trunk/libinktomi++/DAllocator.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/DAllocator.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/DAllocator.h (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/DAllocator.h Wed Mar  3 00:11:08 2010
@@ -57,7 +57,7 @@
   DallocState state;
   void *el;
 
-  Link<AllocDescriptor> link;      // list of free elements
+  LINK(AllocDescriptor, link);      // list of free elements
 };
 
 struct DAllocator;
@@ -73,7 +73,7 @@
 
   AllocDescriptor *descriptors;
 
-  SLink<AllocPoolDescriptor> link;
+  SLINK(AllocPoolDescriptor, link);
 };
 
 struct DAllocator

Modified: incubator/trafficserver/traffic/trunk/libinktomi++/List.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/List.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/List.h (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/List.h Wed Mar  3 00:11:08 2010
@@ -32,10 +32,10 @@
   and a list descriptor.  Both are parameterized by template object class.
   The link cell and list descriptor are named as follows:
 
-  list type		1-linked list	2-linked list	queue      plist
-  ---------		-------------	-------------	-----      -----
-  link cell		SLink<C>	Link<C>		Link<C>	   Link<C>
-  list descriptor	SLL<C>		DLL<C>		Queue<C>   Plist<C>
+  list type		1-linked list	2-linked list	queue
+  ---------		-------------	-------------	-----
+  link cell		SLink<C>	Link<C>	        Link<C>
+  list descriptor	SLL<C>	        DLL<C>	        Queue<C>
 
   The list descriptor contains state about the lists (for example: head and
   tail pointers) and supports list manipulation methods.
@@ -70,7 +70,12 @@
   C *next;
   SLink() : next(NULL) {};
 };
-#define GetSLinkNext(_c, _e, _o) (((SLink<_c> *)(void*)(((intptr_t)(void*)_e) + _o))->next)
+#define SLINK(_c,_f) class Link##_##_f : public SLink<_c> { public:    \
+    static _c *& next_link(_c *c) { return c->_f.next; }                \
+  }; SLink<_c> _f
+#define SLINKM(_c,_m,_f) class Link##_##_m##_##_f : public SLink<_c> { public: \
+    static _c *& next_link(_c *c) { return c->_m._f.next; }             \
+  };
 
 //
 //      Link cell for doubly-linked list of objects of type C.
@@ -79,236 +84,122 @@
   C *prev;
   Link() : prev(NULL) {}
 };
-#define GetLink(_c, _e, _o) (((Link<_c> *)(void*)(((intptr_t)(void*)_e) + _o)))
-#define GetLinkNext(_c, _e, _o) (((Link<_c> *)(void*)(((intptr_t)(void*)_e) + _o))->next)
-#define GetLinkPrev(_c, _e, _o) (((Link<_c> *)(void*)(((intptr_t)(void*)_e) + _o))->prev)
+#define LINK(_c,_f) class Link##_##_f : public Link<_c> { public:       \
+    static _c *& next_link(_c *c) { return c->_f.next; }                \
+    static _c *& prev_link(_c *c) { return c->_f.prev; }                \
+  }; Link<_c> _f
+#define LINKM(_c,_m,_f) class Link##_##_m##_##_f : public Link<_c> { public:  \
+    static _c *& next_link(_c *c) { return c->_m._f.next; }             \
+    static _c *& prev_link(_c *c) { return c->_m._f.prev; }             \
+  };
+#define LINK_FORWARD_DECLARATION(_c,_f) class Link##_##_c##_##_f : public Link<_c> { public:     \
+    static _c *& next_link(_c *c);                                      \
+    static _c *& prev_link(_c *c);                                      \
+  };
+#define LINK_DEFINITION(_c,_f)  \
+  inline _c *& Link##_##_c##_##_f::next_link(_c *c) { return c->_f.next; } \
+  inline _c *& Link##_##_c##_##_f::prev_link(_c *c) { return c->_f.prev; } \
 
 //
 //      List descriptor for singly-linked list of objects of type C.
 //
-template <class C, int o = -1> class SLL {
+template <class C, class L = typename C::Link_link> class SLL {
  public:
   C *head;
   void push(C *e);
   C *pop();
   void clear() { head = NULL; }
-  C *next_link(C *e) { return GetLinkNext(C, e, o); }
-  // old manual link offset compatibiilty code
-  SLink<C> &link(C * x, C * c, SLink<C> &cl);
-  SLink<C> &head_link(C * c, SLink<C> &l) { return link(head, c, l); }
-  void push(C * c, SLink<C> &l);
-  C *pop(C * c, SLink<C> &l);
-  // end compatibility code
+  C *& next(C *e) { return L::next_link(e); }
 
   SLL() : head(NULL) {}
   SLL(C *c) : head(c) {}
 };
-#define SList(_c, _f)  SLL<_c, ink_offsetof(_c, _f)>
-#define forl_LL(_c, _p, _l) for (_c *_p = (_l).head; _p; _p = (_l).next_link(_p))
-
-template<class C, int o> inline void 
-SLL<C,o>::push(C *c, SLink<C> &l) {
-  l.next = head;
-  head = c;
-}
-
-template <class C, int o> inline void 
-SLL<C, o>::push(C *e) {
-  if (o == -1) {
-    push(e, *(SLink<C>*)&e->link);
-    return;
-  }
-  GetSLinkNext(C, e, o) = head;
+#define SList(_c, _f)  SLL<_c, _c::Link##_##_f>
+#define SListM(_c, _m, _ml, _l) SLL<_c, _c::Link##_##_ml##_##_l>
+#define forl_LL(_c, _p, _l) for (_c *_p = (_l).head; _p; _p = (_l).next(_p))
+
+template <class C, class L> inline void 
+SLL<C,L>::push(C *e) {
+  next(e) = head;
   head = e;
 }
 
-template<class C, int o> inline C * 
-SLL<C, o>::pop(C * c, SLink<C> &l) {
-  C *res = head;
-  if (res) {
-    head = l.next;
-    link(res, c, l).next = NULL;
-  }
-  return res;
-}
-
-template <class C, int o> inline C *
-SLL<C, o>::pop() {
-  if (o == -1) {
-    if (head)
-      return pop(head, *(SLink<C>*)&head->link);
-    else
-      return NULL;
-  }
+template <class C, class L> inline C *
+SLL<C,L>::pop() {
   C *ret = head;
   if (ret) {
-    head = GetSLinkNext(C, ret, o);
-    GetSLinkNext(C, ret, o) = NULL;
+    head = next(ret);
+    next(ret) = NULL;
   }
   return ret;
 }
 
-template<class C, int o> inline SLink<C> &SLL<C, o>::link(C * x, C * c, SLink<C> &cl) {
-  return *(SLink<C> *)(((char *) x) + (((char *) &cl) - ((char *) c)));
-}
-
 //
 //      List descriptor for doubly-linked list of objects of type C.
 //
-template <class C, int o = -1> struct DLL {
+template <class C, class L = typename C::Link_link> struct DLL {
   C *head;
   bool empty() { return head == NULL; }
   void push(C *e);
   C *pop();
   void remove(C *e);
   void insert(C *e, C *after);
-  bool in(C *e) { return head == e || GetLinkNext(C, e, o) || GetLinkPrev(C, e, o); }
+  bool in(C *e) { return head == e || next(e) || prev(e); }
   void clear() { head = NULL; }
-  C *next_link(C *e) { return GetLinkNext(C, e, o); }
-  C *prev_link(C *e) { return GetLinkPrev(C, e, o); }
-  // old manual link offset compatibiilty code
-  void push(C *c, Link<C> &l);
-  void remove(C *c, Link<C> &l);
-  void enqueue(C *c, Link<C> &l);
-  void insert(C *c, Link<C> &l, C *after);
-  bool in(C * c, Link<C> &l) { return l.prev || l.next || this->head == c; }
-  C *pop(C *c, Link<C> &l);
-  Link<C> &link(C *x, C *c, Link<C> &cl);
-  Link<C> &head_link(C * c, Link<C> &cl);
-  Link<C> &tail_link(C * c, Link<C> &cl);
-  // end compatibility code
+  C *&next(C *e) { return *(C**)&L::next_link(e); }
+  C *&prev(C *e) { return *(C**)&L::prev_link(e); }
 
   DLL() : head(NULL) {}
 };
-#define DList(_c, _f)  DLL<_c, ink_offsetof(_c, _f)>
-
-template<class C, int o> inline void 
-DLL<C,o>::push(C *c, Link<C> &l)
-{
-  C *chead = (C *)head;
-  l.next = chead;
-  if (chead)
-    link(chead, c, l).prev = c;
-  head = c;
-}
+#define DList(_c, _f)  DLL<_c, _c::Link##_##_f>
+#define DListM(_c, _m, _ml, _l) DLL<_c, _c::Link##_##_ml##_##_l>
 
-template <class C, int o> inline void 
-DLL<C, o>::push(C *e) {
-  if (o == -1) {
-    push(e, *(Link<C>*)&e->link);
-    return;
-  }
+template <class C, class L> inline void 
+DLL<C,L>::push(C *e) {
   if (head)
-    GetLinkPrev(C, head, o) = e;
-  GetLinkNext(C, e, o) = head;
+    prev(head) = e;
+  next(e) = head;
   head = e;
 }
 
-template<class C, int o> inline void 
-DLL<C,o>::remove(C *c, Link<C> &l)
-{
-  if (!head)
-    return;
-  if (c == head)
-    head = (C *) link(head, c, l).next;
-  if (l.prev)
-    link(l.prev, c, l).next = l.next;
-  if (l.next)
-    link(l.next, c, l).prev = l.prev;
-  l.prev = NULL;
-  l.next = NULL;
-}
-
-template <class C, int o> inline void
-DLL<C, o>::remove(C *e) {
-  if (o == -1) {
-    remove(e, *(Link<C>*)&e->link);
-    return;
-  }
+template <class C, class L> inline void
+DLL<C,L>::remove(C *e) {
   if (!head) return;
-  if (e == head) head = GetLinkNext(C, e, o);
-  if (GetLinkPrev(C, e, o)) GetLinkNext(C, GetLinkPrev(C, e, o), o) = GetLinkNext(C, e, o);
-  if (GetLinkNext(C, e, o)) GetLinkPrev(C, GetLinkNext(C, e, o), o) = GetLinkPrev(C, e, o);
-  GetLinkPrev(C, e, o) = NULL;
-  GetLinkNext(C, e, o) = NULL;
+  if (e == head) head = next(e);
+  if (prev(e)) next(prev(e)) = next(e);
+  if (next(e)) prev(next(e)) = prev(e);
+  prev(e) = NULL;
+  next(e) = NULL;
 }
 
-template<class C, int o> inline C *
-DLL<C,o>::pop(C * c, Link<C> &l)
-{
-  C *res = (C*)head;
-  if (res)
-    remove(res, link(res, c, l));
-  return res;
-}
-
-template <class C, int o> inline C *
-DLL<C, o>::pop() {
-  if (o == -1) {
-    if (head)
-      return pop(head, *(Link<C>*)&head->link);
-    else
-      return NULL;
-  }
+template <class C, class L> inline C *
+DLL<C,L>::pop() {
   C *ret = head;
   if (ret) {
-    head = GetLinkNext(C, ret, o);
+    head = next(ret);
     if (head)
-      GetLinkPrev(C, head, o) = NULL;
-    GetLinkNext(C, ret, o) = NULL;
+      prev(head) = NULL;
+    next(ret) = NULL;
     return ret;
   } else
     return NULL;
 }
 
-template<class C, int o> inline void
-DLL<C, o>::insert(C *c, Link<C> &l, C *after) {
-  if (!after) {
-    push(c, l);
-    return;
-  }
-  l.prev = after;
-  l.next = link(after, c, l).next;
-  link(after, c, l).next = c;
-  if (l.next)
-    link(l.next, c, l).prev = c;
-}
-
-template <class C, int o> inline void
-DLL<C, o>::insert(C *e, C *after) {
-  if (o == -1) {
-    insert(e, *(Link<C>*)&e->link, after);
-    return;
-  }
+template <class C, class L> inline void
+DLL<C,L>::insert(C *e, C *after) {
   if (!after) { push(e); return; }
-  GetLinkPrev(C, e, o) = after; 
-  GetLinkNext(C, e, o) = GetLinkNext(C, after, o);
-  GetLinkNext(C, after, o) = e;
-  if (GetLinkNext(C, e, o)) GetLinkPrev(C, GetLinkNext(C, e, o), o) = e;
-}
-
-template <class C, int o> inline Link<C> &
-DLL<C,o>::link(C *x, C *c, Link<C> &cl) {
-  return (*(Link<C>*)(((char*)x)+(((char*)&cl)-((char*)c))));
-}
-
-template <class C, int o> inline Link<C> &
-DLL<C,o>::head_link(C * c, Link<C> &cl) {
-  return link((C *) this->head, c, cl);
-}
-
-template <class C, int o> inline Link<C> &
-DLL<C,o>::tail_link(C * c, Link<C> &cl) {
-  return link((C *) this->tail, c, cl);
+  prev(e) = after; 
+  next(e) = next(after);
+  next(after) = e;
+  if (next(e)) prev(next(e)) = e;
 }
 
 //
 //      List descriptor for queue of objects of type C.
 //
-template <class C, int o = -1> class Queue : public DLL<C, o> {
+template <class C, class L = typename C::Link_link> class Queue : public DLL<C,L> {
  public:
-  using DLL<C, o>::head;
-  using DLL<C, o>::link;
+  using DLL<C,L>::head;
   C *tail;
   void push(C *e);
   C *pop();
@@ -317,221 +208,91 @@
   C *dequeue();
   void remove(C *e);
   void insert(C *e, C *after);
-  void append(Queue<C, o> q);
-  void append(DLL<C, o> q);
+  void append(Queue<C,L> q);
+  void append(DLL<C,L> q);
   void clear() { head = NULL; tail = NULL; }
-  // old manual link offset compatibiilty code
-  void push(C *c, Link<C> &l);
-  C *pop(C *c, Link<C> &l);
-  void enqueue(C *e, Link<C> &l);
-  C *dequeue(C *c, Link<C> &l);
-  void remove(C *c, Link<C> &l);
-  void insert(C *c, Link<C> &l, C * after);
-  void append(Queue<C, o> q, Link<C> &l);
-  void append(DLL<C, o> q, Link<C> &l);
-  // end compatibility code
   
   Queue() : tail(NULL) {}
 };
-#define Que(_c, _f) Queue<_c, ink_offsetof(_c, _f)>
+#define Que(_c, _f) Queue<_c, _c::Link##_##_f>
+#define QueM(_c, _m, _mf, _f) Queue<_c, _c::Link##_##_mf##_##_f>
 
-template <class C, int o> inline void 
-Queue<C, o>::push(C * c, Link<C> &l) {
-  DLL<C, o>::push(c, l);
-  if (!tail)
-    tail = head;
-}
-
-template <class C, int o> inline void 
-Queue<C, o>::push(C *e) {
-  if (o == -1) {
-    push(e, *(Link<C>*)&e->link);
-    return;
-  }
-  DLL<C, o>::push(e);
+template <class C, class L> inline void 
+Queue<C,L>::push(C *e) {
+  DLL<C,L>::push(e);
   if (!tail) tail = head;
 }
 
-template <class C, int o> inline C *
-Queue<C, o>::pop(C *c, Link<C> &l) {
-  C *ret = DLL<C,o>::pop(c, l);
-  if (!head)
-    tail = NULL;
-  return ret;
-}
-
-template <class C, int o> inline C *
-Queue<C, o>::pop() {
-  if (o == -1) {
-    if (head)
-      return pop(head, *(Link<C>*)&head->link);
-    else
-      return NULL;
-  }
-  C *ret = DLL<C, o>::pop();
+template <class C, class L> inline C *
+Queue<C,L>::pop() {
+  C *ret = DLL<C,L>::pop();
   if (!head) tail = NULL;
   return ret;
 }
 
-template <class C, int o> inline void
-Queue<C, o>::insert(C *c, Link<C> &l, C *after) {
-  DLL<C, o>::insert(c, l, after);
-  if (!tail)
-    tail = head;
-  else if (tail == after)
-    tail = c;
-}
-
-template <class C, int o> inline void
-Queue<C, o>::insert(C *e, C *after) {
-  if (o == -1) {
-    insert(e, *(Link<C>*)&e->link, after);
-    return;
-  }
-  DLL<C, o>::insert(e, after);
+template <class C, class L> inline void
+Queue<C,L>::insert(C *e, C *after) {
+  DLL<C,L>::insert(e, after);
   if (!tail)
     tail = head;
   else if (tail == after)
     tail = e;
 }
 
-template<class C, int o> inline void 
-Queue<C, o>::remove(C * c, Link<C> &l) {
-  if (c == tail)
-    tail = l.prev;
-  DLL<C, o>::remove(c, l);
-}
-
-template <class C, int o> inline void
-Queue<C, o>::remove(C *e) {
-  if (o == -1) {
-    remove(e, *(Link<C>*)&e->link);
-    return;
-  }
+template <class C, class L> inline void
+Queue<C,L>::remove(C *e) {
   if (tail == e)
-    tail = GetLinkPrev(C, e, o);
-  DLL<C, o>::remove(e);
-}
-
-template <class C, int o> inline void
-Queue<C, o>::append(DLL<C, o> q, Link<C> &l) {
-  C *qtail = q.head;
-  if (qtail)
-    while (link(qtail, q.head, l).next)
-      qtail = link(qtail, q.head, l).next;
-  if (!head) {
-    head = q.head;
-    tail = qtail;
-  } else {
-    if (q.head) {
-      link(tail, q.head, l).next = q.head;
-      link(q.head, q.head, l).prev = tail;
-      tail = qtail;
-    }
-  }
+    tail = (C*)prev(e);
+  DLL<C,L>::remove(e);
 }
 
-template <class C, int o> inline void
-Queue<C, o>::append(DLL<C, o> q) {
-  if (o == -1) {
-    if (q.head)
-      append(q, *(Link<C>*)&q.head->link);
-    return;
-  }
+template <class C, class L> inline void
+Queue<C,L>::append(DLL<C,L> q) {
   C *qtail = q.head;
   if (qtail)
-    while (GetLinkNext(C, qtail, o))
-      qtail = GetLinkNext(C, qtail, o);
+    while (next(qtail))
+      qtail = next(qtail);
   if (!head) {
     head = q.head;
     tail = qtail;
   } else {
     if (q.head) {
-      GetLinkNext(C, tail, o) = q.head;
-      GetLinkPrev(C, q.head, o) = tail;
+      next(tail) = q.head;
+      prev(q.head) = tail;
       tail = qtail;
     }
   }
 }
 
-template <class C, int o> inline void
-Queue<C, o>::append(Queue<C, o> q, Link<C> &l) {
+template <class C, class L> inline void
+Queue<C,L>::append(Queue<C,L> q) {
   if (!head) {
     head = q.head;
     tail = q.tail;
   } else {
     if (q.head) {
-      link(tail, q.head, l).next = q.head;
-      link(q.head, q.head, l).prev = tail;
+      next(tail) = q.head;
+      prev(q.head) = tail;
       tail = q.tail;
     }
   }
 }
 
-template <class C, int o> inline void
-Queue<C, o>::append(Queue<C, o> q) {
-  if (o == -1) {
-    append(q, *(Link<C>*)&q.head->link);
-    return;
-  }
-  if (!head) {
-    head = q.head;
-    tail = q.tail;
-  } else {
-    if (q.head) {
-      GetLinkNext(C, tail, o) = q.head;
-      GetLinkPrev(C, q.head, o) = tail;
-      tail = q.tail;
-    }
-  }
-}
-
-template<class C, int o> inline void 
-Queue<C,o>::enqueue(C *c, Link<C> &l) {
-  C *ctail = (C*)tail;
-  if (ctail)
-    insert(c, l, ctail);
-  else {
-    ink_assert(!head);
-    DLL<C,o>::push(c, l);
-  }
-  tail = c;
-}
-
-template <class C, int o> inline void 
-Queue<C, o>::enqueue(C *e) {
-  if (o == -1) {
-    enqueue(e, *(Link<C>*)&e->link);
-    return;
-  }
+template <class C, class L> inline void 
+Queue<C,L>::enqueue(C *e) {
   if (tail)
     insert(e, tail);
   else
     push(e);
 }
 
-template <class C, int o> inline void 
-Queue<C, o>::in_or_enqueue(C *e) {
+template <class C, class L> inline void 
+Queue<C,L>::in_or_enqueue(C *e) {
   if (!in(e)) enqueue(e);
 }
 
-template<class C, int o> inline C * 
-Queue<C, o>::dequeue(C * c, Link<C> &l) {
-  C *chead = (C*)head;
-  if (!chead)
-    return NULL;
-  remove(chead, link(chead, c, l));
-  return (C*)chead;
-}
-
-template <class C, int o> inline C *
-Queue<C, o>::dequeue() {
-  if (o == -1) {
-    if (head)
-      return dequeue(head, *(Link<C>*)&head->link);
-    else
-      return NULL;
-  }
+template <class C, class L> inline C *
+Queue<C,L>::dequeue() {
   return pop();
 }
 
@@ -539,28 +300,19 @@
 // Adds sorting, but requires that elements implement <
 //
 
-template<class C, int o = -1> struct SortableQueue: public Queue<C, o>
+template<class C, class L = typename C::Link_link> struct SortableQueue: public Queue<C,L>
 {
-  using DLL<C, o>::head;
-  using DLL<C, o>::link;
-  using Queue<C, o>::tail;
+  using DLL<C,L>::head;
+  using Queue<C,L>::tail;
   void sort() {
     if (!head) return;
-    if (o == -1) {
-      sort(head, *(Link<C>*)&head->link);
-      return;
-    }
-    sort(head, *GetLink(C, head, o));
-  }
-  void sort(C * c, Link<C> &l)
-  {
     bool clean = false;
     while (!clean) {
       clean = true;
       C *v = head;
-      C *n = head_link(c, l).next;
+      C *n = next(head);
       while (n) {
-        C *f = link(n, c, l).next;
+        C *f = next(n);
         if (*n < *v) {
           clean = false;
           // swap 'em
@@ -569,179 +321,35 @@
           if (tail == n)
             tail = v;
           // fix prev (p)
-          C *p = link(v, c, l).prev;
+          C *p = prev(v);
           if (p) {
-            link(p, c, l).next = n;
-            link(n, c, l).prev = p;
-          } else {
-            link(n, c, l).prev = NULL;
-          }
+            next(p) = n;
+            prev(n) = p;
+          } else
+            prev(n) = NULL;
           // fix follow (f)
           if (f) {
-            link(f, c, l).prev = v;
-            link(v, c, l).next = f;
-          } else {
-            link(v, c, l).next = NULL;
-          }
+            prev(f) = v;
+            next(v) = f;
+          } else
+            next(v) = NULL;
           // fix interior
-          link(v, c, l).prev = n;
-          link(n, c, l).next = v;
-        } else {
+          prev(v) = n;
+          next(n) = v;
+        } else
           v = n;
-        }
         n = f;
       }
     }
   }
 };
-#define SortableQue(_c, _l) SortableQueue<_c, ink_offsetof(_c, _l)>
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// perl-like interface to queues.
-//      push() adds to the end                  - NOT LIKE DLL!
-//      pop() removes from the end              - NOT LIKE DLL!
-//      shift() removes from the beginning
-//      unshift() adds to the beginning
-//
-//////////////////////////////////////////////////////////////////////////////
-
-template<class C, int o> struct Plist:public Queue<C, o>
-{
-  using DLL<C,o>::head;
-  using Queue<C,o>::tail;
-  void push(C * c) {
-    Queue<C, o>::enqueue(c, *GetLink(C, c, o));
-  }
-  void push(C * c, Link<C> &l) {
-    Queue<C, o>::enqueue(c, l);
-  }
-  C *pop() {
-    return pop(tail, *GetLink(C, tail, o));
-  }
-  C *pop(C * c, Link<C> &l) {
-    C *v = tail;
-    this->remove(v, tail_link(c, l));
-    return v;
-  }
-  C *shift() {
-    return Queue<C, o>::dequeue();
-  }
-  C *shift(C * c, Link<C> &l) {
-    return Queue<C, o>::dequeue(c, l);
-  }
-  void unshift(C * c) {
-    unshift(c, *GetLink(C, c, o));
-  }
-  void unshift(C * c, Link<C> &l) {
-    Queue<C, o>::push(c, l);
-    if (!tail)
-      tail = c;
-  }
-private:
-  void enqueue(C *) {
-    ink_assert(!"no Plist::enqueue");
-  }
-  void enqueue(C *, Link<C> &) {
-    ink_assert(!"no Plist::enqueue");
-  }
-  C *dequeue() {
-    ink_assert(!"no Plist::dequeue");
-    return 0;
-  }
-  C *dequeue(C *, Link<C> &) {
-    ink_assert(!"no Plist::dequeue");
-    return 0;
-  }
-};
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// counted perl-like interface to queue
-//      push() adds to the end                  - NOT LIKE DLL!
-//      pop() removes from the end              - NOT LIKE DLL!
-//      shift() removes from the beginning
-//      unshift() adds to the beginning
-//
-//      count - count of items in list
-//
-//  XXX - bug: count doesn't work if insert() and remove() are called
-//        directly.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-template<class C, int o> struct CPlist:Plist<C, o>
-{
-  using DLL<C,o>::head;
-  using Queue<C,o>::tail;
-
-  int count;
-
-  void push(C * c) {
-    push(c, *GetLink(C, c, o));
-  }
-  void push(C * c, Link<C> &l) {
-    Plist<C, o>::push(c, l);
-    count++;
-  }
-  C *pop() {
-    return pop(tail, *GetLink(C, tail, o));
-  }
-  C *pop(C * c, Link<C> &l) {
-    C *t = Plist<C, o>::pop(c, l);
-    if (t)
-      count--;
-    return t;
-  }
-  C *shift() {
-    return shift(head, *GetLink(C, head, o));
-  }
-  C *shift(C * c, Link<C> &l) {
-    C *t = Plist<C, o>::shift(c, l);
-    if (t)
-      count--;
-    return t;
-  }
-  void unshift(C * c) {
-    unshift(c, *GetLink(C, c, o));
-  }
-  void unshift(C * c, Link<C> &l) {
-    Plist<C, o>::unshift(c, l);
-    count++;
-  }
-  void clear() {
-    Plist<C, o>::clear();
-    count = 0;
-  }
-
-  CPlist():count(0) { }
-};
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//      FOR_EACH(instance_name, list_descriptor, link_field_name)
-//
-//      This is a macro to simplify iteration along lists of various types.
-//      It takes a list <list_descriptor>, the name of the link field inside
-//      the constituent objects <link_field_name>, and loops in forward
-//      order across the constituent objects, assigning each one to the
-//      variable with name <instance_name>.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#define FOR_EACH(_x,_q,_l) \
-for(_x = _q.head; _x != NULL; _x = LINK(_x,_x,_x->_l).next)
-
-#undef LINK
+#define SortableQue(_c, _l) SortableQueue<_c, _c::Link##_##_f>
 
 
 // atomic lists
 
-template<class C, int o = -1> struct AtomicSLL
+template<class C, class L = typename C::Link_link> struct AtomicSLL
 {
-  SLink<C> &link(C * x, C * c, SLink<C> &cl);
-
   void push(C * c) { ink_atomiclist_push(&al, c); }
   C *pop() { return (C *) ink_atomiclist_pop(&al); }
   C *popall() { return (C *) ink_atomiclist_popall(&al); }
@@ -760,24 +368,13 @@
   InkAtomicList al;
 
   AtomicSLL();
-  AtomicSLL(C * c, SLink<C> *l);
 };
 
-#define ASLL(_c, _l) AtomicSLL<_c, ink_offsetof(_c, _l)>
-
-template<class C, int o> inline SLink<C> &AtomicSLL<C,o>::link(C * x, C * c, SLink<C> &cl) {
-  return *(SLink<C> *)(((char *) x) + (((char *) &cl) - ((char *) c)));
-}
-
-template<class C, int o> inline AtomicSLL<C,o>::AtomicSLL(C * c, SLink<C> *l) {
-  ink_atomiclist_init(&al, "AtomicSLL", (char *) l - (char *) c);
-}
+#define ASLL(_c, _l) AtomicSLL<_c, _c::Link##_##_l>
+#define ASLLM(_c, _m, _ml, _l) AtomicSLL<_c, _c::Link##_##_ml##_##_l>
 
-template<class C, int o> inline AtomicSLL<C,o>::AtomicSLL() {
-  if (o < 0)
-    ink_atomiclist_init(&al, "AtomicSLL", (inku32)(uintptr_t)&((C*)0)->link);
-  else
-    ink_atomiclist_init(&al, "AtomicSLL", (inku32)o);
+template<class C, class L> inline AtomicSLL<C,L>::AtomicSLL() {
+  ink_atomiclist_init(&al, "AtomicSLL", (inku32)(uintptr_t)&L::next_link((C*)0));
 }
 
 #endif  /*_List_h_*/

Modified: incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/Makefile.am?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am Wed Mar  3 00:11:08 2010
@@ -17,12 +17,11 @@
 #  limitations under the License.
 
 noinst_PROGRAMS = mkdfa CompileParseRules
-check_PROGRAMS = test_atomic test_freelist test_arena
+check_PROGRAMS = test_atomic test_freelist test_arena test_List
 TESTS = $(check_PROGRAMS)
 noinst_LIBRARIES = libinktomi++.a
 
-#libinktomi___a_CCASFLAGS = -Wa,--32
-libinktomi___a_CCASFLAGS = -Wa,-32
+#libinktomi___a_CCASFLAGS = -Wa,-32
 libinktomi___a_SOURCES = \
   Allocator.cc \
   Allocator.h \
@@ -172,11 +171,18 @@
 test_arena_LDADD = libinktomi++.a @LIBTHREAD@ @LIBTCL@ @LIBICONV@
 test_arena_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 
+test_List_SOURCES = test_List.cc
+
 CompileParseRules_SOURCES = CompileParseRules.cc
 
 ParseRules.o: ParseRules.cc CompileParseRules
 	./CompileParseRules
 	$(CXXCOMPILE) -c $<
 
+test:: $(TESTS)
+	for f in $(TESTS) ; do $$f ; done
+
+#$(foreach F, $(TESTS), $(shell $F)) 
+
 clean-local:
 	rm -f ParseRulesCType ParseRulesCTypeToLower ParseRulesCTypeToUpper

Added: incubator/trafficserver/traffic/trunk/libinktomi++/test_List.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/test_List.cc?rev=918279&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/test_List.cc (added)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/test_List.cc Wed Mar  3 00:11:08 2010
@@ -0,0 +1,59 @@
+/** @file
+
+  A brief file description
+
+  @section license License
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+
+
+#include "List.h"
+
+class Foo { public:
+  int x;
+
+  virtual void foo() {}
+  
+  SLINK(Foo, slink);
+  LINK(Foo, dlink);
+  
+  Foo(int i = 0): x(i) {}
+};
+
+int main() {
+   SList(Foo,slink) s; 
+   DList(Foo,dlink) d; 
+   Que(Foo,dlink) q; 
+   Foo *f = new Foo;
+   f->x = 7;
+   s.push(f);
+   d.push(s.pop());
+   q.enqueue(d.pop()); 
+   for (int i = 0; i < 100; i++)
+     q.enqueue(new Foo(i));
+   int tot = 0;
+   for (int i = 0; i < 101; i++)
+     tot += q.dequeue()->x;
+   if (tot != 4957) {
+     printf("test_List FAILED\n");
+     exit(1);
+   } else {
+     printf("test_List PASSED\n");
+     exit(0);
+   }
+}

Modified: incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h Wed Mar  3 00:11:08 2010
@@ -46,7 +46,7 @@
   char *node_name;
   char *var_name_ptr;
   int num_leaf;
-    Link<RecTreeNode> link;
+  LINK(RecTreeNode, link);
 
   void print();
 };

Modified: incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/CoreUtils.cc Wed Mar  3 00:11:08 2010
@@ -184,7 +184,7 @@
 intptr_t
 CoreUtils::find_vaddr(intptr_t vaddr, intptr_t upper, intptr_t lower)
 {
-  intptr_t index = (intptr_t) floor((upper + lower) / 2);
+  intptr_t index = (intptr_t) floor((double)((upper + lower) / 2));
 
   // match in table, returns index to be inserted into
   if (arrayMem[index].vaddr == vaddr) {
@@ -926,7 +926,11 @@
     char *free_start = (char *) (((HdrStrHeap *) str_hdr)->m_free_start);
     int nto_copy = abs((char *) copy_start - free_start);
     free(str_hdr);
+#if defined(__GNUC__)
     char rw_heap[sizeof(char) * nto_copy];
+#else
+    char *rw_heap = (char *)xmalloc(sizeof(char) * nto_copy);
+#endif
     if (read_from_core((intptr_t) copy_start, nto_copy, rw_heap) == -1) {
       printf("Cannot read from core\n");
       _exit(0);
@@ -938,12 +942,18 @@
 
     str_size += nto_copy;
     str_heaps++;
+#if !defined(__GNUC__)
+    xfree(rw_heap);
+#endif
   }
 
   for (i = 0; i < HDR_BUF_RONLY_HEAPS; i++) {
     if (heap->m_ronly_heap[i].m_heap_start != NULL) {
-
+#if defined(__GNUC__)
       char ro_heap[sizeof(char) * heap->m_ronly_heap[i].m_heap_len];
+#else
+      char * ro_heap = (char *) xmalloc(sizeof(char) * heap->m_ronly_heap[i].m_heap_len);
+#endif
       if (read_from_core((intptr_t) heap->m_ronly_heap[i].m_heap_start, heap->m_ronly_heap[i].m_heap_len, ro_heap) == -1) {
         printf("Cannot read from core\n");
         _exit(0);
@@ -957,6 +967,9 @@
 
       str_heaps++;
       str_size += heap->m_ronly_heap[i].m_heap_len;
+#if !defined(__GNUC__)
+      xfree(ro_heap);
+#endif
     }
   }
 

Modified: incubator/trafficserver/traffic/trunk/proxy/ICP.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ICP.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ICP.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ICP.cc Wed Mar  3 00:11:08 2010
@@ -1755,7 +1755,7 @@
 #if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
   mhdr->msg_accrights = (caddr_t) 0;
   mhdr->msg_accrightslen = 0;
-#else
+#elif (HOST_OS != solaris)
   mhdr->msg_control = 0;
   mhdr->msg_controllen = 0;
   mhdr->msg_flags = 0;

Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=918279&r1=918278&r2=918279&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc Wed Mar  3 00:11:08 2010
@@ -1289,7 +1289,7 @@
   api_hook = apiHookAllocator.alloc();
   api_hook->m_cont = cont;
 
-  m_hooks.push(api_hook, api_hook->m_link);
+  m_hooks.push(api_hook);
 }
 
 void
@@ -1300,7 +1300,7 @@
   api_hook = apiHookAllocator.alloc();
   api_hook->m_cont = cont;
 
-  m_hooks.enqueue(api_hook, api_hook->m_link);
+  m_hooks.enqueue(api_hook);
 }
 
 APIHook *