Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
api: API cleanup
[vpp.git]
/
src
/
plugins
/
memif
/
memif.h
diff --git
a/src/plugins/memif/memif.h
b/src/plugins/memif/memif.h
index
11918ea
..
8539c98
100644
(file)
--- a/
src/plugins/memif/memif.h
+++ b/
src/plugins/memif/memif.h
@@
-22,11
+22,13
@@
#define MEMIF_CACHELINE_SIZE 64
#endif
#define MEMIF_CACHELINE_SIZE 64
#endif
-#define MEMIF_COOKIE 0x3E31F
1
0
-#define MEMIF_VERSION_MAJOR
1
+#define MEMIF_COOKIE 0x3E31F
2
0
+#define MEMIF_VERSION_MAJOR
2
#define MEMIF_VERSION_MINOR 0
#define MEMIF_VERSION ((MEMIF_VERSION_MAJOR << 8) | MEMIF_VERSION_MINOR)
#define MEMIF_VERSION_MINOR 0
#define MEMIF_VERSION ((MEMIF_VERSION_MAJOR << 8) | MEMIF_VERSION_MINOR)
+#define MEMIF_SECRET_SIZE 24
+
/*
* Type definitions
*/
/*
* Type definitions
*/
@@
-58,7
+60,7
@@
typedef enum
} memif_interface_mode_t;
typedef uint16_t memif_region_index_t;
} memif_interface_mode_t;
typedef uint16_t memif_region_index_t;
-typedef uint
64
_t memif_region_offset_t;
+typedef uint
32
_t memif_region_offset_t;
typedef uint64_t memif_region_size_t;
typedef uint16_t memif_ring_index_t;
typedef uint32_t memif_interface_id_t;
typedef uint64_t memif_region_size_t;
typedef uint16_t memif_ring_index_t;
typedef uint32_t memif_interface_id_t;
@@
-85,7
+87,7
@@
typedef struct __attribute__ ((packed))
memif_version_t version;
memif_interface_id_t id;
memif_interface_mode_t mode:8;
memif_version_t version;
memif_interface_id_t id;
memif_interface_mode_t mode:8;
- uint8_t secret[
24
];
+ uint8_t secret[
MEMIF_SECRET_SIZE
];
uint8_t name[32];
} memif_msg_init_t;
uint8_t name[32];
} memif_msg_init_t;
@@
-103,6
+105,7
@@
typedef struct __attribute__ ((packed))
memif_region_index_t region;
memif_region_offset_t offset;
memif_log2_ring_size_t log2_ring_size;
memif_region_index_t region;
memif_region_offset_t offset;
memif_log2_ring_size_t log2_ring_size;
+ uint16_t private_hdr_size; /* used for private metadata */
} memif_msg_add_ring_t;
typedef struct __attribute__ ((packed))
} memif_msg_add_ring_t;
typedef struct __attribute__ ((packed))
@@
-148,15
+151,13
@@
typedef struct __attribute__ ((packed))
uint16_t flags;
#define MEMIF_DESC_FLAG_NEXT (1 << 0)
memif_region_index_t region;
uint16_t flags;
#define MEMIF_DESC_FLAG_NEXT (1 << 0)
memif_region_index_t region;
- uint32_t buffer_length;
uint32_t length;
uint32_t length;
- uint8_t reserved[4];
memif_region_offset_t offset;
memif_region_offset_t offset;
- uint
64
_t metadata;
+ uint
32
_t metadata;
} memif_desc_t;
} memif_desc_t;
-_Static_assert (sizeof (memif_desc_t) ==
32
,
- "Size of memif_dsct_t must be
32
");
+_Static_assert (sizeof (memif_desc_t) ==
16
,
+ "Size of memif_dsct_t must be
16 bytes
");
#define MEMIF_CACHELINE_ALIGN_MARK(mark) \
uint8_t mark[0] __attribute__((aligned(MEMIF_CACHELINE_SIZE)))
#define MEMIF_CACHELINE_ALIGN_MARK(mark) \
uint8_t mark[0] __attribute__((aligned(MEMIF_CACHELINE_SIZE)))