diff options
| author | Qiuwen Lu <[email protected]> | 2017-03-09 14:18:54 +0800 |
|---|---|---|
| committer | Qiuwen Lu <[email protected]> | 2017-03-09 14:18:54 +0800 |
| commit | 2ea79594ebd015fc100da0126a574bbde7e37f05 (patch) | |
| tree | dd17957c1fcb123f21501c5b1c68eb7406ba374a /app/include | |
| parent | 59319e1dbd3e04015cff89c99626960148201024 (diff) | |
增加消息通信框架,修正目前的实现以利用这一消息通信框架。
Diffstat (limited to 'app/include')
| -rw-r--r-- | app/include/mrapp.h | 52 |
1 files changed, 1 insertions, 51 deletions
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 <mr_common.h> -#include <mr_device.h> -#include <unistd.h> - -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 <common.h> 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; }; /* ��־λ���Ƿ��Ѿ������˳�ʼ��*/ |
