Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-04 16:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

core: Switch to std threading primitives

Browse source
This commit is contained in:
GPUCode 2023-10-22 17:10:25 +03:00
parent f39744cf62
commit e2b1b059ed
24 changed files with 98 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main.cpp
View file

@ -31,10 +31,10 @@
#include <emulator.h>
#include <inttypes.h>
#include <stdio.h>
#include <thread>
#include "Core/PS4/HLE/Libs.h"
#include "Core/PS4/Linker.h"
#include "Lib/Threads.h"
#include "Emulator/Util\singleton.h"
#include "discord.h"
@ -50,25 +50,22 @@ int main(int argc, char* argv[]) {
auto height = Config::getScreenHeight();
Emu::emuInit(width, height);
HLE::Libs::Graphics::VideoOut::videoOutInit(width, height);
Lib::InitThreads();
const char* const path = argv[1]; // argument 1 is the path of self file to boot
auto* linker = singleton<Linker>::instance();
HLE::Libs::Init_HLE_Libs(linker->getHLESymbols());
auto* module = linker->LoadModule(path); // load main executable
Lib::Thread mainthread(
[](void*) {
std::jthread mainthread(
[](std::stop_token stop_token, void*) {
auto* linker = singleton<Linker>::instance();
linker->Execute();
},
nullptr);
mainthread.DetachThread();
Discord::RPC discordRPC;
discordRPC.init();
discordRPC.update(Discord::RPCStatus::Idling, "");
Emu::emuRun();
mainthread.JoinThread();
#if 0
// Setup SDL