Merge branch 'devel' of github.com:nim-lang/Nim into devel

This commit is contained in:
Andreas Rumpf 2018-01-22 14:07:11 +01:00
commit cd26d02882

View file

@ -60,7 +60,8 @@ proc advice*(s: var ThreadPoolState): ThreadPoolAdvice =
proc fscanf(c: File, frmt: cstring) {.varargs, importc, proc fscanf(c: File, frmt: cstring) {.varargs, importc,
header: "<stdio.h>".} header: "<stdio.h>".}
var f = open("/proc/loadavg") var f: File
if f.open("/proc/loadavg"):
var b: float var b: float
var busy, total: int var busy, total: int
fscanf(f,"%lf %lf %lf %ld/%ld", fscanf(f,"%lf %lf %lf %ld/%ld",
@ -73,6 +74,8 @@ proc advice*(s: var ThreadPoolState): ThreadPoolAdvice =
result = doShutdownThread result = doShutdownThread
else: else:
result = doNothing result = doNothing
else:
result = doNothing
else: else:
# XXX implement this for other OSes # XXX implement this for other OSes
result = doNothing result = doNothing