{
DateTime* alarmEndTime = new DateTime(*endTime);
- SysLog(NID_SYS, "Endtime is exist %d:%d:%d", alarmEndTime->GetHour(), alarmEndTime->GetMinute(), alarmEndTime->GetSecond());
+ SysLog(NID_SYS, "Endtime exists %d:%d:%d", alarmEndTime->GetHour(), alarmEndTime->GetMinute(), alarmEndTime->GetSecond());
r = __pAlarmHashMap->Add(*reservedAlarmId, *alarmEndTime);
SysTryCatch(NID_SYS, r == E_SUCCESS, r, r, "Fail to add new alarm endtime on the alarm list");
}
__pAlarmHashMap->GetCount(*alarmAppId, count);
if(count == 0)
{
- SysLog(NID_SYS, "There is no reserved alarm for AppId:%S", alarmAppId->GetPointer());
+ SysLog(NID_SYS, "There is no more reserved alarm for AppId:%S", alarmAppId->GetPointer());
__pAlarmHashMap->Remove(*alarmAppId, true);
}
}
DateTime currentTime;
DateTime startTime = pAlarmImpl->GetStartTime();
const DateTime* pEndTime = pAlarmImpl->GetEndTime();
+ DateTime endTime;
//Argument check
+ startTime.AddMilliseconds(-1 * startTime.GetMillisecond());
r = SystemTime::GetCurrentTime(WALL_TIME, currentTime);
+ currentTime.AddMilliseconds(-1 * currentTime.GetMillisecond());
+
SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to get current time.");
SysTryReturnResult(NID_SYS, DateTime::Compare(currentTime, startTime) < 0, E_INVALID_ARG, "Designated start time has to be greater than current time.");
- SysTryReturnResult(NID_SYS, period > -1, E_INVALID_ARG, "Period has to greater then -1");
+ SysTryReturnResult(NID_SYS, period > -1, E_INVALID_ARG, "Period has to greater than -1");
if(pEndTime != null)
{
- SysTryReturnResult(NID_SYS, DateTime::Compare(startTime, *pEndTime) < 0, E_INVALID_ARG, "Designated end time is less then start time.");
+ endTime = *pEndTime;
+ endTime.AddMilliseconds(-1 * endTime.GetMillisecond());
+
+ SysTryReturnResult(NID_SYS, DateTime::Compare(startTime, endTime) < 0, E_INVALID_ARG, "Designated end time is less than start time.");
}
//End Alarm validation check
}
else
{
- r = AddAlarmList(reservedAlarmId, period, appId, const_cast<DateTime*>(pEndTime));
+ r = AddAlarmList(reservedAlarmId, period, appId, (DateTime*)(&endTime));
}
SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to add new alarm on the alarm list.");
if(endTime != null)
{
DateTime currentTime;
- DateTime reservedEndTime = *endTime;
SystemTime::GetCurrentTime(WALL_TIME, currentTime);
currentTime.AddMilliseconds(-1 * currentTime.GetMillisecond()); //Remove millisecond
- reservedEndTime.AddMilliseconds(-1 * reservedEndTime.GetMillisecond()); //Remove millisecond
currentTime.AddMinutes(pPeriod->ToInt());
SysLog(NID_SYS, "Next time[%d min]: %d:%d:%d:%d", pPeriod->ToInt(), currentTime.GetHour(), currentTime.GetMinute(), currentTime.GetSecond(), currentTime.GetMillisecond());
- SysLog(NID_SYS, "Reserved Endtime is exist %d:%d:%d:%d", reservedEndTime.GetHour(), reservedEndTime.GetMinute(), reservedEndTime.GetSecond(), reservedEndTime.GetMillisecond());
+ SysLog(NID_SYS, "Endtime exists %d:%d:%d:%d", endTime->GetHour(), endTime->GetMinute(), endTime->GetSecond(), endTime->GetMillisecond());
- if (currentTime.CompareTo(reservedEndTime) >= 0)
+ if (currentTime.CompareTo(*endTime) > 0)
{
- SysLog(NID_SYS, "Next time is greater then end time.");
+ SysLog(NID_SYS, "Next time is greater than end time.");
RemoveAlarmList(alarmId);
pValueEnum->Reset();
}
SysLog(NID_SYS, "Reserved Alarm[%d] is found.", alarmId);
pAlarmImpl->OnAlarmExpired(alarmId);
}
+ else
+ {
+ SysLog(NID_SYS, "pAlarmImpl of reserved alarm[%d] is not found.", alarmId);
+ }
if(__pAlarmHashMap->ContainsKey(reservedAlarmId) == false)
{
+ SysLog(NID_SYS, "Remove an alarm list[%d].", reservedAlarmId.value);
+ pAlarmImpl->__alarmId.value = 0;
r = __alarmList.Remove(reservedAlarmId);
SetLastResult(r);
}