Adjustments to scheduling of Routing Engine work.

These changes mean that Quagga copes a little better when there are
very large numbers of updates/withrawal messages arriving all at
once...

...it is not possible to cure the problem of overloading Quagga by
throwing too much at it.  However, these changes at least mean that
when BGP sessions drop, the Routing Engine will notice that in a
reasonable time, and can clear up all routes associated with
the session (throwing away any updates/withdraws already received,
but not yet dealt with.)

Amonst these changes are Chris Caputo's patches for bgp_node locking
issues -- see quagga-dev 7960 mailing list message.

1 files changed, 6 insertions, 27 deletions

diff --git a/bgpd/bgp_engine.h b/bgpd/bgp_engine.h
index 2d36b260..ceec1b2f 100644
--- a/bgpd/bgp_engine.h
+++ b/bgpd/bgp_engine.h
@@ -116,22 +116,12 @@ bgp_queue_logging(const char* name, mqueue_queue mq, struct queue_stats* stats)
   stats->xon    = 0 ;
 } ;
 
-/* Send given message to the BGP Engine -- ordinary
+/* Send given message to the BGP Engine -- priority/ordinary
  */
 Inline void
-bgp_to_bgp_engine(mqueue_block mqb)
+bgp_to_bgp_engine(mqueue_block mqb, enum mqb_rank priority)
 {
-  mqueue_enqueue(bgp_nexus->queue, mqb, 0) ;
-  if (qdebug)
-    bgp_queue_logging("BGP Engine", bgp_nexus->queue, &bgp_engine_queue_stats) ;
-} ;
-
-/* Send given message to the BGP Engine -- priority
- */
-Inline void
-bgp_to_bgp_engine_priority(mqueue_block mqb)
-{
-  mqueue_enqueue(bgp_nexus->queue, mqb, 1) ;
+  mqueue_enqueue(bgp_nexus->queue, mqb, priority) ;
   if (qdebug)
     bgp_queue_logging("BGP Engine", bgp_nexus->queue, &bgp_engine_queue_stats) ;
 } ;
@@ -140,26 +130,15 @@ bgp_to_bgp_engine_priority(mqueue_block mqb)
  *
  */
 
-/* Send given message to the Routing Engine -- ordinary
+/* Send given message to the Routing Engine -- priority/ordinary
  */
 Inline void
-bgp_to_routing_engine(mqueue_block mqb)
+bgp_to_routing_engine(mqueue_block mqb, enum mqb_rank priority)
 {
-  mqueue_enqueue(routing_nexus->queue, mqb, 0) ;
+  mqueue_enqueue(routing_nexus->queue, mqb, priority) ;
   if (qdebug)
     bgp_queue_logging("Routing Engine", routing_nexus->queue,
                                                  &routing_engine_queue_stats) ;
 } ;
 
-/* Send given message to the Routing Engine -- priority
- */
-Inline void
-bgp_to_routing_engine_priority(mqueue_block mqb)
-{
-  mqueue_enqueue(routing_nexus->queue, mqb, 1) ;
-  if (qdebug)
-    bgp_queue_logging("Routing Engine", routing_nexus->queue,
-                                                  &routing_engine_queue_stats) ;
-} ;
-
 #endif /* QUAGGA_BGP_ENGINE_H */