renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Power-savings in readerdevicestatus: Schedule on full minute and fix multiple scheduling. (#9032)

Browse Source
This commit is contained in:
zwim
2022-05-09 18:23:50 +02:00
committed by GitHub
parent e960c28d16
commit 84dd58f9df
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/apps/reader/modules/readerdevicestatus.lua
View File

@@ -10,8 +10,8 @@ local _ = require("gettext")
local T = require("ffi/util").template
local ReaderDeviceStatus = InputContainer:new{
battery_confirm_box = nil,
memory_confirm_box = nil,
battery_confirm_box = nil,
memory_confirm_box = nil,
}
function ReaderDeviceStatus:init()
@@ -19,7 +19,9 @@ function ReaderDeviceStatus:init()
self.battery_interval_m = G_reader_settings:readSetting("device_status_battery_interval_minutes", 10)
self.battery_threshold = G_reader_settings:readSetting("device_status_battery_threshold", 20)
self.battery_threshold_high = G_reader_settings:readSetting("device_status_battery_threshold_high", 100)
self.checkLowBatteryLevel = function()
-- `checkLowBatteryLevel` and `checkHighMemoryUsage` are each supposed to start one second past the top of the minute,
-- as some other periodic activities do (e.g. footer). This means that the processor is woken up less often from standby.
self.checkLowBatteryLevel = function(sync)
local is_charging = powerd:isCharging()
local battery_capacity = powerd:getCapacity()
if powerd:getDismissBatteryStatus() == true then -- alerts dismissed
@@ -45,7 +47,8 @@ function ReaderDeviceStatus:init()
UIManager:show(self.battery_confirm_box)
end
end
UIManager:scheduleIn(self.battery_interval_m * 60, self.checkLowBatteryLevel)
local offset = sync and (os.date("%S") - 1) or 0
UIManager:scheduleIn(self.battery_interval_m * 60 - offset, self.checkLowBatteryLevel)
end
self:startBatteryChecker()
end
@@ -53,7 +56,9 @@ function ReaderDeviceStatus:init()
if not Device:isAndroid() then
self.memory_interval_m = G_reader_settings:readSetting("device_status_memory_interval_minutes", 5)
self.memory_threshold = G_reader_settings:readSetting("device_status_memory_threshold", 100)
self.checkHighMemoryUsage = function()
-- `checkLowBatteryLevel` and `checkHighMemoryUsage` are each supposed to start one second past the top of the minute,
-- as some other periodic activities do (e.g. footer). This means that the processor is woken up less often from standby.
self.checkHighMemoryUsage = function(sync)
local statm = io.open("/proc/self/statm", "r")
if statm then
local dummy, rss = statm:read("*number", "*number")
@@ -103,7 +108,8 @@ function ReaderDeviceStatus:init()
end
end
end
UIManager:scheduleIn(self.memory_interval_m * 60, self.checkHighMemoryUsage)
local offset = sync and (os.date("%S") - 1) or 0
UIManager:scheduleIn(self.memory_interval_m * 60 - offset, self.checkHighMemoryUsage)
end
self:startMemoryChecker()
end
@@ -126,7 +132,7 @@ function ReaderDeviceStatus:addToMainMenu(menu_items)
callback = function()
G_reader_settings:flipNilOrFalse("device_status_battery_alarm")
if G_reader_settings:isTrue("device_status_battery_alarm") then
self:startBatteryChecker()
self:startBatteryChecker(true)
else
self:stopBatteryChecker()
powerd:setDismissBatteryStatus(false)
@@ -155,7 +161,10 @@ function ReaderDeviceStatus:addToMainMenu(menu_items)
G_reader_settings:saveSetting("device_status_battery_interval_minutes", self.battery_interval_m)
touchmenu_instance:updateItems()
powerd:setDismissBatteryStatus(false)
UIManager:scheduleIn(self.battery_interval_m * 60, self.checkLowBatteryLevel)
self:stopBatteryChecker()
-- schedule first check on a full minute to reduce wakeups from standby)
UIManager:scheduleIn(self.battery_interval_m * 60 - os.date("%S") + 1,
self.checkLowBatteryLevel)
end,
})
end,
@@ -219,7 +228,7 @@ High level threshold is checked when the device is charging.]]),
callback = function()
G_reader_settings:flipNilOrFalse("device_status_memory_alarm")
if G_reader_settings:isTrue("device_status_memory_alarm") then
self:startMemoryChecker()
self:startMemoryChecker(true)
else
self:stopMemoryChecker()
end
@@ -246,7 +255,10 @@ High level threshold is checked when the device is charging.]]),
self.memory_interval_m = spin.value
G_reader_settings:saveSetting("device_status_memory_interval_minutes", self.memory_interval_m)
touchmenu_instance:updateItems()
UIManager:scheduleIn(self.memory_interval_m * 60, self.checkHighMemoryUsage)
self:stopMemoryChecker()
-- schedule first check on a full minute to reduce wakeups from standby)
UIManager:scheduleIn(self.memory_interval_m * 60 - os.date("%S") + 1,
self.checkHighMemoryUsage)
end,
})
end,
@@ -293,9 +305,11 @@ High level threshold is checked when the device is charging.]]),
end
end
function ReaderDeviceStatus:startBatteryChecker()
-- `checkLowBatteryLevel` and `checkHighMemoryUsage` are each supposed to start one second past the top of the minute,
-- as some other periodic activities do (e.g. footer). This means that the processor is woken up less often from standby.
function ReaderDeviceStatus:startBatteryChecker(sync)
if G_reader_settings:isTrue("device_status_battery_alarm") then
self.checkLowBatteryLevel()
self.checkLowBatteryLevel(sync)
end
end
@@ -305,9 +319,11 @@ function ReaderDeviceStatus:stopBatteryChecker()
end
end
function ReaderDeviceStatus:startMemoryChecker()
-- `checkLowBatteryLevel` and `checkHighMemoryUsage` are each supposed to start one second past the top of the minute,
-- as some other periodic activities do (e.g. footer). This means that the processor is woken up less often from standby.
function ReaderDeviceStatus:startMemoryChecker(sync)
if G_reader_settings:isTrue("device_status_memory_alarm") then
self.checkHighMemoryUsage()
self.checkHighMemoryUsage(sync)
end
end
@@ -318,8 +334,8 @@ function ReaderDeviceStatus:stopMemoryChecker()
end
function ReaderDeviceStatus:onResume()
self:startBatteryChecker()
self:startMemoryChecker()
self:startBatteryChecker(true)
self:startMemoryChecker(true)
end
function ReaderDeviceStatus:onSuspend()