Change standard point of start time for periodic alarm

Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
Conflicts:
	alarm-manager-schedule.c
	alarm-manager.c
	include/alarm-internal.h

Change-Id: I39199e101d56eb89ac818e871e83af112942e3da

diff --git a/alarm-manager-schedule.c b/alarm-manager-schedule.c
index 275a807..5b6f395 100644 (file)
--- a/alarm-manager-schedule.c
+++ b/alarm-manager-schedule.c
@@ -230,7 +230,17 @@ static time_t __alarm_next_duetime_repeat(__alarm_info_t *__alarm_info)
        duetime_tm.tm_mday = start->day;
        duetime_tm.tm_isdst = -1;
 
-       due_time = mktime(&duetime_tm);
+       if (alarm_info->alarm_type & ALARM_TYPE_PERIOD &&
+                       alarm_info->mode.u_interval.interval > 0) {
+               /* For minimize 'while loop'
+                * Duetime should be "periodic_standard_time + (interval * x) >= current" */
+               time_t periodic_standard_time = _get_periodic_alarm_standard_time();
+               time_t temp;
+               temp = (current_time - periodic_standard_time) / alarm_info->mode.u_interval.interval;
+               due_time = periodic_standard_time + (temp * alarm_info->mode.u_interval.interval);
+       } else {
+               due_time = mktime(&duetime_tm);
+       }
 
        while (__alarm_info->start > due_time || current_time > due_time || ((!is_time_changed) && (current_time == due_time))) {
                due_time += alarm_info->mode.u_interval.interval;

diff --git a/alarm-manager.c b/alarm-manager.c
index 12d416e..890a150 100644 (file)
--- a/alarm-manager.c
+++ b/alarm-manager.c
@@ -123,6 +123,7 @@ sqlite3 *alarmmgr_db;
 bool is_time_changed = false;  // for calculating next duetime
 
 #define BILLION 1000000000     // for calculating nano seconds
+static time_t periodic_alarm_standard_time = 0;
 
 static bool __alarm_add_to_list(__alarm_info_t *__alarm_info);
 static void __alarm_generate_alarm_id(__alarm_info_t *__alarm_info, alarm_id_t *alarm_id);
@@ -2299,6 +2300,18 @@ gboolean alarm_manager_alarm_create(AlarmManager *obj, GDBusMethodInvocation *in
        return ret;
 }
 
+time_t _get_periodic_alarm_standard_time(void)
+{
+       /* To avoid start time of all devices are same. */
+       if (periodic_alarm_standard_time == 0) {
+               srand((unsigned int)time(NULL));
+               periodic_alarm_standard_time = rand() % BILLION + 1; /* 1 ~ 1000000000 */
+       }
+
+       ALARM_MGR_LOG_PRINT("periodic_standard_time : [%d]", periodic_alarm_standard_time);
+       return periodic_alarm_standard_time;
+}
+
 gboolean alarm_manager_alarm_create_periodic(AlarmManager *obj, GDBusMethodInvocation *invoc,
                char *app_service_name, char *app_service_name_mod, int interval,
                int is_ref, int method, gpointer user_data)
@@ -2318,12 +2331,16 @@ gboolean alarm_manager_alarm_create_periodic(AlarmManager *obj, GDBusMethodInvoc
        uid = __get_caller_uid(name);
        pid = __get_caller_pid(name);
 
-       alarm_info.start.year = 1900;
-       alarm_info.start.month = 1;
-       alarm_info.start.day = 0;
-       alarm_info.start.hour = 0;
-       alarm_info.start.min = 0;
-       alarm_info.start.sec = 0;
+       struct tm standard_tm;
+       time_t standard_time = _get_periodic_alarm_standard_time();
+       localtime_r(&standard_time, &standard_tm);
+
+       alarm_info.start.year = standard_tm.tm_year + 1900;
+       alarm_info.start.month = standard_tm.tm_mon + 1;
+       alarm_info.start.day = standard_tm.tm_mday;
+       alarm_info.start.hour = standard_tm.tm_hour;
+       alarm_info.start.min = standard_tm.tm_min;
+       alarm_info.start.sec = standard_tm.tm_sec;
 
        alarm_info.end.year = 0;
        alarm_info.end.month = 0;