openharmony/miscservices_time
1
0
Fork 0
mirror of https://github.com/openharmony/miscservices_time.git synced 2026-07-18 17:34:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Signed-off-by: zhangjunxi <zhangjunxi1@huawei.com>

Browse Source 
Changes to be committed:
	modified:   timer/src/timer_handler.cpp
	modified:   timer/src/timer_manager.cpp
This commit is contained in:
zhangjunxi
2022-07-02 11:01:52 +08:00
parent 99f2ec3df9
commit 3bb125bf90
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/timer/src/timer_handler.cpp
-1
View File
@@ -104,7 +104,6 @@ TimerHandler::~TimerHandler()
int TimerHandler::Set(uint32_t type, std::chrono::nanoseconds when)
{
TIME_HILOGI(TIME_MODULE_SERVICE, "type= %{public}d, when= %{public}lld", type, when.count());
if (static_cast<size_t>(type) > ALARM_TYPE_COUNT) {
errno = EINVAL;
return -1;
services/timer/src/timer_manager.cpp
+1 -25
View File
@@ -363,17 +363,14 @@ void TimerManager::TimerLooper()
do {
result = handler_->WaitForAlarm();
} while (result < 0 && errno == EINTR);
TIME_HILOGI(TIME_MODULE_SERVICE, "result= %{public}d", result);
auto nowRtc = std::chrono::system_clock::now();
auto nowElapsed = GetBootTimeNs();
triggerList.clear();
if ((result & TIME_CHANGED_MASK) != 0) {
TIME_HILOGI(TIME_MODULE_SERVICE, "time changed");
system_clock::time_point lastTimeChangeClockTime;
system_clock::time_point expectedClockTime;
TIME_HILOGI(TIME_MODULE_SERVICE, "lock");
std::lock_guard<std::mutex> lock(mutex_);
lastTimeChangeClockTime = lastTimeChangeClockTime_;
expectedClockTime = lastTimeChangeClockTime + (duration_cast<milliseconds>(nowElapsed.time_since_epoch()) -
@@ -381,7 +378,6 @@ void TimerManager::TimerLooper()
if (lastTimeChangeClockTime == system_clock::time_point::min()
|| nowRtc < (expectedClockTime - milliseconds(ONE_THOUSAND))
|| nowRtc > (expectedClockTime + milliseconds(ONE_THOUSAND))) {
TIME_HILOGI(TIME_MODULE_SERVICE, "Time changed notification from kernel; rebatching");
ReBatchAllTimers();
lastTimeChangeClockTime_ = nowRtc;
lastTimeChangeRealtime_ = nowElapsed;
@@ -390,8 +386,7 @@ void TimerManager::TimerLooper()
if (result != TIME_CHANGED_MASK) {
std::lock_guard<std::mutex> lock(mutex_);
auto hasWakeup = TriggerTimersLocked(triggerList, nowElapsed);
TIME_HILOGI(TIME_MODULE_SERVICE, "hasWakeup= %{public}d", hasWakeup);
TriggerTimersLocked(triggerList, nowElapsed);
DeliverTimersLocked(triggerList, nowElapsed);
RescheduleKernelTimerLocked();
} else {
@@ -423,17 +418,10 @@ steady_clock::time_point TimerManager::GetBootTimeNs()
bool TimerManager::TriggerTimersLocked(std::vector<std::shared_ptr<TimerInfo>> &triggerList,
std::chrono::steady_clock::time_point nowElapsed)
{
TIME_HILOGI(TIME_MODULE_SERVICE, "alarmBatches_.size= %{public}d", static_cast<int>(alarmBatches_.size()));
bool hasWakeup = false;
while (!alarmBatches_.empty()) {
auto batch = alarmBatches_.at(0);
TIME_HILOGI(TIME_MODULE_SERVICE, "batch->GetStart()= %{public}lld",
time_point_cast<nanoseconds>(batch->GetStart()).time_since_epoch().count());
TIME_HILOGI(TIME_MODULE_SERVICE, "nowElapsed= %{public}lld",
time_point_cast<nanoseconds>(nowElapsed).time_since_epoch().count());
if (batch->GetStart() > nowElapsed) {
TIME_HILOGI(TIME_MODULE_SERVICE, "break alarmBatches_.size= %{public}d",
static_cast<int>(alarmBatches_.size()));
break;
}
alarmBatches_.erase(alarmBatches_.begin());
@@ -471,23 +459,16 @@ bool TimerManager::TriggerTimersLocked(std::vector<std::shared_ptr<TimerInfo>> &
void TimerManager::RescheduleKernelTimerLocked()
{
TIME_HILOGI(TIME_MODULE_SERVICE, "start alarmBatches_.size= %{public}d", static_cast<int>(alarmBatches_.size()));
auto nextNonWakeup = std::chrono::steady_clock::time_point::min();
if (!alarmBatches_.empty()) {
auto firstWakeup = FindFirstWakeupBatchLocked();
auto firstBatch = alarmBatches_.front();
if (firstWakeup != nullptr) {
auto alarmPtr = firstWakeup->Get(0);
if (alarmPtr != nullptr) {
TIME_HILOGI(TIME_MODULE_SERVICE, "wake up alarm id :%{public}" PRId64 "", alarmPtr->id);
}
SetLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup->GetStart().time_since_epoch());
}
if (firstBatch != firstWakeup) {
auto alarmPtr = firstBatch->Get(0);
if (alarmPtr != nullptr) {
TIME_HILOGI(TIME_MODULE_SERVICE, "nonwakeup alarm id :%{public}" PRId64 "", alarmPtr->id);
}
nextNonWakeup = firstBatch->GetStart();
}
}
@@ -495,7 +476,6 @@ void TimerManager::RescheduleKernelTimerLocked()
if (nextNonWakeup != std::chrono::steady_clock::time_point::min()) {
SetLocked(ELAPSED_REALTIME, nextNonWakeup.time_since_epoch());
}
TIME_HILOGI(TIME_MODULE_SERVICE, "end");
}
std::shared_ptr<Batch> TimerManager::FindFirstWakeupBatchLocked()
@@ -510,9 +490,7 @@ std::shared_ptr<Batch> TimerManager::FindFirstWakeupBatchLocked()
void TimerManager::SetLocked(int type, std::chrono::nanoseconds when)
{
TIME_HILOGI(TIME_MODULE_SERVICE, "start when.count= %{public}lld", when.count());
handler_->Set(static_cast<uint32_t>(type), when);
TIME_HILOGI(TIME_MODULE_SERVICE, "end");
}
void TimerManager::InsertAndBatchTimerLocked(std::shared_ptr<TimerInfo> alarm)
@@ -549,14 +527,12 @@ int64_t TimerManager::AttemptCoalesceLocked(std::chrono::steady_clock::time_poin
void TimerManager::DeliverTimersLocked(const std::vector<std::shared_ptr<TimerInfo>> &triggerList,
std::chrono::steady_clock::time_point nowElapsed)
{
TIME_HILOGI(TIME_MODULE_SERVICE, "start");
for (const auto &alarm : triggerList) {
if (alarm->callback) {
alarm->callback(alarm->id);
TIME_HILOGI(TIME_MODULE_SERVICE, "Trigger id: %{public}" PRId64 "", alarm->id);
}
}
TIME_HILOGI(TIME_MODULE_SERVICE, "end");
}
bool AddBatchLocked(std::vector<std::shared_ptr<Batch>> &list, const std::shared_ptr<Batch> &newBatch)