jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2194 from GrundleTrundle/windows_timer_sub

Browse source 
Fix for timer overflow when using nimprofiler with 32bit Windows target.
This commit is contained in:
Andreas Rumpf 2015-02-22 21:24:23 +01:00
commit 890dcabbde
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/nimprof.nim
View file

@ -132,7 +132,7 @@ else:
proc hook(st: TStackTrace) {.nimcall.} = proc hook(st: TStackTrace) {.nimcall.} =
if interval == 0: if interval == 0:
hookAux(st, 1) hookAux(st, 1)
elif getTicks() - t0 > interval: elif int64(t0) == 0 or getTicks() - t0 > interval:
hookAux(st, 1) hookAux(st, 1)
t0 = getTicks() t0 = getTicks()

4
lib/system/timers.nim
View file

@ -27,9 +27,9 @@ when defined(windows):
proc `-`(a, b: TTicks): TNanos = proc `-`(a, b: TTicks): TNanos =
var frequency: int64 var frequency: int64
QueryPerformanceFrequency(frequency) QueryPerformanceFrequency(frequency)
var performanceCounterRate = 1000000000.0 / toFloat(frequency.int) var performanceCounterRate = 1e+9'f64 / float64(frequency)
result = ((a.int64 - b.int64).int.toFloat * performanceCounterRate).TNanos result = TNanos(float64(a.int64 - b.int64) * performanceCounterRate)
elif defined(macosx): elif defined(macosx):
type type