authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-05-05 17:20:14+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-05-05 17:20:14+02:00
log3fafbd2e35b05c98971b8d81514d2f92670c7b89
treecaae268a10a7ce9213e483cbc842601f7b469180
parent6a37df00ece82f6c9c73b07a77c22c918fc3257c
parent4402a7477a03e4841d080ba96ed01e6f61c4e826

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>

2 files changed, 4 insertions(+), 0 deletions(-)

lib/std/Thread.zig+3
......@@ -695,6 +695,9 @@ const PosixThreadImpl = struct {
695695 .linux => {
696696 return LinuxThreadImpl.getCpuCount();
697697 },
698 .emscripten => {
699 return @as(usize, @intCast(std.os.emscripten.emscripten_num_logical_cores()));
700 },
698701 .openbsd => {
699702 var count: c_int = undefined;
700703 var count_size: usize = @sizeOf(c_int);
lib/std/os/emscripten.zig+1
......@@ -882,6 +882,7 @@ pub extern "c" fn emscripten_hide_mouse() void;
882882pub extern "c" fn emscripten_set_canvas_size(width: c_int, height: c_int) void;
883883pub extern "c" fn emscripten_get_canvas_size(width: *c_int, height: *c_int, isFullscreen: *c_int) void;
884884pub extern "c" fn emscripten_get_now() f64;
885pub extern "c" fn emscripten_num_logical_cores() c_int;
885886pub extern "c" fn emscripten_random() f32;
886887pub const em_idb_onload_func = ?*const fn (?*anyopaque, ?*anyopaque, c_int) callconv(.c) void;
887888pub 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;