[PATCH v6 0/2] MR10463: winemac: Replace OSAtomic functions with builtin __atomic counterparts.
This fixes deprecated build warnings: `wine/dlls/winemac.drv/cocoa_event.m:280:21: warning: 'OSAtomicDecrement32Barrier' is deprecated: first deprecated in macOS 10.12` Also relaxes memory barriers where appropriate. -- v6: winemac: Relax builtin __atomic memory barriers. winemac: Replace OSAtomic functions with builtin __atomic counterparts. https://gitlab.winehq.org/wine/wine/-/merge_requests/10463
From: Marc-Aurel Zent <mzent@codeweavers.com> --- dlls/winemac.drv/cocoa_event.m | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 7c86fc1d5ff..d01df4da3d8 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -21,7 +21,6 @@ #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> -#include <libkern/OSAtomic.h> #include "macdrv_cocoa.h" #import "cocoa_event.h" @@ -277,7 +276,7 @@ - (MacDrvEvent*) getEventMatchingMask:(macdrv_event_mask)mask [events removeObjectAtIndex:index]; if (event->event->deliver == INT_MAX || - OSAtomicDecrement32Barrier(&event->event->deliver) >= 0) + __atomic_sub_fetch(&event->event->deliver, 1, __ATOMIC_SEQ_CST) >= 0) { ret = event; break; @@ -647,7 +646,7 @@ int macdrv_copy_event_from_queue(macdrv_event_queue queue, */ macdrv_event* macdrv_retain_event(macdrv_event *event) { - OSAtomicIncrement32Barrier(&event->refs); + __atomic_add_fetch(&event->refs, 1, __ATOMIC_SEQ_CST); return event; } @@ -662,7 +661,7 @@ void macdrv_release_event(macdrv_event *event) { @autoreleasepool { - if (OSAtomicDecrement32Barrier(&event->refs) <= 0) + if (__atomic_sub_fetch(&event->refs, 1, __ATOMIC_SEQ_CST) <= 0) { switch (event->type) { @@ -706,7 +705,7 @@ void macdrv_release_event(macdrv_event *event) */ macdrv_query* macdrv_retain_query(macdrv_query *query) { - OSAtomicIncrement32Barrier(&query->refs); + __atomic_add_fetch(&query->refs, 1, __ATOMIC_SEQ_CST); return query; } @@ -715,7 +714,7 @@ void macdrv_release_event(macdrv_event *event) */ void macdrv_release_query(macdrv_query *query) { - if (OSAtomicDecrement32Barrier(&query->refs) <= 0) + if (__atomic_sub_fetch(&query->refs, 1, __ATOMIC_SEQ_CST) <= 0) { switch (query->type) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10463
From: Marc-Aurel Zent <mzent@codeweavers.com> --- dlls/winemac.drv/cocoa_event.m | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index d01df4da3d8..d3fc4e8f22c 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -276,7 +276,7 @@ - (MacDrvEvent*) getEventMatchingMask:(macdrv_event_mask)mask [events removeObjectAtIndex:index]; if (event->event->deliver == INT_MAX || - __atomic_sub_fetch(&event->event->deliver, 1, __ATOMIC_SEQ_CST) >= 0) + __atomic_sub_fetch(&event->event->deliver, 1, __ATOMIC_RELAXED) >= 0) { ret = event; break; @@ -646,7 +646,7 @@ int macdrv_copy_event_from_queue(macdrv_event_queue queue, */ macdrv_event* macdrv_retain_event(macdrv_event *event) { - __atomic_add_fetch(&event->refs, 1, __ATOMIC_SEQ_CST); + __atomic_add_fetch(&event->refs, 1, __ATOMIC_RELAXED); return event; } @@ -661,8 +661,9 @@ void macdrv_release_event(macdrv_event *event) { @autoreleasepool { - if (__atomic_sub_fetch(&event->refs, 1, __ATOMIC_SEQ_CST) <= 0) + if (__atomic_sub_fetch(&event->refs, 1, __ATOMIC_RELEASE) <= 0) { + __atomic_thread_fence(__ATOMIC_ACQUIRE); switch (event->type) { case IM_SET_TEXT: @@ -705,7 +706,7 @@ void macdrv_release_event(macdrv_event *event) */ macdrv_query* macdrv_retain_query(macdrv_query *query) { - __atomic_add_fetch(&query->refs, 1, __ATOMIC_SEQ_CST); + __atomic_add_fetch(&query->refs, 1, __ATOMIC_RELAXED); return query; } @@ -714,8 +715,9 @@ void macdrv_release_event(macdrv_event *event) */ void macdrv_release_query(macdrv_query *query) { - if (__atomic_sub_fetch(&query->refs, 1, __ATOMIC_SEQ_CST) <= 0) + if (__atomic_sub_fetch(&query->refs, 1, __ATOMIC_RELEASE) <= 0) { + __atomic_thread_fence(__ATOMIC_ACQUIRE); switch (query->type) { case QUERY_DRAG_DROP_ENTER: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10463
Are there still any concerns in its current version? I can use a stricter ordering around `deliver`, although I think it is not strictly needed there... Also I am not too sure if the C11 <stdatomic.h> would be better suited here. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10463#note_136026
On Tue Apr 14 23:36:16 2026 +0000, Marc-Aurel Zent wrote:
Are there still any concerns in its current version? I can use a stricter ordering around `deliver`, although I think it is not strictly needed there... Also I am not too sure if the C11 <stdatomic.h> would be better suited here. Sorry, no it looks good. I'm not totally fluent in memory models but it seems right to me.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10463#note_136223
This merge request was approved by Brendan Shanks. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10463
On Tue Apr 14 23:36:16 2026 +0000, Brendan Shanks wrote:
Sorry, no it looks good. I'm not totally fluent in memory models but it seems right to me. Ditto here.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10463#note_136307
This merge request was approved by Tim Clem. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10463
participants (4)
-
Brendan Shanks (＠bshanks) -
Marc-Aurel Zent
-
Marc-Aurel Zent (＠mzent)
-
Tim Clem (＠tclem)