mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Merge pull request #204 from thotypous/master
Added LuaJIT profiling support (lulip), better cmdline option handling.
This commit is contained in:
{Qingping,Dave} Hou
190
frontend/lulip.lua
Normal file
190
frontend/lulip.lua
Normal file
@@ -0,0 +1,190 @@
|
||||
-- lulip: LuaJIT line level profiler
|
||||
--
|
||||
-- Copyright (c) 2013 John Graham-Cumming
|
||||
--
|
||||
-- License: http://opensource.org/licenses/MIT
|
||||
|
||||
local io_lines = io.lines
|
||||
local io_open = io.open
|
||||
local pairs = pairs
|
||||
local print = print
|
||||
local debug = debug
|
||||
local tonumber = tonumber
|
||||
local setmetatable = setmetatable
|
||||
local table_sort = table.sort
|
||||
local table_insert = table.insert
|
||||
local string_find = string.find
|
||||
local string_sub = string.sub
|
||||
local string_gsub = string.gsub
|
||||
local string_format = string.format
|
||||
local ffi = require("ffi")
|
||||
|
||||
ffi.cdef[[
|
||||
typedef long time_t;
|
||||
|
||||
typedef struct timeval {
|
||||
time_t tv_sec;
|
||||
time_t tv_usec;
|
||||
} timeval;
|
||||
|
||||
int gettimeofday(struct timeval* t, void* tzp);
|
||||
]]
|
||||
|
||||
module(...)
|
||||
|
||||
local gettimeofday_struct = ffi.new("timeval")
|
||||
local function gettimeofday()
|
||||
ffi.C.gettimeofday(gettimeofday_struct, nil)
|
||||
return tonumber(gettimeofday_struct.tv_sec) * 1000000 + tonumber(gettimeofday_struct.tv_usec)
|
||||
end
|
||||
|
||||
local mt = { __index = _M }
|
||||
|
||||
-- new: create new profiler object
|
||||
function new(self)
|
||||
return setmetatable({
|
||||
|
||||
-- Time when start() and stop() were called in microseconds
|
||||
|
||||
start_time = 0,
|
||||
stop_time = 0,
|
||||
|
||||
-- Per line timing information
|
||||
|
||||
lines = {},
|
||||
|
||||
-- The current line being processed and when it was startd
|
||||
|
||||
current_line = nil,
|
||||
current_start = 0,
|
||||
|
||||
-- List of files to ignore. Set patterns using dont()
|
||||
|
||||
ignore = {},
|
||||
|
||||
-- List of short file names used as a cache
|
||||
|
||||
short = {},
|
||||
|
||||
-- Maximum number of rows of output data, set using maxrows()
|
||||
|
||||
rows = 20,
|
||||
}, mt)
|
||||
end
|
||||
|
||||
-- event: called when a line is executed
|
||||
function event(self, event, line)
|
||||
local now = gettimeofday()
|
||||
|
||||
local f = string_sub(debug.getinfo(3).source,2)
|
||||
for i=1,#self.ignore do
|
||||
if string_find(f, self.ignore[i], 1, true) then
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local short = self.short[f]
|
||||
if not short then
|
||||
local start = string_find(f, "[^/]+$")
|
||||
self.short[f] = string_sub(f, start)
|
||||
short = self.short[f]
|
||||
end
|
||||
|
||||
if self.current_line ~= nil then
|
||||
self.lines[self.current_line][1] =
|
||||
self.lines[self.current_line][1] + 1
|
||||
self.lines[self.current_line][2] =
|
||||
self.lines[self.current_line][2] + (now - self.current_start)
|
||||
end
|
||||
|
||||
self.current_line = short .. ':' .. line
|
||||
|
||||
if self.lines[self.current_line] == nil then
|
||||
self.lines[self.current_line] = {0, 0.0, f}
|
||||
end
|
||||
|
||||
self.current_start = gettimeofday()
|
||||
end
|
||||
|
||||
-- dont: tell the profiler to ignore files that match these patterns
|
||||
function dont(self, file)
|
||||
table_insert(self.ignore, file)
|
||||
end
|
||||
|
||||
-- maxrows: set the maximum number of rows of output
|
||||
function maxrows(self, max)
|
||||
self.rows = max
|
||||
end
|
||||
|
||||
-- start: begin profiling
|
||||
function start(self)
|
||||
self:dont('lulip.lua')
|
||||
self.start_time = gettimeofday()
|
||||
self.current_line = nil
|
||||
self.current_start = 0
|
||||
debug.sethook(function(e,l) self:event(e, l) end, "l")
|
||||
end
|
||||
|
||||
-- stop: end profiling
|
||||
function stop(self)
|
||||
self.stop_time = gettimeofday()
|
||||
debug.sethook()
|
||||
end
|
||||
|
||||
-- readfile: turn a file into an array for line-level access
|
||||
local function readfile(file)
|
||||
local lines = {}
|
||||
local ln = 1
|
||||
for line in io_lines(file) do
|
||||
lines[ln] = string_gsub(line, "^%s*(.-)%s*$", "%1")
|
||||
ln = ln + 1
|
||||
end
|
||||
return lines
|
||||
end
|
||||
|
||||
-- dump: dump profile information to the named file
|
||||
function dump(self, file)
|
||||
local t = {}
|
||||
for l,d in pairs(self.lines) do
|
||||
table_insert(t, {line=l, data=d})
|
||||
end
|
||||
table_sort(t, function(a,b) return a["data"][2] > b["data"][2] end)
|
||||
|
||||
local files = {}
|
||||
|
||||
local f = io_open(file, "w")
|
||||
if not f then
|
||||
print("Failed to open output file " .. file)
|
||||
return
|
||||
end
|
||||
f:write([[
|
||||
<html>
|
||||
<head>
|
||||
<script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js">
|
||||
</script>
|
||||
<style>.code { padding-left: 20px; }</style>
|
||||
</head>
|
||||
<body>
|
||||
<table width="100%">
|
||||
<thead><tr><th align="left">file:line</th><th align="right">count</th>
|
||||
<th align="right">elapsed (ms)</th><th align="left" class="code">line</th>
|
||||
</tr></thead>
|
||||
<tbody>
|
||||
]])
|
||||
|
||||
for j=1,self.rows do
|
||||
if not t[j] then break end
|
||||
local l = t[j]["line"]
|
||||
local d = t[j]["data"]
|
||||
if not files[d[3]] then
|
||||
files[d[3]] = readfile(d[3])
|
||||
end
|
||||
local ln = tonumber(string_sub(l, string_find(l, ":", 1, true)+1))
|
||||
f:write(string_format([[
|
||||
<tr><td>%s</td><td align="right">%i</td><td align="right">%.3f</td>
|
||||
<td class="code"><code class="prettyprint">%s</code></td></tr>]],
|
||||
l, d[1], d[2]/1000, files[d[3]][ln]))
|
||||
end
|
||||
f:write('</tbody></table></body></html')
|
||||
f:close()
|
||||
end
|
||||
@@ -36,7 +36,7 @@ fi
|
||||
#killall -stop cvm
|
||||
|
||||
# finally call reader
|
||||
./reader.lua "$1" 2> crash.log
|
||||
./reader.lua "$@" 2> crash.log
|
||||
|
||||
# clean up forked process in case the reader crashed
|
||||
killall reader.lua
|
||||
|
||||
45
reader.lua
45
reader.lua
@@ -12,6 +12,7 @@ require "settings"
|
||||
require "dbg"
|
||||
require "gettext"
|
||||
|
||||
Profiler = nil
|
||||
|
||||
HomeMenu = InputContainer:new{
|
||||
item_table = {},
|
||||
@@ -33,6 +34,11 @@ HomeMenu = InputContainer:new{
|
||||
}
|
||||
|
||||
function exitReader()
|
||||
if Profiler ~= nil then
|
||||
Profiler:stop()
|
||||
Profiler:dump("./profile.html")
|
||||
end
|
||||
|
||||
G_reader_settings:close()
|
||||
|
||||
input.closeAll()
|
||||
@@ -189,6 +195,7 @@ end
|
||||
-- option parsing:
|
||||
longopts = {
|
||||
debug = "d",
|
||||
profile = "p",
|
||||
help = "h",
|
||||
}
|
||||
|
||||
@@ -197,6 +204,7 @@ function showusage()
|
||||
print(_("Read all the books on your E-Ink reader"))
|
||||
print("")
|
||||
print(_("-d start in debug mode"))
|
||||
print(_("-p [rows] enable Lua code profiling"))
|
||||
print(_("-h show this usage help"))
|
||||
print("")
|
||||
print(_("If you give the name of a directory instead of a file path, a file"))
|
||||
@@ -209,15 +217,38 @@ function showusage()
|
||||
return
|
||||
end
|
||||
|
||||
if ARGV[1] == "-h" then
|
||||
return showusage()
|
||||
local argidx = 1
|
||||
while argidx <= #ARGV do
|
||||
local arg = ARGV[argidx]
|
||||
argidx = argidx + 1
|
||||
if arg == "--" then break end
|
||||
-- parse longopts
|
||||
if arg:sub(1,2) == "--" then
|
||||
local opt = longopts[arg:sub(3)]
|
||||
if opt ~= nil then arg = "-"..opt end
|
||||
end
|
||||
-- code for each option
|
||||
if arg == "-h" then
|
||||
return showusage()
|
||||
elseif arg == "-d" then
|
||||
Dbg:turnOn()
|
||||
elseif arg == "-p" then
|
||||
require "lulip"
|
||||
Profiler = lulip:new()
|
||||
pcall(function()
|
||||
-- set maxrows only if the optional arg is numeric
|
||||
Profiler:maxrows(ARGV[argidx] + 0)
|
||||
argidx = argidx + 1
|
||||
end)
|
||||
Profiler:start()
|
||||
else
|
||||
-- not a recognized option, should be a filename
|
||||
argidx = argidx - 1
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local argidx = 1
|
||||
if ARGV[1] == "-d" then
|
||||
Dbg:turnOn()
|
||||
argidx = argidx + 1
|
||||
else
|
||||
if not Dbg.is_on then
|
||||
DEBUG = function() end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user