shifathosn
/
nxemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix macOS firmware install crashes and open file limit (#377) 

Notification dialogs requested from worker threads (the firmware install
thread) created an NSWindow off the main thread and aborted. They now run
on the main run loop.

The OK and No buttons had two click handlers attached, so the second one
ran after the first had torn the window down and threw bad_weak_ptr.

Raise the soft open file limit at startup: apps launched from Finder get
256, which a firmware install exceeds, leaving the firmware half copied.
This commit is contained in:
Bruno 2026-10-07 03:43:52 +02:00 committed by GitHub
parent e950199f03
commit c46fdee03a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nxemu/main.cpp
View File

@ -9,6 +9,7 @@
#include <nxemu-core/app_init.h>
#ifdef __APPLE__
#include <nxemu-core/settings/core_settings.h>
#include <sys/resource.h>
#endif
#include <nxemu-core/version.h>
#include <yuzu_common/fs/path_util.h>
@ -88,8 +89,31 @@ static void EnablePerMonitorDpiAwareness()
}
#endif
#ifdef __APPLE__
// Apps started from Finder inherit a soft limit of 256 open files, which a
// firmware install (one open file per NCA) exceeds.
static void RaiseOpenFileLimit()
{
rlimit limit{};
if (getrlimit(RLIMIT_NOFILE, &limit) != 0)
{
return;
}
const rlim_t wanted = 10240; // OPEN_MAX, the most macOS accepts here
const rlim_t target = limit.rlim_max == RLIM_INFINITY || limit.rlim_max > wanted ? wanted : limit.rlim_max;
if (limit.rlim_cur < target)
{
limit.rlim_cur = target;
setrlimit(RLIMIT_NOFILE, &limit);
}
}
#endif
static int RunApplication(const char * arg0)
{
#ifdef __APPLE__
RaiseOpenFileLimit();
#endif
bool has_broken_vulkan = false;
bool is_child = false;
if (CheckEnvVars(&is_child)) {

51
src/nxemu/user_interface/notification.cpp
View File

@ -4,10 +4,16 @@
#include <sciter_handler.h>
#include <sciter_ui.h>
#include <common/std_string.h>
#include <type_traits>
#ifdef WIN32
#include<Windows.h>
#endif
#ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h>
#include <dispatch/dispatch.h>
#include <pthread.h>
#endif
namespace
{
@ -58,8 +64,9 @@ public:
ConfigureButtons();
m_sciterUI.AttachHandler(root.FindFirst("button[role=\"window-ok\"]"), IID_ICLICKSINK, (IClickSink *)this);
m_sciterUI.AttachHandler(root.FindFirst("button[role=\"window-close\"]"), IID_ICLICKSINK, (IClickSink *)this);
// The role buttons are the same elements as NotificationOk and
// NotificationNo. Attaching twice delivers the click to a second
// handler after the first one has already torn the window down.
m_sciterUI.AttachHandler(root.GetElementByID("NotificationYes"), IID_ICLICKSINK, (IClickSink *)this);
m_sciterUI.AttachHandler(root.GetElementByID("NotificationNo"), IID_ICLICKSINK, (IClickSink *)this);
m_sciterUI.AttachHandler(root.GetElementByID("NotificationOk"), IID_ICLICKSINK, (IClickSink *)this);
@ -149,6 +156,32 @@ private:
NotificationResponse m_response;
};
// AppKit only allows windows to be created on the main thread, but modules
// report from worker threads (e.g. the firmware install thread). The call is
// queued on the run loop rather than the main dispatch queue: the dialog runs
// a nested event loop, and that queue is not serviced again while one of its
// own blocks is still running, which would leave the dialog undrawn.
template <typename Fn>
void RunOnUiThread(Fn && fn)
{
#ifdef __APPLE__
if (pthread_main_np() == 0)
{
dispatch_semaphore_t done = dispatch_semaphore_create(0);
std::remove_reference_t<Fn> * call = &fn;
CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopCommonModes, ^{
(*call)();
dispatch_semaphore_signal(done);
});
CFRunLoopWakeUp(CFRunLoopGetMain());
dispatch_semaphore_wait(done, DISPATCH_TIME_FOREVER);
dispatch_release(done);
return;
}
#endif
fn();
}
} // namespace
std::unique_ptr<Notification> Notification::s_instance;
@ -177,8 +210,10 @@ void Notification::DisplayError(const char * message, const char * title) const
{
return;
}
NotificationWindow dialog(*m_sciterUI);
dialog.Show(m_parentWindow, NotificationDialogMode::Alert, title, message);
RunOnUiThread([&]() {
NotificationWindow dialog(*m_sciterUI);
dialog.Show(m_parentWindow, NotificationDialogMode::Alert, title, message);
});
}
NotificationResponse Notification::Query(const char * message, const char * title) const
@ -187,8 +222,12 @@ NotificationResponse Notification::Query(const char * message, const char * titl
{
return NotificationResponse::No;
}
NotificationWindow dialog(*m_sciterUI);
return dialog.Show(m_parentWindow, NotificationDialogMode::Query, title, message);
NotificationResponse response = NotificationResponse::No;
RunOnUiThread([&]() {
NotificationWindow dialog(*m_sciterUI);
response = dialog.Show(m_parentWindow, NotificationDialogMode::Query, title, message);
});
return response;
}
void Notification::BreakPoint(const char * fileName, uint32_t lineNumber)