From 49c2e62468d47e7b30877f24cf20a3df226687f2 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Mon, 24 Oct 2016 17:58:15 +0900 Subject: Refactor sigchild - Rename the header file and functions - Remove inline definitions - Add fallback code about sending dbus signal Change-Id: Ibdb31370fa1c434b762d010ba690ab5cd81f6981 Signed-off-by: Hwankyu Jhun --- src/launchpad.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/launchpad.c') diff --git a/src/launchpad.c b/src/launchpad.c index 09e0431..55c6288 100755 --- a/src/launchpad.c +++ b/src/launchpad.c @@ -37,7 +37,7 @@ #include "perf.h" #include "launchpad_common.h" -#include "sigchild.h" +#include "launchpad_signal.h" #include "key.h" #include "launchpad.h" #include "loader_info.h" @@ -383,8 +383,8 @@ static int __exec_loader_process(void *arg) { char **argv = arg; - __signal_unblock_sigchld(); - __signal_fini(); + _signal_unblock_sigchld(); + _signal_fini(); _close_all_fds(); @@ -734,8 +734,8 @@ static int __exec_app_process(void *arg) if (bundle_get_type(launch_arg->kb, AUL_K_SDK) != BUNDLE_TYPE_NONE) _debug_prepare_debugger(launch_arg->kb); - __signal_unblock_sigchld(); - __signal_fini(); + _signal_unblock_sigchld(); + _signal_fini(); _delete_sock_path(getpid(), getuid()); @@ -793,7 +793,7 @@ static int __launchpad_pre_init(int argc, char **argv) int fd; /* signal init*/ - __signal_init(); + _signal_init(); /* create launchpad sock */ fd = __create_sock_activation(); @@ -1002,7 +1002,7 @@ static gboolean __handle_sigchild(gpointer data) if (s != sizeof(struct signalfd_siginfo)) break; - __launchpad_process_sigchld(&siginfo); + _signal_process_sigchld(&siginfo); cpc = __find_slot_from_pid(siginfo.ssi_pid); if (cpc != NULL) { cpc->prepared = false; @@ -1376,7 +1376,7 @@ end: close(clifd); if (pid > 0) - __send_app_launch_signal_dbus(pid, menu_info->appid); + _signal_send_app_launch_signal(pid, menu_info->appid); if (menu_info != NULL) _appinfo_free(menu_info); @@ -1507,7 +1507,7 @@ static int __init_sigchild_fd(void) int fd = -1; guint pollfd; - fd = __signal_get_sigchld_fd(); + fd = _signal_get_sigchld_fd(); if (fd < 0) { _E("failed to get sigchld fd"); return -1; -- cgit v1.2.3