diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/core-uti.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/core-uti.lua | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/core-uti.lua b/Master/texmf-dist/tex/context/base/mkiv/core-uti.lua index cd867db1bce..b281b81a42f 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/core-uti.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/core-uti.lua @@ -43,7 +43,7 @@ local report_passes = logs.reporter("job","passes") job = job or { } local job = job -job.version = 1.31 +job.version = 1.30 job.packversion = 1.02 -- some day we will implement loading of other jobs and then we need @@ -195,7 +195,6 @@ end local packlist = { "numbers", - "ownnumbers", "metadata", "sectiondata", "prefixdata", @@ -210,7 +209,6 @@ local packlist = { local skiplist = { "datasets", "userdata", - "positions", } -- not ok as we can have arbitrary keys in userdata and dataset so some day we @@ -400,7 +398,7 @@ function statistics.callbacks() local c_internal = status.callbacks or 0 local c_file = status.indirect_callbacks or 0 local c_direct = status.direct_callbacks or 0 - local c_late = backends.noflatelua() or 0 + local c_late = status.late_callbacks or 0 local c_function = status.function_callbacks or 0 local c_total = c_internal + c_file + c_direct + c_late + c_function local n_pages = texgetcount('realpageno') - 1 @@ -432,7 +430,6 @@ end) -- local used_wood_factor = watts_per_core * kg_per_watt_per_second / speedup_by_other_engine -- local used_wood_factor = (50 / 15000000) / 1.2 - function statistics.formatruntime(runtime) if not environment.initex then -- else error when testing as not counters yet -- stoptiming(statistics) -- to be sure @@ -441,15 +438,19 @@ function statistics.formatruntime(runtime) if pages > shipped then pages = shipped end - runtime = tonumber(runtime) if shipped > 0 or pages > 0 then + runtime = tonumber(runtime) local persecond = (runtime > 0) and (shipped/runtime) or pages - if pages == 0 then - pages = shipped - end - return format("%0.3f seconds, %i processed pages, %i shipped pages, %.3f pages/second",runtime,pages,shipped,persecond) + if pages == 0 then pages = shipped end + -- if TEXENGINE == "luajittex" then + -- local saved = watts_per_core * runtime * kg_per_watt_per_second / speedup_by_other_engine + -- local saved = used_wood_factor * runtime + -- return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second, %f mg tree saved by using luajittex",runtime,pages,shipped,persecond,saved*1000*1000) + -- else + return format("%s seconds, %i processed pages, %i shipped pages, %.3f pages/second",runtime,pages,shipped,persecond) + -- end else - return format("%0.3f seconds",runtime) + return format("%s seconds",runtime) end end end |