Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back MemoryWatcher, but without CoreTiming #8073

Merged
merged 2 commits into from
May 10, 2019

Conversation

vladfi1
Copy link
Contributor

@vladfi1 vladfi1 commented May 3, 2019

This reverts #8050, and re-applies #4967, changing the MemoryWatcher to step during EndField rather than be tied to CoreTiming.

Source/Core/Core/Core.cpp Outdated Show resolved Hide resolved
Source/Core/Core/Core.cpp Outdated Show resolved Hide resolved
Source/Core/Core/MemoryWatcher.h Outdated Show resolved Hide resolved
Source/Core/Core/MemoryWatcher.h Outdated Show resolved Hide resolved
Source/Core/Core/MemoryWatcher.cpp Outdated Show resolved Hide resolved
@leoetlino
Copy link
Member

Can you squash the "apply suggestions" commit into the relevant commits please?

@leoetlino
Copy link
Member

Well, since the issues that caused MemoryWatcher to be removed in the first place are now fixed and the feature is actually used, I don't see a reason against adding it back.

@leoetlino leoetlino merged commit 123bbbc into dolphin-emu:master May 10, 2019
void OnFrameEnd()
{
#ifdef USE_MEMORYWATCHER
s_memory_watcher->Step();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This crashes when playing a fifolog because s_memory_watcher hasn't been initialized.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps the memory watcher initialization should be moved from CpuThread to EmuThread?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants