fix: avoid race to call some API before NSApplication is running #21175
+52
−14
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
platform/macos 🍏
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a race condition where NSApplication APIs were being called before NSApplicationMain had fully initialized the application, which could return incorrect values. The fix ensures that the application startup code is deferred until NSApplication is ready by using a callback mechanism.
Key changes:
- Added a new callback mechanism to defer application startup until NSApplication is ready
- Moved resource path initialization into the deferred startup callback
- Added proper error handling for the native callback execution
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| UNOApplication.m | Implements the application start callback mechanism and triggers it when NSApplication finishes launching |
| UNOApplication.h | Declares the application start callback function pointer type |
| NativeUno.cs | Adds P/Invoke declaration for setting the application start callback |
| MacSkiaHost.cs | Refactors startup flow to use the callback mechanism and adds error handling |
src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNOApplication.m
Show resolved
Hide resolved
src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNOApplication.m
Show resolved
Hide resolved
src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNOApplication.m
Show resolved
Hide resolved
|
🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-21175/docs/index.html |
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-21175/wasm-skia-net9/index.html |
|
|
|
The build 172313 found UI Test snapshots differences: Details
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GitHub Issue: closes #20742
PR Type:
What is the current behavior? 🤔
There's a race where we can call some
NSApplicationAPI beforeNSApplicationMain. In such case the returned value is incorrect.This replaces the workaround #21124 made for the 6.1 branch.
What is the new behavior? 🚀
The
StartAppcode is invoked, from native code, whenNSApplicationis ready.PR Checklist ✅
Please check if your PR fulfills the following requirements:
Screenshots Compare Test Runresults.Other information ℹ️