From b5fa98c28562e1ee4035db4f39f3acb33fbe34c4 Mon Sep 17 00:00:00 2001 From: Jeon Sang-Heon Date: Tue, 28 Jul 2020 17:43:16 +0000 Subject: [PATCH] Move client status checker to common - client status(booting) is unique, so move to common Change-Id: I7d2065ac8131696b8717a7eb6fec3a623a2e036b Signed-off-by: Jeon Sang-Heon --- update-manager/client-controller.c | 2 +- .../common-client-status-checker.c} | 22 +++++++++---------- update-manager/main.c | 4 ++-- update-manager/update-manager.h | 8 +++---- 4 files changed, 18 insertions(+), 18 deletions(-) rename update-manager/{client-status-checker.c => common/common-client-status-checker.c} (74%) diff --git a/update-manager/client-controller.c b/update-manager/client-controller.c index a7cbbc6..355e659 100644 --- a/update-manager/client-controller.c +++ b/update-manager/client-controller.c @@ -19,7 +19,7 @@ int client_controller_process_launch_request() goto request_destroy; } - if (!client_status_checker_is_success()) { + if (!common_client_status_checker_is_success()) { _I("Failed to launch client, user session is unset, current top : %d", top); goto request_destroy; } diff --git a/update-manager/client-status-checker.c b/update-manager/common/common-client-status-checker.c similarity index 74% rename from update-manager/client-status-checker.c rename to update-manager/common/common-client-status-checker.c index 3515e72..19bb022 100644 --- a/update-manager/client-status-checker.c +++ b/update-manager/common/common-client-status-checker.c @@ -1,23 +1,23 @@ -#include "update-manager.h" +#include "../update-manager.h" static int boot_status = -1; -bool client_status_checker_is_success() +bool common_client_status_checker_is_success() { return (boot_status == VCONFKEY_SYSMAN_BOOTING_SUCCESS); } -void client_status_checker_callback(keynode_t *node, void *user_data) +void common_client_status_checker_callback(keynode_t *node, void *user_data) { int ret = 0; ret = vconf_keynode_get_type(node); if (ret == VCONF_TYPE_INT) { boot_status = vconf_keynode_get_int(node); - if (client_status_checker_is_success()) { + if (common_client_status_checker_is_success()) { _I("Success to get bootstatus : success"); - ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_BOOTINGSTATUS, client_status_checker_callback); + ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_BOOTINGSTATUS, common_client_status_checker_callback); if (ret == VCONF_OK) _I("Success to remove bootstatus callback"); else @@ -32,7 +32,7 @@ void client_status_checker_callback(keynode_t *node, void *user_data) } } -int client_status_checker_init() +int common_client_status_checker_init() { int ret = 0; @@ -43,10 +43,10 @@ int client_status_checker_init() return -1; } - if (client_status_checker_is_success()) { + if (common_client_status_checker_is_success()) { _I("Success to get boot status : success"); } else { - ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_BOOTINGSTATUS, client_status_checker_callback, NULL); + ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_BOOTINGSTATUS, common_client_status_checker_callback, NULL); if (ret != VCONF_OK) { _E("vconf_notify_key_changed for %s failed : %d", VCONFKEY_SYSMAN_BOOTINGSTATUS, ret); return -1; @@ -57,12 +57,12 @@ int client_status_checker_init() return 0; } -int client_status_checker_fini() +int common_client_status_checker_fini() { int ret = 0; - if (!client_status_checker_is_success()) { - ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_BOOTINGSTATUS, client_status_checker_callback); + if (!common_client_status_checker_is_success()) { + ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_BOOTINGSTATUS, common_client_status_checker_callback); if (ret != VCONF_OK) _W("vconf_ignore_key_changed for %s failed : %d", VCONFKEY_SYSMAN_BOOTINGSTATUS, ret); } diff --git a/update-manager/main.c b/update-manager/main.c index 36b1e01..51008f1 100644 --- a/update-manager/main.c +++ b/update-manager/main.c @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) goto main_destroy; } - ret = client_status_checker_init(); + ret = common_client_status_checker_init(); if (ret < 0) { _E("Failed to initialize client status checker : %d", ret); goto main_destroy; @@ -60,7 +60,7 @@ main_destroy: if (ret < 0) _W("Failed to finalize fota client info checker : %d", ret); - ret = client_status_checker_fini(); + ret = common_client_status_checker_fini(); if (ret < 0) _W("Failed to finalize client status checker : %d", ret); diff --git a/update-manager/update-manager.h b/update-manager/update-manager.h index 65e41cf..dccebd2 100644 --- a/update-manager/update-manager.h +++ b/update-manager/update-manager.h @@ -78,16 +78,16 @@ int fota_client_info_checker_init(void); int fota_client_info_checker_fini(void); char *fota_client_info_get_appid(void); -int client_status_checker_init(void); -int client_status_checker_fini(void); -bool client_status_checker_is_success(void); - int client_controller_process_launch_request(void); int client_controller_add_launch_request_with_data(const char *, const char *); int common_storage_checker_init(void); int common_storage_checker_fini(void); +int common_client_status_checker_init(void); +int common_client_status_checker_fini(void); +bool common_client_status_checker_is_success(void); + int common_client_info_checker_callback(pkgmgrinfo_appinfo_h, char **); int common_client_info_checker_init(const char*, const char*, pkgmgrinfo_app_list_cb); -- 2.34.1