mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-20 11:21:43 +02:00
86c1f6e1e7
This second stack leads to JNI problems on Android, because ART fetches the address and size of the original stack using pthread functions (see GetThreadStack in art/runtime/thread.cc), and (presumably) treats stack addresses outside of the original stack as invalid. (What I don't understand is why some JNI operations on the CPU thread work fine despite this but others don't.) Instead of creating a second stack, let's borrow the approach ART uses: Use pthread functions to find out the stack's address and size, then install guard pages at an appropriate location. This lets us get rid of a workaround we had in the MsgAlert function. Because we're no longer choosing the stack size ourselves, I've made some tweaks to where the put the guard pages. Previously we had a stack of 2 MiB and a safe zone of 512 KiB. We now accept stacks as small as 512 KiB (used on macOS) and use a safe zone of 256 KiB. I feel like this should be fine, but haven't done much testing beyond "it seems to work". By the way, on Windows it was already the case that we didn't create a second stack... But there was a bug in the implementation! The code for protecting the stack has to run on the CPU thread, since it's the CPU thread's stack we want to protect, but it was actually running on EmuThread. This commit fixes that, since now this bug matters on other operating systems too.
47 lines
1.1 KiB
C++
47 lines
1.1 KiB
C++
// Copyright 2008 Dolphin Emulator Project
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
#pragma once
|
|
|
|
#include <thread>
|
|
|
|
#ifndef _WIN32
|
|
#include <tuple>
|
|
#endif
|
|
|
|
// Don't include Common.h here as it will break LogManager
|
|
#include "Common/CommonTypes.h"
|
|
|
|
// This may not be defined outside _WIN32
|
|
#ifndef _WIN32
|
|
#ifndef INFINITE
|
|
#define INFINITE 0xffffffff
|
|
#endif
|
|
#endif
|
|
|
|
namespace Common
|
|
{
|
|
int CurrentThreadId();
|
|
|
|
void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
|
|
void SetCurrentThreadAffinity(u32 mask);
|
|
|
|
void SleepCurrentThread(int ms);
|
|
void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms
|
|
|
|
// Use this function during a spin-wait to make the current thread
|
|
// relax while another thread is working. This may be more efficient
|
|
// than using events because event functions use kernel calls.
|
|
inline void YieldCPU()
|
|
{
|
|
std::this_thread::yield();
|
|
}
|
|
|
|
void SetCurrentThreadName(const char* name);
|
|
|
|
#ifndef _WIN32
|
|
// Returns the lowest address of the stack and the size of the stack
|
|
std::tuple<void*, size_t> GetCurrentThreadStack();
|
|
#endif
|
|
|
|
} // namespace Common
|