ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix XSemaphores saving/restoring a bad counter

This commit is contained in:
Dr. Chat 2015-12-27 17:14:49 -06:00 committed by Ben Vanik
parent d4da8cab4e
commit fefc2036b3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/xenia/kernel/xsemaphore.cc
View File

@ -57,14 +57,13 @@ bool XSemaphore::Save(ByteStream* stream) {
free_count++; free_count++;
} }
uint32_t used_count = maximum_count_ - free_count; XELOGD("XSemaphore %.8X (count %d/%d)", handle(), free_count, maximum_count_);
XELOGD("XSemaphore %.8X (count %d/%d)", handle(), used_count, maximum_count_);
// Restore the semaphore back to its previous count. // Restore the semaphore back to its previous count.
semaphore_->Release(free_count, nullptr); semaphore_->Release(free_count, nullptr);
stream->Write(maximum_count_); stream->Write(maximum_count_);
stream->Write(used_count); stream->Write(free_count);
return true; return true;
} }
@ -79,12 +78,12 @@ object_ref<XSemaphore> XSemaphore::Restore(KernelState* kernel_state,
} }
sem->maximum_count_ = stream->Read<uint32_t>(); sem->maximum_count_ = stream->Read<uint32_t>();
auto initial_count = stream->Read<uint32_t>(); auto free_count = stream->Read<uint32_t>();
XELOGD("XSemaphore %.8X (count %d/%d)", sem->handle(), initial_count, XELOGD("XSemaphore %.8X (count %d/%d)", sem->handle(), free_count,
sem->maximum_count_); sem->maximum_count_);
sem->semaphore_ = sem->semaphore_ =
threading::Semaphore::Create(initial_count, sem->maximum_count_); threading::Semaphore::Create(free_count, sem->maximum_count_);
return object_ref<XSemaphore>(sem); return object_ref<XSemaphore>(sem);
} }