diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 552cde55b8..ec78ff0994 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -312,7 +312,7 @@ set(pcsx2DEV9Sources DEV9/pcap_io.cpp DEV9/Linux/Config.cpp DEV9/Linux/Linux.cpp - DEV9/Linux/net.cpp + DEV9/net.cpp ${pcsx2DEV9UISources} ) diff --git a/pcsx2/DEV9/Win32/net.cpp b/pcsx2/DEV9/Win32/net.cpp deleted file mode 100644 index 78a2100122..0000000000 --- a/pcsx2/DEV9/Win32/net.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2020 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#include "PrecompiledHeader.h" -#include "..\net.h" -#include "..\Dev9.h" - -//mtfifo rx_fifo; -//mtfifo tx_fifo; - -NetAdapter* nif; -HANDLE rx_thread; - -volatile bool RxRunning = false; -//rx thread -DWORD WINAPI NetRxThread(LPVOID lpThreadParameter) -{ - NetPacket tmp; - while (RxRunning) - { - while (rx_fifo_can_rx() && nif->recv(&tmp)) - { - rx_process(&tmp); - } - - Sleep(10); - } - - return 0; -} - -void tx_put(NetPacket* pkt) -{ - if (nif != NULL) - nif->send(pkt); - //pkt must be copied if its not processed by here, since it can be allocated on the callers stack -} -void InitNet(NetAdapter* ad) -{ - nif = ad; - RxRunning = true; - - rx_thread = CreateThread(0, 0, NetRxThread, 0, CREATE_SUSPENDED, 0); - - SetThreadPriority(rx_thread, THREAD_PRIORITY_HIGHEST); - ResumeThread(rx_thread); -} -void TermNet() -{ - if (RxRunning) - { - RxRunning = false; - emu_printf("Waiting for RX-net thread to terminate.."); - WaitForSingleObject(rx_thread, -1); - emu_printf(".done\n"); - - delete nif; - nif = NULL; - } -} diff --git a/pcsx2/DEV9/Linux/net.cpp b/pcsx2/DEV9/net.cpp similarity index 74% rename from pcsx2/DEV9/Linux/net.cpp rename to pcsx2/DEV9/net.cpp index bf77ac441e..cf13150d6a 100644 --- a/pcsx2/DEV9/Linux/net.cpp +++ b/pcsx2/DEV9/net.cpp @@ -13,18 +13,22 @@ * If not, see . */ -#include "../net.h" -#include "../DEV9.h" +#include "PrecompiledHeader.h" +#include +#include +#if defined(__linux__) #include -#include +#endif +#include "net.h" +#include "DEV9.h" NetAdapter* nif; -pthread_t rx_thread; +std::thread rx_thread; volatile bool RxRunning = false; - -void* NetRxThread(void* arg) +//rx thread +void NetRxThread() { NetPacket tmp; while (RxRunning) @@ -33,14 +37,14 @@ void* NetRxThread(void* arg) { rx_process(&tmp); } + std::this_thread::yield(); } - - return 0; } void tx_put(NetPacket* pkt) { - nif->send(pkt); + if (nif != nullptr) + nif->send(pkt); //pkt must be copied if its not processed by here, since it can be allocated on the callers stack } @@ -49,19 +53,22 @@ void InitNet(NetAdapter* ad) nif = ad; RxRunning = true; + rx_thread = std::thread(NetRxThread); + +#ifdef _WIN32 + SetThreadPriority(rx_thread.native_handle(), THREAD_PRIORITY_HIGHEST); +#elif defined(__linux__) pthread_attr_t thAttr; int policy = 0; int max_prio_for_policy = 0; - - int ret = pthread_create(&rx_thread, NULL, NetRxThread, NULL); pthread_attr_init(&thAttr); pthread_attr_getschedpolicy(&thAttr, &policy); max_prio_for_policy = sched_get_priority_max(policy); - - pthread_setschedprio(rx_thread, max_prio_for_policy); + pthread_setschedprio(rx_thread.native_handle(), max_prio_for_policy); pthread_attr_destroy(&thAttr); +#endif } void TermNet() @@ -70,9 +77,10 @@ void TermNet() { RxRunning = false; emu_printf("Waiting for RX-net thread to terminate.."); - pthread_join(rx_thread, NULL); + rx_thread.join(); emu_printf(".done\n"); delete nif; + nif = nullptr; } } diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 6107185699..e555349cdc 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -267,7 +267,7 @@ - + diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters index 6d489db303..86596bc1b9 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters @@ -1018,7 +1018,7 @@ System\DEV9 - + System\DEV9