zig

fork of https://codeberg.org/ziglang/zig
Log | Files | Refs | README | LICENSE

commit 3fafbd2e35b05c98971b8d81514d2f92670c7b89 (tree)
parent 6a37df00ece82f6c9c73b07a77c22c918fc3257c
Author: Alex Rønne Petersen <alex@alexrp.com>
Date:   Tue,  5 May 2026 17:20:14 +0200

Merge pull request 'std: fix getCpuCount() for emscripten' (#35206) from jeffkdev/zig:fix-issue-31871 into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/35206
Reviewed-by: Alex Rønne Petersen <alex@alexrp.com>

Diffstat:
Mlib/std/Thread.zig | 3+++
Mlib/std/os/emscripten.zig | 1+
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig @@ -695,6 +695,9 @@ const PosixThreadImpl = struct { .linux => { return LinuxThreadImpl.getCpuCount(); }, + .emscripten => { + return @as(usize, @intCast(std.os.emscripten.emscripten_num_logical_cores())); + }, .openbsd => { var count: c_int = undefined; var count_size: usize = @sizeOf(c_int); diff --git a/lib/std/os/emscripten.zig b/lib/std/os/emscripten.zig @@ -882,6 +882,7 @@ pub extern "c" fn emscripten_hide_mouse() void; pub extern "c" fn emscripten_set_canvas_size(width: c_int, height: c_int) void; pub extern "c" fn emscripten_get_canvas_size(width: *c_int, height: *c_int, isFullscreen: *c_int) void; pub extern "c" fn emscripten_get_now() f64; +pub extern "c" fn emscripten_num_logical_cores() c_int; pub extern "c" fn emscripten_random() f32; pub const em_idb_onload_func = ?*const fn (?*anyopaque, ?*anyopaque, c_int) callconv(.c) void; pub extern "c" fn emscripten_idb_async_load(db_name: [*:0]const u8, file_id: [*:0]const u8, arg: ?*anyopaque, onload: em_idb_onload_func, onerror: em_arg_callback_func) void;