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
/
plugins
/
memif
/
private.h
diff --git
a/src/plugins/memif/private.h
b/src/plugins/memif/private.h
index
f4ace4c
..
5c8a919
100644
(file)
--- a/
src/plugins/memif/private.h
+++ b/
src/plugins/memif/private.h
@@
-80,9
+80,12
@@
typedef struct
typedef struct
{
typedef struct
{
+ /* Required for vec_validate_aligned */
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
void *shm;
memif_region_size_t region_size;
int fd;
void *shm;
memif_region_size_t region_size;
int fd;
+ u8 is_external;
} memif_region_t;
typedef struct
} memif_region_t;
typedef struct
@@
-101,6
+104,7
@@
typedef struct
u16 last_head;
u16 last_tail;
u16 last_head;
u16 last_tail;
+ u32 *buffers;
/* interrupts */
int int_fd;
/* interrupts */
int int_fd;
@@
-116,7
+120,9
@@
typedef struct
_(1, IS_SLAVE, "slave") \
_(2, CONNECTING, "connecting") \
_(3, CONNECTED, "connected") \
_(1, IS_SLAVE, "slave") \
_(2, CONNECTING, "connecting") \
_(3, CONNECTED, "connected") \
- _(4, DELETING, "deleting")
+ _(4, DELETING, "deleting") \
+ _(5, ZERO_COPY, "zero-copy") \
+ _(6, ERROR, "error")
typedef enum
{
typedef enum
{
@@
-201,6
+207,7
@@
typedef struct
/* buffer template */
vlib_buffer_t buffer_template;
/* buffer template */
vlib_buffer_t buffer_template;
+ memif_desc_t desc_template;
} memif_per_thread_data_t;
typedef struct
} memif_per_thread_data_t;
typedef struct
@@
-238,6
+245,7
@@
typedef struct
u32 socket_id;
u8 *secret;
u8 is_master;
u32 socket_id;
u8 *secret;
u8 is_master;
+ u8 is_zero_copy;
memif_interface_mode_t mode:8;
memif_log2_ring_size_t log2_ring_size;
u16 buffer_size;
memif_interface_mode_t mode:8;
memif_log2_ring_size_t log2_ring_size;
u16 buffer_size;