diff options
author | Hwankyu Jhun <h.jhun@samsung.com> | 2016-10-24 17:58:15 +0900 |
---|---|---|
committer | Hwankyu Jhun <h.jhun@samsung.com> | 2016-10-31 16:37:16 +0900 |
commit | 49c2e62468d47e7b30877f24cf20a3df226687f2 (patch) | |
tree | 249c336b474e0a707945cc38a1f007759f8a4405 /src/launchpad.c | |
parent | d8df094776e77842517c62f3eb2be959061d2151 (diff) | |
download | launchpad-49c2e62468d47e7b30877f24cf20a3df226687f2.tar.gz launchpad-49c2e62468d47e7b30877f24cf20a3df226687f2.tar.bz2 launchpad-49c2e62468d47e7b30877f24cf20a3df226687f2.zip |
Refactor sigchildsubmit/tizen_3.0/20161102.051512submit/tizen/20161101.004208accepted/tizen/wearable/20161101.122959accepted/tizen/tv/20161101.122942accepted/tizen/mobile/20161101.122917accepted/tizen/ivi/20161101.123012accepted/tizen/common/20161102.121433accepted/tizen/3.0/wearable/20161102.075713accepted/tizen/3.0/tv/20161102.075639accepted/tizen/3.0/mobile/20161102.075603accepted/tizen/3.0/ivi/20161102.075741
- Rename the header file and functions
- Remove inline definitions
- Add fallback code about sending dbus signal
Change-Id: Ibdb31370fa1c434b762d010ba690ab5cd81f6981
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
Diffstat (limited to 'src/launchpad.c')
-rwxr-xr-x | src/launchpad.c | 18 |
1 files changed, 9 insertions, 9 deletions
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; |