summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHwankyu Jhun <h.jhun@samsung.com>2019-10-14 14:54:08 +0900
committerHwankyu Jhun <h.jhun@samsung.com>2019-10-14 16:03:39 +0900
commitb17d61536aa967842bacea0ebae50a1258d702d3 (patch)
treeca04be871acb082b21cae3ed7212f80c7ebcb65c
parent5436a5d69cdc9a3a82846d8d4895d9a37d10a512 (diff)
downloadlaunchpad-b17d61536aa967842bacea0ebae50a1258d702d3.tar.gz
launchpad-b17d61536aa967842bacea0ebae50a1258d702d3.tar.bz2
launchpad-b17d61536aa967842bacea0ebae50a1258d702d3.zip
Fix a bug about hydra loader
After a new package is installed, the launchpad has to send SIGKILL signal to the running hydra loaders. Change-Id: Ia44e768c893fb8ffe1680452b3688e8fd3ccb552 Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
-rwxr-xr-xsrc/launchpad.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/launchpad.c b/src/launchpad.c
index cf54b45..2fc5c02 100755
--- a/src/launchpad.c
+++ b/src/launchpad.c
@@ -1357,7 +1357,6 @@ static gboolean __handle_hydra_client_event(gpointer data)
SECURE_LOGE("Type %d hydra process was " \
"(POLLHUP|POLLNVAL), pid: %d",
cpc->type, cpc->hydra_pid);
- cpc->hydra_pid = HYDRA_NONE;
__dispose_hydra_process(cpc);
__prepare_candidate_process(cpc->type, cpc->loader_id);
return G_SOURCE_REMOVE;
@@ -1509,7 +1508,13 @@ static gboolean __handle_label_monitor(gpointer data)
while (iter) {
cpc = (candidate_process_context_t *)iter->data;
- if (cpc->pid > 0) {
+ if (cpc->is_hydra) {
+ if (cpc->hydra_pid > 0) {
+ __dispose_hydra_process(cpc);
+ __prepare_candidate_process(cpc->type,
+ cpc->loader_id);
+ }
+ } else if (cpc->pid > 0) {
__dispose_candidate_process(cpc);
__prepare_candidate_process(cpc->type, cpc->loader_id);
}