diff options
| author | 童宗振 <[email protected]> | 2023-12-19 05:32:07 +0000 |
|---|---|---|
| committer | 陆秋文 <[email protected]> | 2023-12-19 05:32:07 +0000 |
| commit | b3634ff0763a7c33093c9dbd7ce0e2c53b65c2b6 (patch) | |
| tree | 274731c8844b8665863fb9b701557ec64b478281 /app/include | |
| parent | 2c1c5fb4387c47e40d9cd02f2abbbfaf31ee9b38 (diff) | |
refactor-ctrlmsg-2
Diffstat (limited to 'app/include')
| -rw-r--r-- | app/include/mrapp.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/app/include/mrapp.h b/app/include/mrapp.h index 9e1a53a..3e6da2c 100644 --- a/app/include/mrapp.h +++ b/app/include/mrapp.h @@ -1,14 +1,14 @@ #pragma once #include <common.h> -#include <ctrlmsg.h> #include <ldbc.h> #include <marsio.h> +#include <mr_rte_msg.h> #include <neigh.h> #include <pcap/pcap.h> +#include <rte_epoll.h> #include <tap.h> #include <vdev_define.h> -#include <rte_epoll.h> struct mr_instance; @@ -112,18 +112,10 @@ struct mr_instance char g_cfgfile_path[MR_STRING_MAX]; /* 应用配置文件路径 */ char app_cfgfile_path[MR_STRING_MAX]; - /* 消息框架句柄 */ - struct ctrlmsg_handler * ctrlmsg_handler; /* 虚设备实例列表 */ struct mr_vdev vdevs[MR_VDEV_MAX]; /* 虚设备实例数量 */ unsigned int nr_vdevs; - /* 异步转同步，等待控制回复 */ - pthread_cond_t cond_ctrlmsg_wait; - /* 等待控制回复锁 */ - pthread_mutex_t lock_ctrlmsg_wait; - /* 控制回复到达，置1表示有控制回复需要处理 */ - unsigned int ctrlmsg_wait; /* 邻居管理器 */ struct neighbour_manager * neigh; /* 负载均衡器 */ @@ -132,6 +124,8 @@ struct mr_instance struct mr_static_neigh_list static_neigh_list; /* 统计 */ struct mrapp_stat stat[MR_SID_MAX]; + /* 监控marsio是否存活的句柄*/ + int marsio_fd; /* ===== 运行选项 ===== */ |