From eaa9535133e4cf8752d6f76ddfffc6a513bd11d7 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 2 Jan 2014 19:19:03 +0800 Subject: [PATCH] move logMemoryUsage from koptinterface to document --- frontend/document/document.lua | 25 +++++++++++++++++++++++++ frontend/document/koptinterface.lua | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/frontend/document/document.lua b/frontend/document/document.lua index ab547f520..db86b626e 100644 --- a/frontend/document/document.lua +++ b/frontend/document/document.lua @@ -280,4 +280,29 @@ function Document:getPageText(pageno) return text end +--[[ +helper functions +--]] +function Document:logMemoryUsage(pageno) + local status_file = io.open("/proc/self/status", "r") + local log_file = io.open("mem_usage_log.txt", "a+") + local data = -1 + if status_file then + for line in status_file:lines() do + local s, n + s, n = line:gsub("VmData:%s-(%d+) kB", "%1") + if n ~= 0 then data = tonumber(s) end + if data ~= -1 then break end + end + status_file:close() + end + if log_file then + if log_file:seek("end") == 0 then -- write the header only once + log_file:write("PAGE\tMEM\n") + end + log_file:write(string.format("%s\t%s\n", pageno, data)) + log_file:close() + end +end + return Document diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index 4b9fe676f..c28a5835d 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -224,8 +224,6 @@ function KoptInterface:getRFPageDimensions(doc, pageno, zoom, rotation) end function KoptInterface:renderPage(doc, pageno, rect, zoom, rotation, gamma, render_mode) - --DEBUG("log memory usage at renderPage") - --self:logMemoryUsage(pageno) if doc.configurable.text_wrap == 1 then return self:renderreflowedPage(doc, pageno, rect, zoom, rotation, render_mode) else @@ -878,26 +876,4 @@ function KoptInterface:logReflowDuration(pageno, dur) end end -function KoptInterface:logMemoryUsage(pageno) - local status_file = io.open("/proc/self/status", "r") - local log_file = io.open("reflow_mem_log.txt", "a+") - local data = -1 - if status_file then - for line in status_file:lines() do - local s, n - s, n = line:gsub("VmData:%s-(%d+) kB", "%1") - if n ~= 0 then data = tonumber(s) end - if data ~= -1 then break end - end - status_file:close() - end - if log_file then - if log_file:seek("end") == 0 then -- write the header only once - log_file:write("PAGE\tMEM\n") - end - log_file:write(string.format("%s\t%s\n", pageno, data)) - log_file:close() - end -end - return KoptInterface