diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-06-09 09:38:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-09 09:38:53 +0200 |
| commit | e00e7fec541220fcdd5c21c5a563a9bffe670b32 (patch) | |
| tree | 864cd71d2213502c81b465e46a76753d158868c6 /lib/pure | |
| parent | d4543500ee3be17f8c1738f271f2fe9fc23162c9 (diff) | |
| parent | 5e54cd9fc9ce21311a4991f550e420f5bf1bd726 (diff) | |
| download | Nim-e00e7fec541220fcdd5c21c5a563a9bffe670b32.tar.gz | |
Merge pull request #7873 from ehmry/GenodeEnv
Native access to Genode environment
Diffstat (limited to 'lib/pure')
| -rw-r--r-- | lib/pure/concurrency/cpuinfo.nim | 8 | ||||
| -rw-r--r-- | lib/pure/os.nim | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/pure/concurrency/cpuinfo.nim b/lib/pure/concurrency/cpuinfo.nim index f01488811..6d41aa1b2 100644 --- a/lib/pure/concurrency/cpuinfo.nim +++ b/lib/pure/concurrency/cpuinfo.nim @@ -38,8 +38,10 @@ when defined(macosx) or defined(bsd): importc: "sysctl", nodecl.} when defined(genode): - proc affinitySpaceTotal(): cuint {. - importcpp: "genodeEnv->cpu().affinity_space().total()".} + include genode/env + + proc affinitySpaceTotal(env: GenodeEnvPtr): cuint {. + importcpp: "@->cpu().affinity_space().total()".} proc countProcessors*(): int {.rtl, extern: "ncpi$1".} = ## returns the numer of the processors/cores the machine has. @@ -83,7 +85,7 @@ proc countProcessors*(): int {.rtl, extern: "ncpi$1".} = var SC_NPROC_ONLN {.importc: "_SC_NPROC_ONLN", header: "<unistd.h>".}: cint result = sysconf(SC_NPROC_ONLN) elif defined(genode): - result = affinitySpaceTotal().int + result = runtimeEnv.affinitySpaceTotal().int else: result = sysconf(SC_NPROCESSORS_ONLN) if result <= 0: result = 0 diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 04afb1eff..5008b904c 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -1440,7 +1440,7 @@ proc getAppFilename*(): string {.rtl, extern: "nos$1", tags: [ReadIOEffect].} = elif defined(solaris): result = getApplAux("/proc/" & $getpid() & "/path/a.out") elif defined(genode): - raiseOSError("POSIX command line not supported") + raiseOSError(OSErrorCode(-1), "POSIX command line not supported") elif defined(freebsd) or defined(dragonfly): result = getApplFreebsd() # little heuristic that may work on other POSIX-like systems: |