fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XEvent write signaled state

Browse Source
This commit is contained in:
Dr. Chat
2015-12-02 19:50:00 -06:00
committed by Ben Vanik
parent e54850e1f2
commit c44742b0e3
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/xenia/kernel/xevent.cc
View File

@@ -75,7 +75,23 @@ bool XEvent::Save(ByteStream* stream) {
XELOGD("XEvent %.8X (%s)", handle(), manual_reset_ ? "manual" : "auto"); XELOGD("XEvent %.8X (%s)", handle(), manual_reset_ ? "manual" : "auto");
SaveObject(stream); SaveObject(stream);
// TODO: Write if we're currently signaled. bool signaled = true;
auto result =
xe::threading::Wait(event_.get(), false, std::chrono::milliseconds(0));
if (result == xe::threading::WaitResult::kSuccess) {
signaled = true;
} else if (result == xe::threading::WaitResult::kTimeout) {
signaled = false;
} else {
assert_always();
}
if (signaled) {
// Reset the event in-case it's an auto-reset.
event_->Set();
}
stream->Write<bool>(signaled);
stream->Write<bool>(manual_reset_); stream->Write<bool>(manual_reset_);
return true; return true;
@@ -87,6 +103,7 @@ object_ref<XEvent> XEvent::Restore(KernelState* kernel_state,
evt->kernel_state_ = kernel_state; evt->kernel_state_ = kernel_state;
evt->RestoreObject(stream); evt->RestoreObject(stream);
bool signaled = stream->Read<bool>();
evt->manual_reset_ = stream->Read<bool>(); evt->manual_reset_ = stream->Read<bool>();
if (evt->manual_reset_) { if (evt->manual_reset_) {
@@ -95,6 +112,10 @@ object_ref<XEvent> XEvent::Restore(KernelState* kernel_state,
evt->event_ = xe::threading::Event::CreateAutoResetEvent(false); evt->event_ = xe::threading::Event::CreateAutoResetEvent(false);
} }
if (signaled) {
evt->event_->Set();
}
evt->Retain(); evt->Retain();
return object_ref<XEvent>(evt); return object_ref<XEvent>(evt);
} }