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

XThread set exit code on exit

Browse Source
This commit is contained in:
Dr. Chat
2015-07-24 23:09:33 -05:00
parent c536053dec
commit 64089558f1
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xenia/kernel/objects/xthread.cc
View File

@@ -321,7 +321,8 @@ X_STATUS XThread::Create() {
// Set the thread name based on host ID (for easier debugging)
char thread_name[32];
snprintf(thread_name, xe::countof(thread_name), "XThread%04X (%04X)", handle(), thread_->id());
snprintf(thread_name, xe::countof(thread_name), "XThread%04X (%04X)",
handle(), thread_->id());
set_name(thread_name);
if (creation_params_.creation_flags & 0x60) {
@@ -340,8 +341,6 @@ X_STATUS XThread::Exit(int exit_code) {
// This may only be called on the thread itself.
assert_true(XThread::GetCurrentThread() == this);
// TODO(benvanik): set exit code in thread state block
// TODO(benvanik); dispatch events? waiters? etc?
RundownAPCs();
@@ -351,6 +350,11 @@ X_STATUS XThread::Exit(int exit_code) {
current_thread_tls = nullptr;
xe::Profiler::ThreadExit();
// Set exit code
X_KTHREAD* thread = guest_object<X_KTHREAD>();
thread->header.signal_state = 1;
thread->exit_status = exit_code;
running_ = false;
Release();
ReleaseHandle();
@@ -363,6 +367,11 @@ X_STATUS XThread::Exit(int exit_code) {
X_STATUS XThread::Terminate(int exit_code) {
// TODO: Inform the profiler that this thread is exiting.
// Set exit code
X_KTHREAD* thread = guest_object<X_KTHREAD>();
thread->header.signal_state = 1;
thread->exit_status = exit_code;
running_ = false;
Release();
ReleaseHandle();