From 2ea79594ebd015fc100da0126a574bbde7e37f05 Mon Sep 17 00:00:00 2001 From: Qiuwen Lu Date: Thu, 9 Mar 2017 14:18:54 +0800 Subject: 增加消息通信框架，修正目前的实现以利用这一消息通信框架。 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/include/mrapp.h | 52 +--------------------------------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) (limited to 'app/include') diff --git a/app/include/mrapp.h b/app/include/mrapp.h index a72a87e..cc51e4e 100644 --- a/app/include/mrapp.h +++ b/app/include/mrapp.h @@ -1,36 +1,6 @@ #pragma once -#include -#include -#include - -struct raw_socket; -TAILQ_HEAD(raw_socket_list, __raw_socket); - -struct __devinfo -{ - unsigned int dev_id; - char devsym[MR_SYMBOL_MAX]; -}; - -struct raw_socket; - -struct mrapp_config -{ - FILE * logstream; - cpu_mask_t coremask; - unsigned int nr_thread; - unsigned int autoexit; - unsigned int nr_raw_rxstream; - unsigned int nr_raw_txstream; - unsigned int nr_stack_rxstream; - unsigned int nr_stack_txstream; - unsigned int nr_raw_device; - unsigned int nr_stack_device; - - struct __devinfo raw_open_device[MR_DEVICE_MAX]; - struct __devinfo stack_open_device[MR_DEVICE_MAX]; -}; +#include struct mrapp_instance { @@ -38,26 +8,6 @@ struct mrapp_instance char appsym[MR_SYMBOL_MAX]; /* ״̬· */ char monit_file_path[MR_STRING_MAX]; - /* в */ - struct mrapp_config config; - /* Coreȫ־ */ - struct mr_core_instance * core_instance; - /* StackӦþ */ - struct sk_app_instance * sk_app_instance; - /* Raw豸 */ - struct raw_socket * raw_socket[MR_DEVICE_MAX]; -}; - -struct raw_socket -{ - // 豸 - char devsym[MR_SYMBOL_MAX]; - // Rawӿڶ߳ - unsigned int nr_rxstream; - // Rawӿд߳ - unsigned int nr_txstream; - // Rawӿھ - struct rtdev_app_desc * rtdev_desc; }; /* ־λǷѾ˳ʼ*/ -- cgit v1.2.3