2016-08-15 22:45:00

4 files changed, 20 insertions, 20 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 2d5ebefd2..52a1e2ca6 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -8828,7 +8828,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 6996, stripped down to: 5510
+-- original size: 7055, stripped down to: 5524
 
 if not modules then modules={} end modules ['trac-inf']={
   version=1.001,
@@ -8878,12 +8878,13 @@ local function stoptiming(instance)
     timer.timing=it-1
   else
     local starttime=timer.starttime
-    if starttime then
+    if starttime and starttime>0 then
       local stoptime=clock()
       local loadtime=stoptime-starttime
       timer.stoptime=stoptime
       timer.loadtime=timer.loadtime+loadtime
       timer.timing=0
+      timer.starttime=0
       return loadtime
     end
   end
@@ -8982,7 +8983,6 @@ function statistics.formatruntime(runtime)
 end
 function statistics.runtime()
   stoptiming(statistics)
-  stoptiming(statistics) 
   return statistics.formatruntime(elapsedtime(statistics))
 end
 local report=logs.reporter("system")
@@ -18824,8 +18824,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 799977
--- stripped bytes    : 290115
+-- original bytes    : 800036
+-- stripped bytes    : 290160
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 2d5ebefd2..52a1e2ca6 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -8828,7 +8828,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 6996, stripped down to: 5510
+-- original size: 7055, stripped down to: 5524
 
 if not modules then modules={} end modules ['trac-inf']={
   version=1.001,
@@ -8878,12 +8878,13 @@ local function stoptiming(instance)
     timer.timing=it-1
   else
     local starttime=timer.starttime
-    if starttime then
+    if starttime and starttime>0 then
       local stoptime=clock()
       local loadtime=stoptime-starttime
       timer.stoptime=stoptime
       timer.loadtime=timer.loadtime+loadtime
       timer.timing=0
+      timer.starttime=0
       return loadtime
     end
   end
@@ -8982,7 +8983,6 @@ function statistics.formatruntime(runtime)
 end
 function statistics.runtime()
   stoptiming(statistics)
-  stoptiming(statistics) 
   return statistics.formatruntime(elapsedtime(statistics))
 end
 local report=logs.reporter("system")
@@ -18824,8 +18824,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 799977
--- stripped bytes    : 290115
+-- original bytes    : 800036
+-- stripped bytes    : 290160
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 2d5ebefd2..52a1e2ca6 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -8828,7 +8828,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 6996, stripped down to: 5510
+-- original size: 7055, stripped down to: 5524
 
 if not modules then modules={} end modules ['trac-inf']={
   version=1.001,
@@ -8878,12 +8878,13 @@ local function stoptiming(instance)
     timer.timing=it-1
   else
     local starttime=timer.starttime
-    if starttime then
+    if starttime and starttime>0 then
       local stoptime=clock()
       local loadtime=stoptime-starttime
       timer.stoptime=stoptime
       timer.loadtime=timer.loadtime+loadtime
       timer.timing=0
+      timer.starttime=0
       return loadtime
     end
   end
@@ -8982,7 +8983,6 @@ function statistics.formatruntime(runtime)
 end
 function statistics.runtime()
   stoptiming(statistics)
-  stoptiming(statistics) 
   return statistics.formatruntime(elapsedtime(statistics))
 end
 local report=logs.reporter("system")
@@ -18824,8 +18824,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 799977
--- stripped bytes    : 290115
+-- original bytes    : 800036
+-- stripped bytes    : 290160
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 2d5ebefd2..52a1e2ca6 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -8828,7 +8828,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-inf"] = package.loaded["trac-inf"] or true
 
--- original size: 6996, stripped down to: 5510
+-- original size: 7055, stripped down to: 5524
 
 if not modules then modules={} end modules ['trac-inf']={
   version=1.001,
@@ -8878,12 +8878,13 @@ local function stoptiming(instance)
     timer.timing=it-1
   else
     local starttime=timer.starttime
-    if starttime then
+    if starttime and starttime>0 then
       local stoptime=clock()
       local loadtime=stoptime-starttime
       timer.stoptime=stoptime
       timer.loadtime=timer.loadtime+loadtime
       timer.timing=0
+      timer.starttime=0
       return loadtime
     end
   end
@@ -8982,7 +8983,6 @@ function statistics.formatruntime(runtime)
 end
 function statistics.runtime()
   stoptiming(statistics)
-  stoptiming(statistics) 
   return statistics.formatruntime(elapsedtime(statistics))
 end
 local report=logs.reporter("system")
@@ -18824,8 +18824,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 799977
--- stripped bytes    : 290115
+-- original bytes    : 800036
+-- stripped bytes    : 290160
 
 -- end library merge