svn commit: r888976 - in /incubator/trafficserver/traffic/trunk/iocore/eventsystem: I_EThread.h I_PriorityEventQueue.h I_ProtectedQueue.h PQ-List.cc ProtectedQueue.cc UnixEThread.cc

[jp...@apache.org]

Author: jplevyak
Date: Wed Dec  9 21:16:53 2009
New Revision: 888976

URL: http://svn.apache.org/viewvc?rev=888976&view=rev
Log:
TS-54 partial
Add explicit reference to embedded link field for new List.h preferred interface

Modified:
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_EThread.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_ProtectedQueue.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/PQ-List.cc
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_EThread.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_EThread.h?rev=888976&r1=888975&r2=888976&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_EThread.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_EThread.h Wed Dec  9 21:16:53 2009
@@ -310,7 +310,7 @@
   DiskHandler *diskHandler;
 
   /** Private Data for AIO. */
-  Queue<Continuation> aio_ops;
+  Que(Continuation, link) aio_ops;
 
   ProtectedQueue EventQueueExternal;
   PriorityEventQueue EventQueue;

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h?rev=888976&r1=888975&r2=888976&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h Wed Dec  9 21:16:53 2009
@@ -38,7 +38,7 @@
 struct PriorityEventQueue
 {
 
-  Queue<Event> after[N_PQ_LIST];
+  Que(Event, link) after[N_PQ_LIST];
   ink_hrtime last_check_time;
   inku32 last_check_buckets;
 

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_ProtectedQueue.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_ProtectedQueue.h?rev=888976&r1=888975&r2=888976&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_ProtectedQueue.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_ProtectedQueue.h Wed Dec  9 21:16:53 2009
@@ -51,7 +51,7 @@
   InkAtomicList al;
   ink_mutex lock;
   ink_cond might_have_data;
-  Queue<Event> localQueue;
+  Que(Event, link) localQueue;
 
   ProtectedQueue();
 };

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/PQ-List.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/PQ-List.cc?rev=888976&r1=888975&r2=888976&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/PQ-List.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/PQ-List.cc Wed Dec  9 21:16:53 2009
@@ -44,7 +44,7 @@
   }
   for (i = 1; i <= k; i++) {
     Event *e;
-    Queue<Event> q = after[i];
+    Que(Event, link) q = after[i];
     after[i].clear();
     while ((e = q.dequeue()) != NULL) {
       if (e->cancelled) {

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc?rev=888976&r1=888975&r2=888976&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/ProtectedQueue.cc Wed Dec  9 21:16:53 2009
@@ -145,7 +145,7 @@
 
   e = (Event *) ink_atomiclist_popall(&al);
   // invert the list, to preserve order
-  SLL<Event> l, t;
+  SList(Event, link) l, t;
   t.head = e;
   while ((e = t.pop()))
     l.push(e);

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc?rev=888976&r1=888975&r2=888976&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc Wed Dec  9 21:16:53 2009
@@ -152,7 +152,7 @@
 {
   Event *e;
   ink_hrtime next_time = 0, sleep_time;
-  Queue<Event> NegativeQueue;
+  Que(Event, link) NegativeQueue;
   switch (tt) {
 
   case REGULAR:{