Commit 04d3da4bd1d5b8922d3f161c92c6185f33961523 | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-07-09 01:08:33-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-07-09 01:08:33-04:00
log	04d3da4bd1d5b8922d3f161c92c6185f33961523
tree	b4c068207f673fa1e698c23c46f36c94c8db7e24
parent	50d70d5f498470790f6d58b5e3018e0d89c2c9f3

std.os.cpuCount implementation for macos

3 files changed, 64 insertions(+), 26 deletions(-)

std
- c
  - darwin.zig
- os
  - darwin.zig
  - index.zig

std/c/darwin.zig+4

 @@ -13,6 +13,10 @@ pub extern "c" fn kevent(kq: c_int, changelist: [*]const Kevent, nchanges: c_int
 pub extern "c" fn kevent64(kq: c_int, changelist: [*]const kevent64_s, nchanges: c_int,
     eventlist: [*]kevent64_s, nevents: c_int, flags: c_uint, timeout: ?*const timespec) c_int;
+pub extern "c" fn sysctl(name: [*]c_int, namelen: c_uint, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
+pub extern "c" fn sysctlbyname(name: [*]const u8, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
+pub extern "c" fn sysctlnametomib(name: [*]const u8, mibp: ?*c_int, sizep: ?*usize) c_int;
 pub use @import("../os/darwin_errno.zig");
 pub const _errno = __error;

std/os/darwin.zig+12

...	@@ -520,6 +520,18 @@ pub fn symlink(existing: []const u8, new: []const u8) usize {	...	@@ -520,6 +520,18 @@ pub fn symlink(existing: []const u8, new: []const u8) usize {
520	return errnoWrap(c.symlink(existing, new));	520	return errnoWrap(c.symlink(existing, new));
521	}	521	}
522		522
		523	pub fn sysctl(name: []c_int, namelen: c_uint, oldp: ?c_void, oldlenp: ?usize, newp: ?c_void, newlen: usize) usize {
		524	return errnoWrap(c.sysctl(name, namelen, oldp, oldlenp, newp, newlen));
		525	}
		526
		527	pub fn sysctlbyname(name: []const u8, oldp: ?c_void, oldlenp: ?usize, newp: ?c_void, newlen: usize) usize {
		528	return errnoWrap(c.sysctlbyname(name, oldp, oldlenp, newp, newlen));
		529	}
		530
		531	pub fn sysctlnametomib(name: []const u8, mibp: ?c_int, sizep: ?*usize) usize {
		532	return errnoWrap(c.sysctlnametomib(name, wibp, sizep));
		533	}
		534
523	pub fn rename(old: []const u8, new: []const u8) usize {	535	pub fn rename(old: []const u8, new: []const u8) usize {
524	return errnoWrap(c.rename(old, new));	536	return errnoWrap(c.rename(old, new));
525	}	537	}

std/os/index.zig+48-26

 @@ -2756,35 +2756,57 @@ pub const CpuCountError = error{
 };
 pub fn cpuCount(fallback_allocator: *mem.Allocator) CpuCountError!usize {
-    const usize_count = 16;
+    switch (builtin.os) {
-    const allocator = std.heap.stackFallback(usize_count * @sizeOf(usize), fallback_allocator).get();
+        builtin.Os.macosx => {
+            var count: c_int = undefined;
+            var count_len: usize = @sizeOf(c_int);
+            const rc = posix.sysctlbyname(c"hw.ncpu", @ptrCast(*c_void, &count), &count_len, null, 0);
+            const err = posix.getErrno(rc);
+            switch (err) {
+                0 => return @intCast(usize, count),
+                posix.EFAULT => unreachable,
+                posix.EINVAL => unreachable,
+                posix.ENOMEM => return CpuCountError.OutOfMemory,
+                posix.ENOTDIR => unreachable,
+                posix.EISDIR => unreachable,
+                posix.ENOENT => unreachable,
+                posix.EPERM => unreachable,
+                else => return os.unexpectedErrorPosix(err),
+            }
+        },
+        builtin.Os.linux => {
+            const usize_count = 16;
+            const allocator = std.heap.stackFallback(usize_count * @sizeOf(usize), fallback_allocator).get();
-    var set = try allocator.alloc(usize, usize_count);
+            var set = try allocator.alloc(usize, usize_count);
-    defer allocator.free(set);
+            defer allocator.free(set);
-    while (true) {
+            while (true) {
-        const rc = posix.sched_getaffinity(0, set);
+                const rc = posix.sched_getaffinity(0, set);
-        const err = posix.getErrno(rc);
+                const err = posix.getErrno(rc);
-        switch (err) {
+                switch (err) {
-            0 => {
+                    0 => {
-                if (rc < set.len * @sizeOf(usize)) {
+                        if (rc < set.len * @sizeOf(usize)) {
-                    const result = set[0 .. rc / @sizeOf(usize)];
+                            const result = set[0 .. rc / @sizeOf(usize)];
-                    var sum: usize = 0;
+                            var sum: usize = 0;
-                    for (result) |x| {
+                            for (result) |x| {
-                        sum += @popCount(x);
+                                sum += @popCount(x);
-                    }
+                            }
-                    return sum;
+                            return sum;
-                } else {
+                        } else {
-                    set = try allocator.realloc(usize, set, set.len * 2);
+                            set = try allocator.realloc(usize, set, set.len * 2);
-                    continue;
+                            continue;
+                        }
+                    },
+                    posix.EFAULT => unreachable,
+                    posix.EINVAL => unreachable,
+                    posix.EPERM => return CpuCountError.PermissionDenied,
+                    posix.ESRCH => unreachable,
+                    else => return os.unexpectedErrorPosix(err),
                 }
-            },
+            }
-            posix.EFAULT => unreachable,
+        },
-            posix.EINVAL => unreachable,
+        else => @compileError("unsupported OS"),
-            posix.EPERM => return CpuCountError.PermissionDenied,
-            posix.ESRCH => unreachable,
-            else => return os.unexpectedErrorPosix(err),
-        }
     }
 }