IOS/WiiSockMan: Move instance to IOS Kernel. #11767
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
leoetlino
approved these changes
Apr 18, 2023
| @@ -77,7 +77,6 @@ NetIPTopDevice::NetIPTopDevice(Kernel& ios, const std::string& device_name) | |||
| void NetIPTopDevice::DoState(PointerWrap& p) | |||
| { | |||
| Device::DoState(p); | |||
| WiiSockMan::GetInstance().DoState(p); | |||
There was a problem hiding this comment.
lol, this was just being done in some random network device
|
Re devices being shared_ptrs and not unique_ptrs, I think that's because the same device can be added to the map at different paths? I don't remember if that's something we do at the moment (maybe for FS or USB,) but that's the one reason I can think of as devices can't outlive the kernel. Might just be yet another historical quirk. And yeah uh I think the deviced map savestate logic is broken. |
|
The savestate situation is still sketchy btw, this PR doesn't change that situation really. |
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.
This was a global instance previously due to what seems to be legacy reasons.
I originally wanted to put this into one of the Network-related devices but there didn't seem to be a good single spot for it, so it just ended up in Kernel. I'm also not entirely sure why the Kernel uses
shared_ptrfor its device instances, can any of them actually outlive the Kernel itself? I've replicated this for the socket manager but I actually don't see any reason why it can't just be aunique_ptrinstead.@leoetlino Please review.
(As a side-note, I think I've noticed a logic error in the IOS savestating logic; nothing guarantees that devices in
m_device_mapare synced correctly with the ones in the savestate. You'd have to load a state from an IOS version than has different devices than the currently running one, which is unlikely in regular play, but I see nothing that actually prevents this...?)