diff options
author | Sangyoon Jang <s89.jang@samsung.com> | 2015-06-10 17:51:52 +0900 |
---|---|---|
committer | Sangyoon Jang <s89.jang@samsung.com> | 2015-06-11 02:41:07 -0700 |
commit | 2f323b533a991df3eb9f53b3852db06984115c81 (patch) | |
tree | 9d7510936c4b5a65fb382d9e250b187a33cd4579 /src | |
parent | 3acef37bdb556ff3b58371c098f49713693a0cbd (diff) | |
download | alarm-manager-2f323b533a991df3eb9f53b3852db06984115c81.tar.gz alarm-manager-2f323b533a991df3eb9f53b3852db06984115c81.tar.bz2 alarm-manager-2f323b533a991df3eb9f53b3852db06984115c81.zip |
Get caller pid from gdbus connectionsubmit/tizen_3.0.2015.q2_common/20150615.075539submit/tizen/20150611.102919accepted/tizen/wearable/20150613.021354accepted/tizen/tv/20150613.021343accepted/tizen/mobile/20150613.021328accepted/tizen/common/20150612.065955accepted/tizen/3.0.2015.q2/common/20150615.091850
caller doesn't need to send pid, alarm-manager gets caller's pid from
gdbus connection.
Change-Id: I70b88c6f4ae7e8428e9919a4f4c5a77324518bdf
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/alarm-lib-stub.c | 22 | ||||
-rw-r--r-- | src/alarm-lib.c | 48 |
2 files changed, 16 insertions, 54 deletions
diff --git a/src/alarm-lib-stub.c b/src/alarm-lib-stub.c index 3a899df..e51aae2 100644 --- a/src/alarm-lib-stub.c +++ b/src/alarm-lib-stub.c @@ -72,7 +72,7 @@ bool _send_alarm_create_appsvc(alarm_context_t context, alarm_info_t *alarm_info return false; } - if (!alarm_manager_call_alarm_create_appsvc_sync((AlarmManager*)context.proxy, context.pid, + if (!alarm_manager_call_alarm_create_appsvc_sync((AlarmManager*)context.proxy, alarm_info->start.year, alarm_info->start.month, alarm_info->start.day, @@ -130,7 +130,7 @@ bool _send_alarm_create(alarm_context_t context, alarm_info_t *alarm_info, return false; } - if (!alarm_manager_call_alarm_create_sync((AlarmManager*)context.proxy, context.pid, + if (!alarm_manager_call_alarm_create_sync((AlarmManager*)context.proxy, g_quark_to_string(context.quark_app_service_name), g_quark_to_string(context.quark_app_service_name_mod), alarm_info->start.year, @@ -217,7 +217,7 @@ bundle *_send_alarm_get_appsvc_info(alarm_context_t context, alarm_id_t alarm_id int len = 0; if (!alarm_manager_call_alarm_get_appsvc_info_sync - ((AlarmManager*)context.proxy, context.pid, alarm_id, &b_data, &return_code, NULL, &error)) { + ((AlarmManager*)context.proxy, alarm_id, &b_data, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_get_appsvc_info_sync() failed. alarm_id[%d], return_code[%d].", alarm_id, return_code); @@ -255,7 +255,7 @@ bool _send_alarm_set_rtc_time(alarm_context_t context, alarm_date_t *time, int * int return_code = 0; if (!alarm_manager_call_alarm_set_rtc_time_sync - ((AlarmManager*)context.proxy, context.pid, time->year, time->month, time->day, + ((AlarmManager*)context.proxy, time->year, time->month, time->day, time->hour, time->min, time->sec, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ @@ -283,7 +283,7 @@ bool _send_alarm_delete(alarm_context_t context, alarm_id_t alarm_id, int *error int return_code = 0; if (!alarm_manager_call_alarm_delete_sync - ((AlarmManager*)context.proxy, context.pid, alarm_id, &return_code, NULL, &error)) { + ((AlarmManager*)context.proxy, alarm_id, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_delete_sync() failed. alarm_id[%d], return_code[%d]", alarm_id, return_code); @@ -310,7 +310,7 @@ bool _send_alarm_delete_all(alarm_context_t context, int *error_code) int return_code = 0; if (!alarm_manager_call_alarm_delete_all_sync - ((AlarmManager*)context.proxy, context.pid, &return_code, NULL, &error)) { + ((AlarmManager*)context.proxy, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_delete_all_sync() failed. return_code[%d]", return_code); @@ -340,7 +340,7 @@ bool _send_alarm_get_list_of_ids(alarm_context_t context, int maxnum_of_ids, int return_code = 0; if (!alarm_manager_call_alarm_get_list_of_ids_sync((AlarmManager*)context.proxy, - context.pid, maxnum_of_ids, &alarm_array, + maxnum_of_ids, &alarm_array, num_of_ids, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /*error_code should be set */ @@ -383,7 +383,7 @@ bool _send_alarm_get_number_of_ids(alarm_context_t context, int *num_of_ids, GError *error = NULL; gint return_code = 0; - if (!alarm_manager_call_alarm_get_number_of_ids_sync((AlarmManager*)context.proxy, context.pid, num_of_ids, &return_code, NULL, &error)) { + if (!alarm_manager_call_alarm_get_number_of_ids_sync((AlarmManager*)context.proxy, num_of_ids, &return_code, NULL, &error)) { /* g_dbus_proxy_call_sync error */ /* error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( @@ -413,7 +413,7 @@ bool _send_alarm_get_info(alarm_context_t context, alarm_id_t alarm_id, int return_code = 0; if (!alarm_manager_call_alarm_get_info_sync((AlarmManager*)context.proxy, - context.pid, alarm_id, &alarm_info->start.year, + alarm_id, &alarm_info->start.year, &alarm_info->start.month, &alarm_info->start.day, &alarm_info->start.hour, &alarm_info->start.min, &alarm_info->start.sec, &alarm_info->end.year, @@ -449,7 +449,7 @@ bool _send_alarm_get_next_duetime(alarm_context_t context, int return_code = 0; if (!alarm_manager_call_alarm_get_next_duetime_sync((AlarmManager*)context.proxy, - context.pid, alarm_id, (gint *)duetime, &return_code, NULL, &error)) { + alarm_id, (gint *)duetime, &return_code, NULL, &error)) { /*g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( @@ -475,7 +475,7 @@ bool _send_alarm_get_all_info(alarm_context_t context, char ** db_path, int *err GError *error = NULL; int return_code = 0; - if (!alarm_manager_call_alarm_get_all_info_sync((AlarmManager*)context.proxy, context.pid, db_path, &return_code, NULL, &error)) { + if (!alarm_manager_call_alarm_get_all_info_sync((AlarmManager*)context.proxy, db_path, &return_code, NULL, &error)) { /*g_dbus_proxy_call_sync error */ /*error_code should be set */ ALARM_MGR_EXCEPTION_PRINT("alarm_manager_call_alarm_get_all_info_sync() failed by dbus. return_code[%d][%s]", return_code, error->message); diff --git a/src/alarm-lib.c b/src/alarm-lib.c index c282bec..a697b80 100644 --- a/src/alarm-lib.c +++ b/src/alarm-lib.c @@ -38,9 +38,6 @@ #include <aul.h> #include <gio/gio.h> -#define MAX_KEY_SIZE 256 -#define MAX_PROC_NAME_LEN 512 - #ifndef EXPORT_API #define EXPORT_API __attribute__ ((visibility("default"))) #endif @@ -241,11 +238,8 @@ static bool __alarm_validate_time(alarm_date_t *date, int *error_code) static int __sub_init() { GError *error = NULL; - char proc_file[MAX_PROC_NAME_LEN] = {0, }; - char process_name[MAX_PROC_NAME_LEN] = {0, }; int fd = 0; int ret = 0; - const int MAX_LEN = MAX_PROC_NAME_LEN; pthread_mutex_lock(&init_lock); @@ -283,38 +277,6 @@ static int __sub_init() return ERR_ALARM_SYSTEM_FAIL; } - // Only webapp which has a pid of WebProcess uses the sid. Otherwise, the pid is used. - snprintf(proc_file, MAX_LEN, "/proc/%d/cmdline", getpid()); - fd = open(proc_file, O_RDONLY); - if (fd < 0) { - SECURE_LOGE("Unable to get the proc file(%d).\n", getpid()); - g_object_unref(alarm_context.proxy); - g_object_unref(alarm_context.connection); - pthread_mutex_unlock(&init_lock); - return ERR_ALARM_SYSTEM_FAIL; - } - else { - ret = read(fd, process_name, MAX_LEN - 1); - close(fd); - if (ret < 0) { - ALARM_MGR_EXCEPTION_PRINT("Unable to read the proc file(%d).", getpid()); - g_object_unref(alarm_context.proxy); - g_object_unref(alarm_context.connection); - pthread_mutex_unlock(&init_lock); - return ERR_ALARM_SYSTEM_FAIL; - } - else { - if (strncmp(process_name, "/usr/bin/WebProcess", strlen("/usr/bin/WebProcess")) == 0) { - alarm_context.pid = getsid(getpid()); - SECURE_LOGD("alarm_context.pid is set to sessionID, %d.", alarm_context.pid); - } - else { - alarm_context.pid = getpid(); - SECURE_LOGD("alarm_context.pid is set to processID, %d.", alarm_context.pid); - } - } - } - sub_initialized = true; pthread_mutex_unlock(&init_lock); @@ -1233,7 +1195,7 @@ EXPORT_API int alarmmgr_enum_alarm_ids(alarm_enum_fn_t fn, void *user_param) SECURE_LOGD("alarm_manager_call_alarm_get_number_of_ids_sync() is called"); if (!alarm_manager_call_alarm_get_number_of_ids_sync( - (AlarmManager*)alarm_context.proxy, alarm_context.pid, &maxnum_of_ids, &return_code, NULL, &error)) { + (AlarmManager*)alarm_context.proxy, &maxnum_of_ids, &return_code, NULL, &error)) { /* dbus error. error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( "alarm_manager_call_alarm_get_number_of_ids_sync() is failed by dbus. return_code[%d], err message[%s]", @@ -1250,7 +1212,7 @@ EXPORT_API int alarmmgr_enum_alarm_ids(alarm_enum_fn_t fn, void *user_param) SECURE_LOGD("alarm_manager_call_alarm_get_list_of_ids_sync() is called"); if (!alarm_manager_call_alarm_get_list_of_ids_sync( - (AlarmManager*)alarm_context.proxy, alarm_context.pid, maxnum_of_ids, &alarm_array, &num_of_ids, &return_code, NULL, &error)) { + (AlarmManager*)alarm_context.proxy, maxnum_of_ids, &alarm_array, &num_of_ids, &return_code, NULL, &error)) { /* dbus error. error_code should be set */ ALARM_MGR_EXCEPTION_PRINT( "alarm_manager_call_alarm_get_list_of_ids_sync() failed by dbus. num_of_ids[%d], return_code[%d].", num_of_ids, return_code); @@ -1516,7 +1478,7 @@ EXPORT_API int alarmmgr_set_systime(int new_time) return error_code; } - ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time(%d) by pid(%d).", new_time, alarm_context.pid); + ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time(%d) by pid(%d).", new_time, getpid()); return ALARMMGR_RESULT_SUCCESS; } @@ -1535,7 +1497,7 @@ EXPORT_API int alarmmgr_set_systime_with_propagation_delay(struct timespec new_t return error_code; } - ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time by pid(%d).", alarm_context.pid); + ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the time by pid(%d).", getpid()); return ALARMMGR_RESULT_SUCCESS; } @@ -1556,6 +1518,6 @@ EXPORT_API int alarmmgr_set_timezone(char *tzpath_str) return error_code; } - ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the timezone(%s) by pid(%d)", tzpath_str, alarm_context.pid); + ALARM_MGR_LOG_PRINT("[alarm-lib]: successfully set the timezone(%s) by pid(%d)", tzpath_str, getpid()); return ALARMMGR_RESULT_SUCCESS; } |