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

Avoid memory allocation during dynlib loading (#9320)

Browse source 
By using `write` instead of `rawWrite` we'd end up asking the compiler
to generate the GC dynlib _while_ we were already generating another
dynlib!

Fixes #9123
This commit is contained in:
LemonBoy 2018-10-12 08:56:14 +02:00 • committed by Andreas Rumpf
commit 71636059e9
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/system/dyncalls.nim
View file

@ -20,7 +20,7 @@ const
proc c_fwrite(buf: pointer, size, n: csize, f: File): cint {. proc c_fwrite(buf: pointer, size, n: csize, f: File): cint {.
importc: "fwrite", header: "<stdio.h>".} importc: "fwrite", header: "<stdio.h>".}
proc rawWrite(f: File, s: string) = proc rawWrite(f: File, s: string|cstring) =
# we cannot throw an exception here! # we cannot throw an exception here!
discard c_fwrite(cstring(s), 1, s.len, f) discard c_fwrite(cstring(s), 1, s.len, f)
@ -43,7 +43,7 @@ proc nimLoadLibraryError(path: string) =
proc procAddrError(name: cstring) {.noinline.} = proc procAddrError(name: cstring) {.noinline.} =
# carefully written to avoid memory allocation: # carefully written to avoid memory allocation:
stderr.rawWrite("could not import: ") stderr.rawWrite("could not import: ")
stderr.write(name) stderr.rawWrite(name)
stderr.rawWrite("\n") stderr.rawWrite("\n")
quit(1) quit(1)
@ -86,7 +86,7 @@ when defined(posix):
when defined(nimDebugDlOpen): when defined(nimDebugDlOpen):
let error = dlerror() let error = dlerror()
if error != nil: if error != nil:
stderr.write(error) stderr.rawWrite(error)
stderr.rawWrite("\n") stderr.rawWrite("\n")
proc nimGetProcAddr(lib: LibHandle, name: cstring): ProcAddr = proc nimGetProcAddr(lib: LibHandle, name: cstring): ProcAddr =
@ -181,7 +181,7 @@ elif defined(nintendoswitch):
proc nimGetProcAddr(lib: LibHandle, name: cstring): ProcAddr = proc nimGetProcAddr(lib: LibHandle, name: cstring): ProcAddr =
stderr.rawWrite("nimGetProAddr not implemented") stderr.rawWrite("nimGetProAddr not implemented")
stderr.write(name) stderr.rawWrite(name)
stderr.rawWrite("\n") stderr.rawWrite("\n")
quit(1) quit(1)