Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Harmonize vec/pool_get_aligned object sizes and alignment requests
[vpp.git]
/
src
/
vnet
/
dpo
/
replicate_dpo.h
diff --git
a/src/vnet/dpo/replicate_dpo.h
b/src/vnet/dpo/replicate_dpo.h
index
7727301
..
7b07539
100644
(file)
--- a/
src/vnet/dpo/replicate_dpo.h
+++ b/
src/vnet/dpo/replicate_dpo.h
@@
-25,6
+25,7
@@
#include <vnet/dpo/dpo.h>
#include <vnet/dpo/load_balance.h>
#include <vnet/fib/fib_types.h>
#include <vnet/dpo/dpo.h>
#include <vnet/dpo/load_balance.h>
#include <vnet/fib/fib_types.h>
+#include <vnet/mpls/mpls_types.h>
/**
* replicate main
/**
* replicate main
@@
-52,7
+53,13
@@
extern replicate_main_t replicate_main;
*/
typedef struct replicate_t_ {
/**
*/
typedef struct replicate_t_ {
/**
- * number of buckets in the load-balance. always a power of 2.
+ * required for pool_get_aligned.
+ * memebers used in the switch path come first!
+ */
+ CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
+ /**
+ * number of buckets in the replicate.
*/
u16 rep_n_buckets;
*/
u16 rep_n_buckets;
@@
-103,15
+110,17
@@
extern void replicate_multipath_update(
load_balance_path_t *next_hops);
extern void replicate_set_bucket(index_t repi,
load_balance_path_t *next_hops);
extern void replicate_set_bucket(index_t repi,
-
u32 bucket,
-
const dpo_id_t *next);
+ u32 bucket,
+ const dpo_id_t *next);
extern u8* format_replicate(u8 * s, va_list * args);
extern const dpo_id_t *replicate_get_bucket(index_t repi,
extern u8* format_replicate(u8 * s, va_list * args);
extern const dpo_id_t *replicate_get_bucket(index_t repi,
-
u32 bucket);
+ u32 bucket);
extern int replicate_is_drop(const dpo_id_t *dpo);
extern int replicate_is_drop(const dpo_id_t *dpo);
+extern u16 replicate_n_buckets(index_t repi);
+
/**
* The encapsulation breakages are for fast DP access
*/
/**
* The encapsulation breakages are for fast DP access
*/
@@
-119,6
+128,7
@@
extern replicate_t *replicate_pool;
static inline replicate_t*
replicate_get (index_t repi)
{
static inline replicate_t*
replicate_get (index_t repi)
{
+ repi &= ~MPLS_IS_REPLICATE;
return (pool_elt_at_index(replicate_pool, repi));
}
return (pool_elt_at_index(replicate_pool, repi));
}