From 5d35aa28330fad4da8cce03ed146a261250bc082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 14 Mar 2006 01:54:49 +0000 Subject: [PATCH] I don't think kill_thread() is actually supposed to wait for the thread to be killed. Reverted ShutdownProcess.cpp to continue to use kill_team() instead of sending a signal. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16780 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/registrar/ShutdownProcess.cpp | 4 ++-- src/system/kernel/thread.c | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/servers/registrar/ShutdownProcess.cpp b/src/servers/registrar/ShutdownProcess.cpp index e22c754fd1..6c120b6d7c 100644 --- a/src/servers/registrar/ShutdownProcess.cpp +++ b/src/servers/registrar/ShutdownProcess.cpp @@ -1608,7 +1608,7 @@ ShutdownProcess::_QuitNonApps() PRINT((" killing team %ld\n", teamInfo.team)); #ifdef __HAIKU__ - send_signal(teamInfo.team, SIGKILL); + kill_team(teamInfo.team); #else // We don't want to do this when testing under R5, since it // would kill all teams besides our app server and registrar. @@ -1676,7 +1676,7 @@ ShutdownProcess::_QuitBlockingApp(AppInfoList &list, team_id team, // kill the app PRINT((" killing team %ld\n", team)); - send_signal(team, SIGKILL); + kill_team(team); // remove the app (the roster will note eventually and send us // a notification, but we want to be sure) diff --git a/src/system/kernel/thread.c b/src/system/kernel/thread.c index c179522e29..7c1be1253f 100644 --- a/src/system/kernel/thread.c +++ b/src/system/kernel/thread.c @@ -1498,14 +1498,7 @@ exit_thread(status_t returnValue) status_t kill_thread(thread_id id) { - status_t status = send_signal_etc(id, SIGKILLTHR, B_DO_NOT_RESCHEDULE); - if (status < B_OK) - return status; - - if (id != thread_get_current_thread()->id) - wait_for_thread(id, NULL); - - return status; + return send_signal(id, SIGKILLTHR); }