i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thread_exit(): Postpone deleting the thread's user stack until after sending

Browse Source 
the thread's death notifications. The fixes issues where other threads depend
on objects on its stack (particularly relevant for the main thread). Fixes
#6315.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37509 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-07-14 01:20:58 +00:00
parent 737b989128
commit 3121f39481
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/thread.cpp
+17 -3
View File
@@ -1389,11 +1389,11 @@ thread_exit(void)
// Cancel previously installed alarm timer, if any
cancel_timer(&thread->alarm);
// delete the user stack area first, we won't need it anymore
// remember the user stack area -- we will delete it below
area_id userStackArea = -1;
if (team->address_space != NULL && thread->user_stack_area >= 0) {
area_id area = thread->user_stack_area;
userStackArea = thread->user_stack_area;
thread->user_stack_area = -1;
vm_delete_area(team->id, area, true);
}
struct job_control_entry *death = NULL;
@@ -1588,6 +1588,20 @@ thread_exit(void)
delete_sem(cachedExitSem);
}
// delete the user stack, if this was a user thread
if (!deleteTeam && userStackArea >= 0) {
// We postponed deleting the user stack until now, since this way all
// notifications for the thread's death are out already and all other
// threads waiting for this thread's death and some object on its stack
// will wake up before we (try to) delete the stack area. Of most
// relevance is probably the case where this is the main thread and
// other threads use objects on its stack -- so we want them terminated
// first.
// When the team is deleted, all areas are deleted anyway, so we don't
// need to do that explicitly in that case.
vm_delete_area(teamID, userStackArea, true);
}
// notify the debugger
if (teamID != team_get_kernel_team_id())
user_debug_thread_deleted(teamID, thread->id);