[PATCH 0/1] MR8811: ntdll: Implement NtGetCurrentProcessorNumber() with pthread_cpu_number_np() when available on macOS.

[Brendan Shanks (＠bshanks)]

Using a documented API is always good when possible, and this will also work on ARM64.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8811

[PATCH 1/1] ntdll: Implement NtGetCurrentProcessorNumber() with pthread_cpu_number_np() when available on macOS.

[Brendan Shanks]

From: Brendan Shanks <bshanks(a)codeweavers.com>

---
 dlls/ntdll/unix/thread.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 6c1ea2d0a00..7f61a37bf2b 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -2636,13 +2636,23 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void)
 #if defined(HAVE_SCHED_GETCPU)
     int res = sched_getcpu();
     if (res >= 0) return res;
-#elif defined(__APPLE__) && (defined(__x86_64__) || defined(__i386__))
-    struct {
-        unsigned long p1, p2;
-    } p;
-    __asm__ __volatile__("sidt %[p]" : [p] "=&m"(p));
-    processor = (ULONG)(p.p1 & 0xfff);
-    return processor;
+#elif defined(__APPLE__) && defined(MAC_OS_VERSION_11_0)
+    if (__builtin_available( macOS 11.0, * ))
+    {
+        size_t cpu_id;
+        pthread_cpu_number_np( &cpu_id );
+        return cpu_id;
+    }
+#endif
+#if defined(__APPLE__) && (defined(__x86_64__) || defined(__i386__))
+    {
+        struct {
+            unsigned long p1, p2;
+        } p;
+        __asm__ __volatile__("sidt %[p]" : [p] "=&m"(p));
+        processor = (ULONG)(p.p1 & 0xfff);
+        return processor;
+    }
 #endif
 
     if (peb->NumberOfProcessors > 1)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8811