mirror of
https://github.com/nim-lang/Nim.git
synced 2026-04-19 14:00:35 +00:00
store a pointer to thread local storage to make the GC happy
This commit is contained in:
@@ -160,9 +160,9 @@ else:
|
||||
type
|
||||
TThread* {.pure, final.}[TParam] = object ## Nimrod thread.
|
||||
sys: TSysThread
|
||||
globals: pointer # this allows the GC to track thread local storage!
|
||||
c: TThreadProcClosure[TParam]
|
||||
|
||||
|
||||
when nodeadlocks:
|
||||
var
|
||||
lockList {.threadvar.}: ptr TLock
|
||||
@@ -283,7 +283,7 @@ proc createThread*[TParam](t: var TThread[TParam],
|
||||
## proc `tp`. `param` is passed to `tp`.
|
||||
t.c.data = param
|
||||
t.c.fn = tp
|
||||
CreateThreadLocalStorage()
|
||||
t.globals = CreateThreadLocalStorage()
|
||||
when hostOS == "windows":
|
||||
var dummyThreadId: int32
|
||||
t.sys = CreateThread(nil, 0'i32, threadProcWrapper[TParam],
|
||||
|
||||
@@ -106,9 +106,10 @@ when hasThreadSupport:
|
||||
PGlobals = ptr TGlobals
|
||||
|
||||
var globalsSlot = ThreadVarAlloc()
|
||||
proc CreateThreadLocalStorage*() {.inl.} =
|
||||
proc CreateThreadLocalStorage*(): pointer {.inl.} =
|
||||
isMultiThreaded = true
|
||||
ThreadVarSetValue(globalsSlot, alloc0(sizeof(TGlobals)))
|
||||
result = alloc0(sizeof(TGlobals))
|
||||
ThreadVarSetValue(globalsSlot, result)
|
||||
|
||||
proc GetGlobals(): PGlobals {.compilerRtl, inl.} =
|
||||
result = cast[PGlobals](ThreadVarGetValue(globalsSlot))
|
||||
|
||||
Reference in New Issue
Block a user