diff options
| author | Chris Hall <GMCH@hestia.halldom.com> | 2010-05-27 21:09:56 +0100 |
|---|---|---|
| committer | Chris Hall <GMCH@hestia.halldom.com> | 2010-05-27 21:09:56 +0100 |
| commit | d0dcbe07baffdbff39521e5ae8eca3f80a8d6f3e (patch) | |
| tree | 399779682d9449b2376364cf9338891e6b674e85 /bgpd/bgp_session.c | |
| parent | 76c460a85aa0aea7dc90948f3b52979d09f94812 (diff) | |
| download | quagga-d0dcbe07baffdbff39521e5ae8eca3f80a8d6f3e.tar.bz2 quagga-d0dcbe07baffdbff39521e5ae8eca3f80a8d6f3e.tar.xz | |
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.
Diffstat (limited to 'bgpd/bgp_session.c')
| -rw-r--r-- | bgpd/bgp_session.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/bgpd/bgp_session.c b/bgpd/bgp_session.c index 1334298e..8d8bfea2 100644 --- a/bgpd/bgp_session.c +++ b/bgpd/bgp_session.c @@ -325,7 +325,7 @@ bgp_session_enable(bgp_peer peer) ++bgp_engine_queue_stats.event ; - bgp_to_bgp_engine(mqb) ; + bgp_to_bgp_engine(mqb, mqb_ordinary) ; } ; /*------------------------------------------------------------------------------ @@ -426,7 +426,7 @@ bgp_session_disable(bgp_peer peer, bgp_notify notification) ++bgp_engine_queue_stats.event ; - bgp_to_bgp_engine_priority(mqb) ; + bgp_to_bgp_engine(mqb, mqb_priority) ; } ; /*------------------------------------------------------------------------------ @@ -464,7 +464,7 @@ bgp_session_event(bgp_session session, bgp_session_event_t event, bgp_notify notification, int err, bgp_connection_ord_t ordinal, - int stopped) + bool stopped) { struct bgp_session_event_args* args ; mqueue_block mqb ; @@ -484,7 +484,7 @@ bgp_session_event(bgp_session session, bgp_session_event_t event, ++routing_engine_queue_stats.event ; - bgp_to_routing_engine(mqb) ; + bgp_to_routing_engine(mqb, stopped ? mqb_priority : mqb_ordinary) ; } ; /*============================================================================== @@ -509,7 +509,7 @@ bgp_session_update_send(bgp_session session, struct stream_fifo* fifo) ++bgp_engine_queue_stats.update ; - bgp_to_bgp_engine(mqb) ; + bgp_to_bgp_engine(mqb, mqb_ordinary) ; stream_fifo_reset(fifo) ; } ; @@ -637,7 +637,7 @@ bgp_session_route_refresh_send(bgp_session session, bgp_route_refresh rr) ++bgp_engine_queue_stats.event ; - bgp_to_bgp_engine(mqb) ; + bgp_to_bgp_engine(mqb, mqb_ordinary) ; } ; /*------------------------------------------------------------------------------ @@ -702,7 +702,7 @@ bgp_session_end_of_rib_send(bgp_session session, qAFI_t afi, qSAFI_t safi) ++bgp_engine_queue_stats.xon ; - bgp_to_bgp_engine(mqb) ; + bgp_to_bgp_engine(mqb, mqb_ordinary) ; } ; /*------------------------------------------------------------------------------ @@ -769,7 +769,7 @@ bgp_session_update_recv(bgp_session session, struct stream* buf, bgp_size_t size ++routing_engine_queue_stats.update ; - bgp_to_routing_engine(mqb) ; + bgp_to_routing_engine(mqb, mqb_ordinary) ; } /*------------------------------------------------------------------------------ @@ -813,7 +813,7 @@ bgp_session_route_refresh_recv(bgp_session session, bgp_route_refresh rr) args->rr = rr ; args->is_pending = NULL ; - bgp_to_routing_engine(mqb) ; + bgp_to_routing_engine(mqb, mqb_ordinary) ; } ; /*------------------------------------------------------------------------------ @@ -849,7 +849,7 @@ bgp_session_XON(bgp_session session) ++routing_engine_queue_stats.xon ; - bgp_to_routing_engine(mqb) ; + bgp_to_routing_engine(mqb, mqb_ordinary) ; } /*------------------------------------------------------------------------------ @@ -888,7 +888,7 @@ bgp_session_set_ttl(bgp_session session, int ttl) ++bgp_engine_queue_stats.event ; - bgp_to_bgp_engine(mqb) ; + bgp_to_bgp_engine(mqb, mqb_ordinary) ; } /*------------------------------------------------------------------------------ |