Revised thread/timer handling, work queue and scheduling.

Updated quagga thread handling to use qtimers when using the new
qpnexus -- so all timers are qtimers in the new scheme.

Updated work queue handling so that each work queue item is a single
malloced structure, not three.  (Only bgpd and zebra use the work
queue system.)

When using qpnexus the background thread queue is no longer a timer
queue, but simply a list of pending background threads.  When a
background thread is waiting on a timer, it is in the qtimer pile,
same like any other thread.

When using qpnexus, the only remaining quagga thread queues are the
event and ready queues.

Revised the qpnexus loop so that only when there is nothing else to
do will it consider the background threads.

Revised write I/O in the BGP Engine so that all writing is via the
connection's write buffer.  Revised the write I/O in the Routeing
Engine, so that it passes groups of updates in a single mqueue
message.  This all reduces the number of TCP packets sent (because
BGP messages are collected together in the connection's write buffer)
and reduces the number of mqueue messages involved.
(No need for TCP_CORK.)

Code and comments review for the new code.

  modified:   bgpd/bgp_advertise.c
  modified:   bgpd/bgp_common.h
  modified:   bgpd/bgp_connection.c
  modified:   bgpd/bgp_connection.h
  modified:   bgpd/bgp_engine.h
  modified:   bgpd/bgp_fsm.c
  modified:   bgpd/bgp_main.c
  modified:   bgpd/bgp_msg_read.c
  modified:   bgpd/bgp_msg_write.c
  modified:   bgpd/bgp_network.c
  modified:   bgpd/bgp_packet.c
  modified:   bgpd/bgp_packet.h
  modified:   bgpd/bgp_peer.c
  modified:   bgpd/bgp_peer_index.h
  modified:   bgpd/bgp_route.c
  modified:   bgpd/bgp_route_refresh.h
  modified:   bgpd/bgp_session.c
  modified:   bgpd/bgp_session.h
  modified:   bgpd/bgpd.c
  new file:   bgpd/bgpd.cx
  modified:   lib/mqueue.h
  modified:   lib/qpnexus.c
  modified:   lib/qpnexus.h
  modified:   lib/qpselect.c
  modified:   lib/qtimers.c
  modified:   lib/qtimers.h
  modified:   lib/sigevent.c
  modified:   lib/stream.c
  modified:   lib/stream.h
  modified:   lib/thread.c
  modified:   lib/thread.h
  modified:   lib/workqueue.c
  modified:   lib/workqueue.h
  modified:   tests/heavy-wq.c
  modified:   zebra/zebra_rib.c

1 files changed, 17 insertions, 10 deletions

diff --git a/bgpd/bgp_engine.h b/bgpd/bgp_engine.h
index fdbcef70..3a751885 100644
--- a/bgpd/bgp_engine.h
+++ b/bgpd/bgp_engine.h
@@ -51,7 +51,7 @@ struct queue_stats
 } ;
 
 static struct queue_stats bgp_engine_queue_stats ;
-static struct queue_stats peering_engine_queue_stats ;
+static struct queue_stats routing_engine_queue_stats ;
 
 Inline void
 bgp_queue_logging(const char* name, mqueue_queue mq, struct queue_stats* stats)
@@ -62,6 +62,8 @@ bgp_queue_logging(const char* name, mqueue_queue mq, struct queue_stats* stats)
 
   ++stats->count ;
 
+  qpt_mutex_lock(&mq->mutex) ;
+
   if (mq->count > stats->max)
     stats->max    = mq->count ;
   if (mq->count > stats->recent)
@@ -70,7 +72,10 @@ bgp_queue_logging(const char* name, mqueue_queue mq, struct queue_stats* stats)
   stats->total += mq->count ;
 
   if (stats->count < 1000)
-    return ;
+    {
+      qpt_mutex_unlock(&mq->mutex) ;
+      return ;
+    } ;
 
   my_count = 0 ;
 
@@ -83,6 +88,8 @@ bgp_queue_logging(const char* name, mqueue_queue mq, struct queue_stats* stats)
 
   assert(my_count == mq->count) ;
 
+  qpt_mutex_unlock(&mq->mutex) ;
+
   average = stats->total ;
   average /= stats->count ;
 
@@ -121,24 +128,24 @@ bgp_to_bgp_engine_priority(mqueue_block mqb)
  *
  */
 
-/* Send given message to the Peering Engine -- ordinary
+/* Send given message to the Routing Engine -- ordinary
  */
 Inline void
-bgp_to_peering_engine(mqueue_block mqb)
+bgp_to_routing_engine(mqueue_block mqb)
 {
   mqueue_enqueue(routing_nexus->queue, mqb, 0) ;
-  bgp_queue_logging("Peering Engine", routing_nexus->queue,
-                                                  &peering_engine_queue_stats) ;
+  bgp_queue_logging("Routing Engine", routing_nexus->queue,
+                                                 &routing_engine_queue_stats) ;
 } ;
 
-/* Send given message to the Peering Engine -- priority
+/* Send given message to the Routing Engine -- priority
  */
 Inline void
-bgp_to_peering_engine_priority(mqueue_block mqb)
+bgp_to_routing_engine_priority(mqueue_block mqb)
 {
   mqueue_enqueue(routing_nexus->queue, mqb, 1) ;
-  bgp_queue_logging("Peering Engine", routing_nexus->queue,
-                                                  &peering_engine_queue_stats) ;
+  bgp_queue_logging("Routing Engine", routing_nexus->queue,
+                                                  &routing_engine_queue_stats) ;
 } ;
 
 #endif /* QUAGGA_BGP_ENGINE_H */