Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIB: store the node type not the function pointer.
[vpp.git]
/
src
/
vnet
/
fib
/
fib_node.h
diff --git
a/src/vnet/fib/fib_node.h
b/src/vnet/fib/fib_node.h
index
ec517e1
..
532efd5
100644
(file)
--- a/
src/vnet/fib/fib_node.h
+++ b/
src/vnet/fib/fib_node.h
@@
-43,12
+43,16
@@
typedef enum fib_node_type_t_ {
FIB_NODE_TYPE_VXLAN_TUNNEL,
FIB_NODE_TYPE_MAP_E,
FIB_NODE_TYPE_VXLAN_GPE_TUNNEL,
FIB_NODE_TYPE_VXLAN_TUNNEL,
FIB_NODE_TYPE_MAP_E,
FIB_NODE_TYPE_VXLAN_GPE_TUNNEL,
+ FIB_NODE_TYPE_GENEVE_TUNNEL,
+ FIB_NODE_TYPE_UDP_ENCAP,
+ FIB_NODE_TYPE_BIER_FMASK,
+ FIB_NODE_TYPE_BIER_ENTRY,
/**
* Marker. New types before this one. leave the test last.
*/
FIB_NODE_TYPE_TEST,
FIB_NODE_TYPE_LAST = FIB_NODE_TYPE_TEST,
/**
* Marker. New types before this one. leave the test last.
*/
FIB_NODE_TYPE_TEST,
FIB_NODE_TYPE_LAST = FIB_NODE_TYPE_TEST,
-} fib_node_type_t;
+}
__attribute__ ((packed))
fib_node_type_t;
#define FIB_NODE_TYPE_MAX (FIB_NODE_TYPE_LAST + 1)
#define FIB_NODE_TYPE_MAX (FIB_NODE_TYPE_LAST + 1)
@@
-67,6
+71,9
@@
typedef enum fib_node_type_t_ {
[FIB_NODE_TYPE_VXLAN_TUNNEL] = "vxlan-tunnel", \
[FIB_NODE_TYPE_MAP_E] = "map-e", \
[FIB_NODE_TYPE_VXLAN_GPE_TUNNEL] = "vxlan-gpe-tunnel", \
[FIB_NODE_TYPE_VXLAN_TUNNEL] = "vxlan-tunnel", \
[FIB_NODE_TYPE_MAP_E] = "map-e", \
[FIB_NODE_TYPE_VXLAN_GPE_TUNNEL] = "vxlan-gpe-tunnel", \
+ [FIB_NODE_TYPE_UDP_ENCAP] = "udp-encap", \
+ [FIB_NODE_TYPE_BIER_FMASK] = "bier-fmask", \
+ [FIB_NODE_TYPE_BIER_ENTRY] = "bier-entry", \
}
/**
}
/**
@@
-277,18
+284,21
@@
typedef struct fib_node_vft_t_ {
* Objects in the FIB form a graph.
*/
typedef struct fib_node_t_ {
* Objects in the FIB form a graph.
*/
typedef struct fib_node_t_ {
-#if CLIB_DEBUG > 0
/**
* The node's type. make sure we are dynamic/down casting correctly
*/
fib_node_type_t fn_type;
/**
* The node's type. make sure we are dynamic/down casting correctly
*/
fib_node_type_t fn_type;
-#endif
+
+ /**
+ * Some pad space the concrete/derived type is free to use
+ */
+ u16 fn_pad;
/**
* The node's VFT.
* we could store the type here instead, and lookup the VFT using that. But
* I like this better,
*/
/**
* The node's VFT.
* we could store the type here instead, and lookup the VFT using that. But
* I like this better,
*/
- const fib_node_vft_t *fn_vft;
+
//
const fib_node_vft_t *fn_vft;
/**
* Vector of nodes that depend upon/use/share this node
/**
* Vector of nodes that depend upon/use/share this node
@@
-302,6
+312,8
@@
typedef struct fib_node_t_ {
u32 fn_locks;
} fib_node_t;
u32 fn_locks;
} fib_node_t;
+STATIC_ASSERT(sizeof(fib_node_t) == 12, "FIB node type is growing");
+
/**
* @brief
* Register the function table for a given type
/**
* @brief
* Register the function table for a given type