diff options
Diffstat (limited to 'src/framework/ipc/ps')
| -rw-r--r-- | src/framework/ipc/ps/nsfw_fd_timer.c | 1 | ||||
| -rw-r--r-- | src/framework/ipc/ps/nsfw_ps_module.c | 40 | ||||
| -rw-r--r-- | src/framework/ipc/ps/nsfw_recycle_module.c | 3 | ||||
| -rw-r--r-- | src/framework/ipc/ps/nsfw_soft_param.c | 1 |
4 files changed, 2 insertions, 43 deletions
diff --git a/src/framework/ipc/ps/nsfw_fd_timer.c b/src/framework/ipc/ps/nsfw_fd_timer.c index 55d35cb..cea2486 100644 --- a/src/framework/ipc/ps/nsfw_fd_timer.c +++ b/src/framework/ipc/ps/nsfw_fd_timer.c @@ -322,7 +322,6 @@ nsfw_timer_module_init (void *param) NSFW_LOGINF ("ps module init]type=%u", proc_type); switch (proc_type) { - case NSFW_PROC_MASTER: case NSFW_PROC_MAIN: (void) NSFW_REG_SOFT_INT (NSFW_DBG_MODE_PARAM, g_hbt_switch, 0, 1); break; diff --git a/src/framework/ipc/ps/nsfw_ps_module.c b/src/framework/ipc/ps/nsfw_ps_module.c index e600bf7..6e03e11 100644 --- a/src/framework/ipc/ps/nsfw_ps_module.c +++ b/src/framework/ipc/ps/nsfw_ps_module.c @@ -468,7 +468,7 @@ u8 nsfw_ps_exit_end_notify (u32 pid) { nsfw_mgr_msg *rsp_msg = - nsfw_mgr_msg_alloc (MGR_MSG_APP_EXIT_RSP, NSFW_PROC_MASTER); + nsfw_mgr_msg_alloc (MGR_MSG_APP_EXIT_RSP, NSFW_PROC_MAIN); if (NULL == rsp_msg) { NSFW_LOGERR ("alloc rsp msg failed]pid=%u", pid); @@ -1590,42 +1590,6 @@ nsfw_ps_module_init (void *param) switch (proc_type) { - case NSFW_PROC_MASTER: - { - (void) nsfw_mgr_reg_msg_fun (MGR_MSG_CHK_HBT_RSP, - nsfw_ps_recv_hbt_rsp); - (void) NSFW_REG_SOFT_INT (NSFW_HBT_TIMER, NSFW_CHK_HBT_TVLAUE, 1, - 0xFFFF); - (void) NSFW_REG_SOFT_INT (NSFW_HBT_COUNT_PARAM, - NSFW_SOFT_HBT_CHK_COUNT, 1, 0xFFFF); - (void) NSFW_REG_SOFT_INT (NSFW_APP_EXIT_TIMER, NSFW_PS_WEXIT_TVLAUE, - 1, 0xFFFF); - - pid_info = nsfw_mem_zone_lookup (&pzoneinfo.stname); - if (NULL == pid_info) - { - pid_info = nsfw_mem_zone_create (&pzoneinfo); - if (NULL == pid_info) - { - NSFW_LOGERR ("alloc rec nul!"); - return -1; - } - - retval = - MEMSET_S (pid_info, (sizeof (nsfw_pid_item) * NSFW_MAX_PID), - 0, (sizeof (nsfw_pid_item) * NSFW_MAX_PID)); - if (EOK != retval) - { - NSFW_LOGERR ("MEMSET_S failed]retval=%d.\n", retval); - return -1; - } - } - - MEM_STAT (NSFW_PS_MODULE, pzoneinfo.stname.aname, NSFW_SHMEM, - pzoneinfo.length); - g_ps_info = pid_info; - break; - } case NSFW_PROC_MAIN: { pid_info = malloc (sizeof (nsfw_pid_item) * NSFW_MAX_PID); @@ -1693,7 +1657,7 @@ nsfw_ps_module_init (void *param) MEM_STAT (NSFW_PS_MODULE, pmpinfo.stname.aname, NSFW_NSHMEM, nsfw_mem_get_len (ps_cfg->ps_info_pool, NSFW_MEM_SPOOL)); - if (NSFW_PROC_MASTER != proc_type) + if (NSFW_PROC_MAIN != proc_type) { return 0; } diff --git a/src/framework/ipc/ps/nsfw_recycle_module.c b/src/framework/ipc/ps/nsfw_recycle_module.c index 541581f..01e16fb 100644 --- a/src/framework/ipc/ps/nsfw_recycle_module.c +++ b/src/framework/ipc/ps/nsfw_recycle_module.c @@ -607,8 +607,6 @@ nsfw_recycle_module_init (void *param) g_rec_cfg.rec_waite_end_tvalue = NSFW_REC_WEND_TVLAUE_DEF; switch (proc_type) { - case NSFW_PROC_MASTER: - return 0; case NSFW_PROC_MAIN: (void) nsfw_mgr_reg_msg_fun (MGR_MSG_APP_EXIT_REQ, mem_app_exit_proc); (void) nsfw_mgr_reg_msg_fun (MGR_MSG_RCC_END_REQ, @@ -644,7 +642,6 @@ nsfw_recycle_fork_init () { /* reconnect to master after fork in child proc */ nsfw_mgr_close_dst_proc (NSFW_PROC_MAIN, 0); - nsfw_mgr_close_dst_proc (NSFW_PROC_MASTER, 0); if (0 == nsfw_recycle_module_init ((void *) ((long long) NSFW_PROC_APP))) { return TRUE; diff --git a/src/framework/ipc/ps/nsfw_soft_param.c b/src/framework/ipc/ps/nsfw_soft_param.c index 91d7598..743276f 100644 --- a/src/framework/ipc/ps/nsfw_soft_param.c +++ b/src/framework/ipc/ps/nsfw_soft_param.c @@ -270,7 +270,6 @@ nsfw_softparam_module_init (void *param) switch (proc_type) { case NSFW_PROC_MAIN: - case NSFW_PROC_MASTER: (void) nsfw_mgr_reg_msg_fun (MGR_MSG_SOF_PAR_REQ, nsfw_softparam_msg_proc); return 0; |