summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
author陆秋文 <[email protected]>2023-03-13 10:14:25 +0000
committer陆秋文 <[email protected]>2023-03-13 10:14:25 +0000
commit21b93587d59763643e0d2333bc552927c5b913a9 (patch)
tree091f4bf26141323aff58a3d78ee6cde857da4b55 /include
parent383d745322d6a421e8788e64a15ddae922827973 (diff)
支持多个NF运行在同一组处理器核心
Diffstat (limited to 'include')
-rw-r--r--include/external/marsio.h1
-rw-r--r--include/internal/ctrlmsg_define.h7
-rw-r--r--include/internal/vdev_define.h3
3 files changed, 7 insertions, 4 deletions
diff --git a/include/external/marsio.h b/include/external/marsio.h
index 983b48a..791f73b 100644
--- a/include/external/marsio.h
+++ b/include/external/marsio.h
@@ -152,6 +152,7 @@ int marsio_option_set(struct mr_instance * instance, marsio_opt_type_t opt_type,
int marsio_init(struct mr_instance * instance, const char * appsym);
int marsio_thread_init(struct mr_instance * instance);
int marsio_destory(struct mr_instance * instance);
+int marsio_poll_wait(struct mr_instance * instance, struct mr_vdev * vdevs[], unsigned int nr_vdevs, unsigned int tid, int timeout);
struct mr_vdev * marsio_open_device(struct mr_instance * instance, const char * devsym, unsigned int nr_rxstream,
unsigned int nr_txstream);
diff --git a/include/internal/ctrlmsg_define.h b/include/internal/ctrlmsg_define.h
index 058a853..dc5a4d5 100644
--- a/include/internal/ctrlmsg_define.h
+++ b/include/internal/ctrlmsg_define.h
@@ -44,7 +44,7 @@ struct ctrl_msg_app_reg_response
struct ctrl_msg_vdev_open_request
{
- struct ctrl_msg_header msg_header;
+ uint8_t appsym[MR_SYMBOL_MAX];
uint8_t devsym[MR_SYMBOL_MAX];
uint8_t nr_rxstream;
uint8_t nr_txstream;
@@ -52,13 +52,12 @@ struct ctrl_msg_vdev_open_request
struct ctrl_msg_vdev_open_response
{
- struct ctrl_msg_header msg_header;
- struct ctrl_msg_error msg_err;
+ int errcode;
uint8_t devsym[MR_SYMBOL_MAX];
uint8_t nr_rxstream;
uint8_t nr_txstream;
uintptr_t ptr_vdi;
-} __rte_packed;
+};
#define CTRLMSG_TOPIC_APP_REGISTER "app/register"
#define CTRLMSG_TOPIC_APP_UNREGISTER "app/unregister"
diff --git a/include/internal/vdev_define.h b/include/internal/vdev_define.h
index 6579ef6..9773e75 100644
--- a/include/internal/vdev_define.h
+++ b/include/internal/vdev_define.h
@@ -109,6 +109,9 @@ struct vdev_instance
struct vnode_prod * vnode_ftx_prod;
struct vnode_prod * vnode_ltx_prod;
+ /* CONS NOTIFY DESCS */
+ struct vnode_cons_notify * vnode_rx_cons_notify;
+
/* 内存池:临时使用 */
struct rte_mempool * direct_pool;
struct rte_mempool * indirect_pool;