sys_net: Implement sys_net_abort #12265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elad335
force-pushed
the
sys_net_abort
branch
3 times, most recently
from
d794fd5
to
01f1099
Compare
RipleyTom
reviewed
Jul 17, 2022
rpcs3/Emu/Cell/lv2/sys_net.cpp
Outdated
|
|
||
| if (sock->queue.empty()) | ||
| { | ||
| if (flags & 1) |
There was a problem hiding this comment.
SYS_NET_ABORT_STRICT_CHECK
Need definition in sys_net.h
rpcs3/Emu/Cell/lv2/sys_net.cpp
Outdated
| @@ -1595,12 +1610,141 @@ error_code _sys_net_write_dump(ppu_thread& ppu, s32 id, vm::cptr<void> buf, s32 | |||
| return CELL_OK; | |||
| } | |||
|
|
|||
| error_code lv2_socket::handle_abort(s32 type, u64 arg, s32 flags) | |||
There was a problem hiding this comment.
From a pure design pov I feel the case _socket should be what is in there, the rest should be in the sys_net_abort function. lv2_socket is meant to be an interface for functions specifically acting on a socket.
rpcs3/Emu/Cell/lv2/sys_net.cpp
Outdated
| } | ||
|
|
||
| // Check if the PPU reappears in other sockets in case it waits on multiple sockets (so it won't be woken up) | ||
| idm::select<lv2_socket>([&](u32, lv2_socket& _sock) |
There was a problem hiding this comment.
Is this from hardware tests?
I would expect poll/select to be woken up by an abort on one of their sockets(I might be wrong though).
elad335
force-pushed
the
sys_net_abort
branch
4 times, most recently
from
24a553e
to
b3de542
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Attempts to address #12236.Implement type 0 and 4 commands.