Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / table.h

diff --git a/lib/table.h b/lib/table.h
index 9cd950337607947ede53dac465ec5250a7b6a16a..acfc87615429421b582273e34d721176cab576fb 100644 (file)
--- a/lib/table.h
+++ b/lib/table.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Routing Table
  * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _ZEBRA_TABLE_H
@@ -31,7 +16,7 @@
 extern "C" {
 #endif
 
-DECLARE_MTYPE(ROUTE_NODE)
+DECLARE_MTYPE(ROUTE_NODE);
 
 /*
  * Forward declarations.
@@ -59,7 +44,7 @@ struct route_table_delegate_t_ {
        route_table_destroy_node_func_t destroy_node;
 };
 
-PREDECL_HASH(rn_hash_node)
+PREDECL_HASH(rn_hash_node);
 
 /* Routing table top structure. */
 struct route_table {
@@ -197,29 +182,25 @@ static inline void route_table_set_info(struct route_table *table, void *d)
        table->info = d;
 }
 
-/* ext_pure => extern __attribute__((pure))
- *   does not modify memory (but depends on mem), allows compiler to optimize
- */
-
 extern void route_table_finish(struct route_table *table);
-ext_pure struct route_node *route_top(struct route_table *table);
-ext_pure struct route_node *route_next(struct route_node *node);
-ext_pure struct route_node *route_next_until(struct route_node *node,
-                                            const struct route_node *limit);
+extern struct route_node *route_top(struct route_table *table);
+extern struct route_node *route_next(struct route_node *node);
+extern struct route_node *route_next_until(struct route_node *node,
+                                          const struct route_node *limit);
 extern struct route_node *route_node_get(struct route_table *table,
                                         union prefixconstptr pu);
-ext_pure struct route_node *route_node_lookup(struct route_table *table,
-                                             union prefixconstptr pu);
-ext_pure struct route_node *route_node_lookup_maynull(struct route_table *table,
-                                                     union prefixconstptr pu);
-ext_pure struct route_node *route_node_match(struct route_table *table,
-                                            union prefixconstptr pu);
-ext_pure struct route_node *route_node_match_ipv4(struct route_table *table,
-                                                 const struct in_addr *addr);
-ext_pure struct route_node *route_node_match_ipv6(struct route_table *table,
-                                                 const struct in6_addr *addr);
-
-ext_pure unsigned long route_table_count(struct route_table *table);
+extern struct route_node *route_node_lookup(struct route_table *table,
+                                           union prefixconstptr pu);
+extern struct route_node *route_node_lookup_maynull(struct route_table *table,
+                                                   union prefixconstptr pu);
+extern struct route_node *route_node_match(struct route_table *table,
+                                          union prefixconstptr pu);
+extern struct route_node *route_node_match_ipv4(struct route_table *table,
+                                               const struct in_addr *addr);
+extern struct route_node *route_node_match_ipv6(struct route_table *table,
+                                               const struct in6_addr *addr);
+
+extern unsigned long route_table_count(struct route_table *table);
 
 extern struct route_node *route_node_create(route_table_delegate_t *delegate,
                                            struct route_table *table);
@@ -228,10 +209,10 @@ extern void route_node_destroy(route_table_delegate_t *delegate,
                               struct route_table *table,
                               struct route_node *node);
 
-ext_pure struct route_node *route_table_get_next(struct route_table *table,
-                                                union prefixconstptr pu);
-ext_pure int route_table_prefix_iter_cmp(const struct prefix *p1,
-                                        const struct prefix *p2);
+extern struct route_node *route_table_get_next(struct route_table *table,
+                                              union prefixconstptr pu);
+extern int route_table_prefix_iter_cmp(const struct prefix *p1,
+                                      const struct prefix *p2);
 
 /*
  * Iterator functions.
@@ -262,6 +243,11 @@ static inline void route_unlock_node(struct route_node *node)
                route_node_delete(node);
 }
 
+static inline unsigned int route_node_get_lock_count(struct route_node *node)
+{
+       return node->lock;
+}
+
 /*
  * route_table_iter_next
  *