mirror of
https://github.com/koreader/koreader
synced 2024-11-04 12:00:25 +00:00
fadee1f5dc
Basically: * Use `extend` for class definitions * Use `new` for object instantiations That includes some minor code cleanups along the way: * Updated `Widget`'s docs to make the semantics clearer. * Removed `should_restrict_JIT` (it's been dead code since https://github.com/koreader/android-luajit-launcher/pull/283) * Minor refactoring of LuaSettings/LuaData/LuaDefaults/DocSettings to behave (mostly, they are instantiated via `open` instead of `new`) like everything else and handle inheritance properly (i.e., DocSettings is now a proper LuaSettings subclass). * Default to `WidgetContainer` instead of `InputContainer` for stuff that doesn't actually setup key/gesture events. * Ditto for explicit `*Listener` only classes, make sure they're based on `EventListener` instead of something uselessly fancier. * Unless absolutely necessary, do not store references in class objects, ever; only values. Instead, always store references in instances, to avoid both sneaky inheritance issues, and sneaky GC pinning of stale references. * ReaderUI: Fix one such issue with its `active_widgets` array, with critical implications, as it essentially pinned *all* of ReaderUI's modules, including their reference to the `Document` instance (i.e., that was a big-ass leak). * Terminal: Make sure the shell is killed on plugin teardown. * InputText: Fix Home/End/Del physical keys to behave sensibly. * InputContainer/WidgetContainer: If necessary, compute self.dimen at paintTo time (previously, only InputContainers did, which might have had something to do with random widgets unconcerned about input using it as a baseclass instead of WidgetContainer...). * OverlapGroup: Compute self.dimen at *init* time, because for some reason it needs to do that, but do it directly in OverlapGroup instead of going through a weird WidgetContainer method that it was the sole user of. * ReaderCropping: Under no circumstances should a Document instance member (here, self.bbox) risk being `nil`ed! * Kobo: Minor code cleanups.
316 lines
11 KiB
Lua
316 lines
11 KiB
Lua
require("commonrequire")
|
|
local TimeVal = require("ui/timeval")
|
|
local time = require("ui/time")
|
|
local ffi = require("ffi")
|
|
local dummy = require("ffi/posix_h")
|
|
local logger = require("logger")
|
|
local util = require("ffi/util")
|
|
|
|
local C = ffi.C
|
|
|
|
local MockTime = {
|
|
original_os_time = os.time,
|
|
original_util_time = nil,
|
|
original_tv_realtime = nil,
|
|
original_tv_realtime_coarse = nil,
|
|
original_tv_monotonic = nil,
|
|
original_tv_monotonic_coarse = nil,
|
|
original_tv_boottime = nil,
|
|
original_tv_boottime_or_realtime_coarse = nil,
|
|
original_tv_now = nil,
|
|
monotonic = 0,
|
|
realtime = 0,
|
|
boottime = 0,
|
|
boottime_or_realtime_coarse = 0,
|
|
monotonic_time = 0,
|
|
realtime_time = 0,
|
|
boottime_time = 0,
|
|
boottime_or_realtime_coarse_time = 0,
|
|
}
|
|
|
|
function MockTime:install()
|
|
if self.original_util_time == nil then
|
|
self.original_util_time = util.gettime
|
|
assert(self.original_util_time ~= nil)
|
|
end
|
|
if self.original_tv_realtime == nil then
|
|
self.original_tv_realtime = TimeVal.realtime
|
|
assert(self.original_tv_realtime ~= nil)
|
|
end
|
|
if self.original_tv_realtime_coarse == nil then
|
|
self.original_tv_realtime_coarse = TimeVal.realtime_coarse
|
|
assert(self.original_tv_realtime_coarse ~= nil)
|
|
end
|
|
if self.original_tv_monotonic == nil then
|
|
self.original_tv_monotonic = TimeVal.monotonic
|
|
assert(self.original_tv_monotonic ~= nil)
|
|
end
|
|
if self.original_tv_monotonic_coarse == nil then
|
|
self.original_tv_monotonic_coarse = TimeVal.monotonic_coarse
|
|
assert(self.original_tv_monotonic_coarse ~= nil)
|
|
end
|
|
if self.original_tv_boottime == nil then
|
|
self.original_tv_boottime = TimeVal.boottime
|
|
assert(self.original_tv_boottime ~= nil)
|
|
end
|
|
if self.original_tv_boottime_or_realtime_coarse == nil then
|
|
self.original_tv_boottime_or_realtime_coarse = TimeVal.boottime_or_realtime_coarse
|
|
assert(self.original_tv_boottime_or_realtime_coarse ~= nil)
|
|
end
|
|
if self.original_tv_now == nil then
|
|
self.original_tv_now = TimeVal.now
|
|
assert(self.original_tv_now ~= nil)
|
|
end
|
|
|
|
-- Store both REALTIME & MONOTONIC clocks
|
|
self.realtime = os.time()
|
|
local timespec = ffi.new("struct timespec")
|
|
C.clock_gettime(C.CLOCK_MONOTONIC_COARSE, timespec)
|
|
self.monotonic = tonumber(timespec.tv_sec)
|
|
|
|
os.time = function() --luacheck: ignore
|
|
logger.dbg("MockTime:os.time: ", self.realtime)
|
|
return self.realtime
|
|
end
|
|
util.gettime = function()
|
|
logger.dbg("MockTime:util.gettime: ", self.realtime)
|
|
return self.realtime, 0
|
|
end
|
|
TimeVal.realtime = function()
|
|
logger.dbg("MockTime:TimeVal.realtime: ", self.realtime)
|
|
return TimeVal:new{ sec = self.realtime }
|
|
end
|
|
TimeVal.realtime_coarse = function()
|
|
logger.dbg("MockTime:TimeVal.realtime_coarse: ", self.realtime)
|
|
return TimeVal:new{ sec = self.realtime }
|
|
end
|
|
TimeVal.monotonic = function()
|
|
logger.dbg("MockTime:TimeVal.monotonic: ", self.monotonic)
|
|
return TimeVal:new{ sec = self.monotonic }
|
|
end
|
|
TimeVal.monotonic_coarse = function()
|
|
logger.dbg("MockTime:TimeVal.monotonic_coarse: ", self.monotonic)
|
|
return TimeVal:new{ sec = self.monotonic }
|
|
end
|
|
TimeVal.boottime = function()
|
|
logger.dbg("MockTime:TimeVal.boottime: ", self.boottime)
|
|
return TimeVal:new{ sec = self.boottime }
|
|
end
|
|
TimeVal.boottime_or_realtime_coarse = function()
|
|
logger.dbg("MockTime:TimeVal.boottime: ", self.boottime_or_realtime_coarse)
|
|
return TimeVal:new{ sec = self.boottime_or_realtime_coarse }
|
|
end
|
|
TimeVal.now = function()
|
|
logger.dbg("MockTime:TimeVal.now: ", self.monotonic)
|
|
return TimeVal:new{ sec = self.monotonic }
|
|
end
|
|
|
|
if self.original_tv_realtime_time == nil then
|
|
self.original_tv_realtime_time = time.realtime
|
|
assert(self.original_tv_realtime_time ~= nil)
|
|
end
|
|
if self.original_tv_realtime_coarse_time == nil then
|
|
self.original_tv_realtime_coarse_time = time.realtime_coarse
|
|
assert(self.original_tv_realtime_coarse_time ~= nil)
|
|
end
|
|
if self.original_tv_monotonic_time == nil then
|
|
self.original_tv_monotonic_time = time.monotonic
|
|
assert(self.original_tv_monotonic_time ~= nil)
|
|
end
|
|
if self.original_tv_monotonic_coarse_time == nil then
|
|
self.original_tv_monotonic_coarse_time = time.monotonic_coarse
|
|
assert(self.original_tv_monotonic_coarse_time ~= nil)
|
|
end
|
|
if self.original_tv_boottime_time == nil then
|
|
self.original_tv_boottime_time = time.boottime
|
|
assert(self.original_tv_boottime_time ~= nil)
|
|
end
|
|
if self.original_tv_boottime_or_realtime_coarse_time == nil then
|
|
self.original_tv_boottime_or_realtime_coarse_time = time.boottime_or_realtime_coarse
|
|
assert(self.original_tv_boottime_or_realtime_coarse_time ~= nil)
|
|
end
|
|
if self.original_tv_now == nil then
|
|
self.original_tv_now = time.now
|
|
assert(self.original_tv_now ~= nil)
|
|
end
|
|
|
|
-- Store both REALTIME & MONOTONIC clocks for fts
|
|
self.realtime_time = os.time() * 1e6
|
|
local timespec_time = ffi.new("struct timespec")
|
|
C.clock_gettime(C.CLOCK_MONOTONIC_COARSE, timespec_time)
|
|
self.monotonic = tonumber(timespec.tv_sec) * 1e6
|
|
|
|
time.realtime = function()
|
|
logger.dbg("MockTime:TimeVal.realtime: ", self.realtime_time)
|
|
return self.realtime_time
|
|
end
|
|
time.realtime_coarse = function()
|
|
logger.dbg("MockTime:TimeVal.realtime_coarse: ", self.realtime_coarse_time)
|
|
return self.realtime_coarse_time
|
|
end
|
|
time.monotonic = function()
|
|
logger.dbg("MockTime:TimeVal.monotonic: ", self.monotonic)
|
|
return self.monotonic_time
|
|
end
|
|
time.monotonic_coarse = function()
|
|
logger.dbg("MockTime:TimeVal.monotonic_coarse: ", self.monotonic)
|
|
return self.monotonic_time
|
|
end
|
|
time.boottime = function()
|
|
logger.dbg("MockTime:TimeVal.boottime: ", self.boottime_time)
|
|
return self.boottime_time
|
|
end
|
|
time.boottime_or_realtime_coarse = function()
|
|
logger.dbg("MockTime:TimeVal.boottime: ", self.boottime_or_realtime_coarse_time)
|
|
return self.boottime_or_realtime_coarse_time
|
|
end
|
|
time.now = function()
|
|
logger.dbg("MockTime:TimeVal.now: ", self.monotonic)
|
|
return self.monotonic_time
|
|
end
|
|
|
|
end
|
|
|
|
function MockTime:uninstall()
|
|
os.time = self.original_os_time --luacheck: ignore
|
|
if self.original_util_time ~= nil then
|
|
util.gettime = self.original_util_time
|
|
end
|
|
if self.original_tv_realtime ~= nil then
|
|
TimeVal.realtime = self.original_tv_realtime
|
|
end
|
|
if self.original_tv_realtime_coarse ~= nil then
|
|
TimeVal.realtime_coarse = self.original_tv_realtime_coarse
|
|
end
|
|
if self.original_tv_monotonic ~= nil then
|
|
TimeVal.monotonic = self.original_tv_monotonic
|
|
end
|
|
if self.original_tv_monotonic_coarse ~= nil then
|
|
TimeVal.monotonic_coarse = self.original_tv_monotonic_coarse
|
|
end
|
|
if self.original_tv_boottime ~= nil then
|
|
TimeVal.boottime = self.original_tv_boottime
|
|
end
|
|
if self.original_tv_boottime_or_realtime_coarse ~= nil then
|
|
TimeVal.boottime_or_realtime_coarse = self.original_tv_boottime_or_realtime_coarse
|
|
end
|
|
if self.original_tv_now ~= nil then
|
|
TimeVal.now = self.original_tv_now
|
|
end
|
|
end
|
|
|
|
function MockTime:set_realtime(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.realtime = math.floor(value)
|
|
logger.dbg("MockTime:set_realtime ", self.realtime)
|
|
return true
|
|
end
|
|
|
|
function MockTime:increase_realtime(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.realtime = math.floor(self.realtime + value)
|
|
logger.dbg("MockTime:increase_realtime ", self.realtime)
|
|
return true
|
|
end
|
|
|
|
function MockTime:set_monotonic(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.monotonic = math.floor(value)
|
|
logger.dbg("MockTime:set_monotonic ", self.monotonic)
|
|
return true
|
|
end
|
|
|
|
function MockTime:increase_monotonic(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.monotonic = math.floor(self.monotonic + value)
|
|
logger.dbg("MockTime:increase_monotonic ", self.monotonic)
|
|
return true
|
|
end
|
|
|
|
function MockTime:set_boottime(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.boottime = math.floor(value)
|
|
logger.dbg("MockTime:set_boottime ", self.boottime)
|
|
return true
|
|
end
|
|
|
|
function MockTime:increase_boottime(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.boottime = math.floor(self.boottime + value)
|
|
logger.dbg("MockTime:increase_boottime ", self.boottime)
|
|
return true
|
|
end
|
|
|
|
function MockTime:set_boottime_or_realtime_coarse(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.boottime_or_realtime_coarse = math.floor(value)
|
|
logger.dbg("MockTime:set_boottime ", self.boottime_or_realtime_coarse)
|
|
return true
|
|
end
|
|
|
|
function MockTime:increase_boottime_or_realtime_coarse(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.boottime_or_realtime_coarse = math.floor(self.boottime_or_realtime_coarse + value)
|
|
logger.dbg("MockTime:increase_boottime ", self.boottime_or_realtime_coarse)
|
|
return true
|
|
end
|
|
|
|
function MockTime:set(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.realtime = math.floor(value)
|
|
logger.dbg("MockTime:set (realtime) ", self.realtime)
|
|
self.monotonic = math.floor(value)
|
|
logger.dbg("MockTime:set (monotonic) ", self.monotonic)
|
|
self.boottime = math.floor(value)
|
|
logger.dbg("MockTime:set (boottime) ", self.boottime)
|
|
self.boottime_or_realtime_coarse = math.floor(value)
|
|
logger.dbg("MockTime:set (boottime) ", self.boottime_or_realtime_coarse)
|
|
return true
|
|
end
|
|
|
|
function MockTime:increase(value)
|
|
if type(value) ~= "number" then
|
|
return false
|
|
end
|
|
self.realtime = math.floor(self.realtime + value)
|
|
logger.dbg("MockTime:increase (realtime) ", self.realtime)
|
|
self.monotonic = math.floor(self.monotonic + value)
|
|
logger.dbg("MockTime:increase (monotonic) ", self.monotonic)
|
|
self.boottime = math.floor(self.boottime + value)
|
|
logger.dbg("MockTime:increase (boottime) ", self.boottime)
|
|
self.boottime_or_realtime_coarse = math.floor(self.boottime_or_realtime_coarse + value)
|
|
logger.dbg("MockTime:increase (boottime) ", self.boottime_or_realtime_coarse)
|
|
|
|
local value_time = value * 1e6
|
|
self.realtime_time = math.floor(self.realtime_time + value_time)
|
|
logger.dbg("MockTime:increase (realtime) ", self.realtime_time)
|
|
self.monotonic_time = math.floor(self.monotonic_time + value_time)
|
|
logger.dbg("MockTime:increase (monotonic) ", self.monotonic)
|
|
self.boottime_time = math.floor(self.boottime_time + value_time)
|
|
logger.dbg("MockTime:increase (boottime) ", self.boottime_time)
|
|
self.boottime_or_realtime_coarse_time = math.floor(self.boottime_or_realtime_coarse_time + value_time)
|
|
logger.dbg("MockTime:increase (boottime) ", self.boottime_or_realtime_coarse_time)
|
|
|
|
return true
|
|
end
|
|
|
|
return MockTime
|