mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-22 10:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Marcin Mikołajczyk 2025-07-14 20:32:35 +01:00
parent 63532b623f
commit 840baac1e1
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/libraries/network/net.cpp
View File

@ -686,8 +686,7 @@ int PS4_SYSV_ABI sceNetEpollControl(OrbisNetId epollid, OrbisNetEpollFlag op, Or
} }
auto find_id = [&](OrbisNetId id) { auto find_id = [&](OrbisNetId id) {
return std::ranges::find_if(epoll->events, return std::ranges::find_if(epoll->events, [&](const auto& el) { return el.first == id; });
[&](const auto& el) { return el.first == id; });
}; };
switch (op) { switch (op) {
@ -709,8 +708,7 @@ int PS4_SYSV_ABI sceNetEpollControl(OrbisNetId epollid, OrbisNetEpollFlag op, Or
const auto socket = file->socket; const auto socket = file->socket;
epoll_event native_event = {.events = ConvertEpollEventsIn(event->events), epoll_event native_event = {.events = ConvertEpollEventsIn(event->events),
.data = {.fd = id}}; .data = {.fd = id}};
ASSERT(epoll_ctl(epoll->epoll_fd, EPOLL_CTL_ADD, socket->Native(), ASSERT(epoll_ctl(epoll->epoll_fd, EPOLL_CTL_ADD, socket->Native(), &native_event) == 0);
&native_event) == 0);
LOG_DEBUG(Lib_Net, "epoll_ctl succeeded"); LOG_DEBUG(Lib_Net, "epoll_ctl succeeded");
#endif #endif
epoll->events.emplace_back(id, *event); epoll->events.emplace_back(id, *event);
@ -802,9 +800,8 @@ int PS4_SYSV_ABI sceNetEpollWait(OrbisNetId epollid, OrbisNetEpollEvent* events,
const auto& current_event = native_events[i]; const auto& current_event = native_events[i];
LOG_INFO(Lib_Net, "native_event[{}] = ( .events = {}, .data = {:#x} )", i, LOG_INFO(Lib_Net, "native_event[{}] = ( .events = {}, .data = {:#x} )", i,
current_event.events, current_event.data.u64); current_event.events, current_event.data.u64);
const auto it = std::ranges::find_if(epoll->events, [&](auto& el) { const auto it = std::ranges::find_if(
return el.first == current_event.data.fd; epoll->events, [&](auto& el) { return el.first == current_event.data.fd; });
});
ASSERT(it != epoll->events.end()); ASSERT(it != epoll->events.end());
events[i] = { events[i] = {
.events = ConvertEpollEventsOut(current_event.events), .events = ConvertEpollEventsOut(current_event.events),

1
src/core/libraries/network/net_epoll.cpp
View File

@ -58,7 +58,6 @@ int EpollTable::CreateHandle(const char* name) {
void EpollTable::DeleteHandle(int d) { void EpollTable::DeleteHandle(int d) {
UNREACHABLE(); UNREACHABLE();
} }
Epoll* EpollTable::GetEpoll(int d) { Epoll* EpollTable::GetEpoll(int d) {

2
src/core/libraries/network/net_epoll.h
View File

@ -5,6 +5,7 @@
#include "common/types.h" #include "common/types.h"
#include "core/libraries/network/net.h" #include "core/libraries/network/net.h"
#include <mutex> #include <mutex>
#include <vector> #include <vector>
#include <unistd.h> #include <unistd.h>
@ -40,7 +41,6 @@ private:
bool destroyed{}; bool destroyed{};
}; };
u32 ConvertEpollEventsIn(u32 orbis_events); u32 ConvertEpollEventsIn(u32 orbis_events);
u32 ConvertEpollEventsOut(u32 epoll_events); u32 ConvertEpollEventsOut(u32 epoll_events);

16
src/core/libraries/network/net_util.cpp
View File

@ -25,8 +25,8 @@ typedef int net_socket;
#include <net/if_dl.h> #include <net/if_dl.h>
#endif #endif
#if __linux__ #if __linux__
#include <iostream>
#include <fstream> #include <fstream>
#include <iostream>
#include <sstream> #include <sstream>
#endif #endif
@ -131,7 +131,7 @@ bool NetUtilInternal::RetrieveDefaultGateway() {
std::string line; std::string line;
std::getline(route, line); std::getline(route, line);
while(std::getline(route, line)) { while (std::getline(route, line)) {
std::istringstream iss{line}; std::istringstream iss{line};
std::string iface, destination, gateway; std::string iface, destination, gateway;
int flags; int flags;
@ -167,12 +167,13 @@ bool NetUtilInternal::RetrieveNetmask() {
std::vector<u8> adapter_addresses(sizeof(IP_ADAPTER_ADDRESSES)); std::vector<u8> adapter_addresses(sizeof(IP_ADAPTER_ADDRESSES));
ULONG size_infos = sizeof(IP_ADAPTER_ADDRESSES); ULONG size_infos = sizeof(IP_ADAPTER_ADDRESSES);
if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_infos.data()), &size_infos) == if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_infos.data()),
ERROR_BUFFER_OVERFLOW) &size_infos) == ERROR_BUFFER_OVERFLOW)
adapter_infos.resize(size_infos); adapter_infos.resize(size_infos);
if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_infos.data()), &size_infos) == if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_infos.data()),
NO_ERROR && size_infos) { &size_infos) == NO_ERROR &&
size_infos) {
PIP_ADAPTER_ADDRESSES adapter; PIP_ADAPTER_ADDRESSES adapter;
for (adapter = adapter_addresses; adapter; adapter = adapter->Next) { for (adapter = adapter_addresses; adapter; adapter = adapter->Next) {
PIP_ADAPTER_UNICAST_ADDRESS unicast = adapter->FirstUnicastAddress; PIP_ADAPTER_UNICAST_ADDRESS unicast = adapter->FirstUnicastAddress;
@ -203,12 +204,11 @@ bool NetUtilInternal::RetrieveNetmask() {
freeifaddrs(ifap); freeifaddrs(ifap);
#endif #endif
if (success) { if (success) {
netmask = netmaskStr; netmask = netmaskStr;
} }
return success; return success;
} }
} // namespace NetUtil } // namespace NetUtil