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

Merge pull request #1608 from rbehrends/fix-atomics

Browse source 
Various atomics fixes for gcc/clang.
This commit is contained in:
Andreas Rumpf 2014-11-01 02:28:24 +01:00
commit eaa5a2599f
1 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/system/atomics.nim
View file

@ -13,24 +13,30 @@
const someGcc = defined(gcc) or defined(llvm_gcc) or defined(clang) const someGcc = defined(gcc) or defined(llvm_gcc) or defined(clang)
when someGcc and hasThreadSupport: when someGcc and hasThreadSupport:
type type AtomMemModel* = distinct cint
AtomMemModel* = enum var ATOMIC_RELAXED* {.importc: "__ATOMIC_RELAXED", nodecl.}: AtomMemModel
ATOMIC_RELAXED, ## No barriers or synchronization. ## No barriers or synchronization.
ATOMIC_CONSUME, ## Data dependency only for both barrier and var ATOMIC_CONSUME* {.importc: "__ATOMIC_CONSUME", nodecl.}: AtomMemModel
## Data dependency only for both barrier and
## synchronization with another thread. ## synchronization with another thread.
ATOMIC_ACQUIRE, ## Barrier to hoisting of code and synchronizes with var ATOMIC_ACQUIRE* {.importc: "__ATOMIC_ACQUIRE", nodecl.}: AtomMemModel
## Barrier to hoisting of code and synchronizes with
## release (or stronger) ## release (or stronger)
## semantic stores from another thread. ## semantic stores from another thread.
ATOMIC_RELEASE, ## Barrier to sinking of code and synchronizes with var ATOMIC_RELEASE* {.importc: "__ATOMIC_RELEASE", nodecl.}: AtomMemModel
## Barrier to sinking of code and synchronizes with
## acquire (or stronger) ## acquire (or stronger)
## semantic loads from another thread. ## semantic loads from another thread.
ATOMIC_ACQ_REL, ## Full barrier in both directions and synchronizes var ATOMIC_ACQ_REL* {.importc: "__ATOMIC_ACQ_REL", nodecl.}: AtomMemModel
## Full barrier in both directions and synchronizes
## with acquire loads ## with acquire loads
## and release stores in another thread. ## and release stores in another thread.
ATOMIC_SEQ_CST ## Full barrier in both directions and synchronizes var ATOMIC_SEQ_CST* {.importc: "__ATOMIC_SEQ_CST", nodecl.}: AtomMemModel
## Full barrier in both directions and synchronizes
## with acquire loads ## with acquire loads
## and release stores in all threads. ## and release stores in all threads.
type
TAtomType* = TNumber|pointer|ptr|char TAtomType* = TNumber|pointer|ptr|char
## Type Class representing valid types for use with atomic procs ## Type Class representing valid types for use with atomic procs
@ -166,14 +172,14 @@ else:
result = p[] result = p[]
proc atomicInc*(memLoc: var int, x: int = 1): int = proc atomicInc*(memLoc: var int, x: int = 1): int =
when defined(gcc) and hasThreadSupport: when someGcc and hasThreadSupport:
result = atomic_add_fetch(memLoc.addr, x, ATOMIC_RELAXED) result = atomic_add_fetch(memLoc.addr, x, ATOMIC_RELAXED)
else: else:
inc(memLoc, x) inc(memLoc, x)
result = memLoc result = memLoc
proc atomicDec*(memLoc: var int, x: int = 1): int = proc atomicDec*(memLoc: var int, x: int = 1): int =
when defined(gcc) and hasThreadSupport: when someGcc and hasThreadSupport:
when declared(atomic_sub_fetch): when declared(atomic_sub_fetch):
result = atomic_sub_fetch(memLoc.addr, x, ATOMIC_RELAXED) result = atomic_sub_fetch(memLoc.addr, x, ATOMIC_RELAXED)
else: else:
@ -196,7 +202,7 @@ else:
# XXX is this valid for 'int'? # XXX is this valid for 'int'?
when (defined(x86) or defined(amd64)) and (defined(gcc) or defined(llvm_gcc)): when (defined(x86) or defined(amd64)) and someGcc:
proc cpuRelax {.inline.} = proc cpuRelax {.inline.} =
{.emit: """asm volatile("pause" ::: "memory");""".} {.emit: """asm volatile("pause" ::: "memory");""".}
elif (defined(x86) or defined(amd64)) and defined(vcc): elif (defined(x86) or defined(amd64)) and defined(vcc):