From 4d38fdb421ee04430ac2f4d4e8ef4a4e27c1020b Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 28 Apr 2005 17:35:14 +0000 Subject: 2005-04-28 Paul Jakma * rib.h: (struct rib) Add lock field for refcounting. * zserv.h: (struct zebra_t) Add a ribq workqueue to the zebra 'master' struct. * zserv.c: (zread_ipv4_add) XMALLOC then memset should be XCALLOC. * zebra_rib.c: Clean up refcounting of route_node, make struct rib refcounted and convert rib_process to work-queue. In general, rib's should be rib_addnode'd and delnode'd to route_nodes, and these symmetrical functions will manage the locking of referenced route_node and freeing of struct rib - rather than having users manage each seperately - with much scope for bugs.. (newrib_free) removed and replaced with rib_lock (rib_lock) new function, check state of lock and increment. (rib_unlock) new function, check lock state and decrement. Free struct rib if refcount hits 0, freeing struct nexthop's, as newrib_free did. (rib_addnode) Add RIB to route_node, locking both. (rib_delnode) Delete RIB from route_node, unlocking each. (rib_process) Converted to a work-queue work function. Functional changes are minimal, just arguments, comments and whitespace. (rib_queue_add_qnode) Helper function to setup a ribq item. (rib_queue_add) Helper function, same arguments as old rib_process, to replace in callers of rib_process. (rib_queue_qnode_del) ribq deconstructor. (rib_queue_init) Create the ribq. (rib_init) call rib_queue_init. (remainder) Sanitise refcounting of route_node's. Convert to rib_queue_add, rib_addnode and rib_delnode. Change XMALLOC/memset to XCALLOC. Remove calls to nexthop_delete and nexthop_free. --- zebra/zserv.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'zebra/zserv.h') diff --git a/zebra/zserv.h b/zebra/zserv.h index 445dc766..db822a9b 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -23,6 +23,7 @@ #define _ZEBRA_ZSERV_H #include "rib.h" +#include "workqueue.h" /* Default port information. */ #define ZEBRA_PORT 2600 @@ -76,7 +77,9 @@ struct zebra_t /* default table */ int rtm_table_default; - + + /* rib work queue */ + struct work_queue *ribq; }; /* Count prefix size from mask length */ -- cgit v1.2.1