Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Quit():

Browse Source 
* Error message, if not locked.
* Lock(), quit, Unlock(), if not locked.
* Don't call BLooper:Quit() any more. We post a _QUIT_ message when being
  called from another than the looper thread.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@575 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2002-08-05 00:41:08 +00:00
parent ff952bade4
commit 98207f6f77
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/kits/app/Application.cpp
View File

@ -285,24 +285,41 @@ thread_id BApplication::Run()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BApplication::Quit() void BApplication::Quit()
{ {
bool unlock = false;
if (!IsLocked()) { if (!IsLocked()) {
const char* name = Name(); const char* name = Name();
if (!name) if (!name)
name = "no-name"; name = "no-name";
printf("ERROR - you must Lock a looper before calling Quit(), " printf("ERROR - you must Lock the application object before calling "
"team=%ld, looper=%s", Team(), name); "Quit(), team=%ld, looper=%s\n", Team(), name);
unlock = true;
if (!Lock())
return;
} }
// Set the termination flag. That's sufficient in some cases.
fTerminating = true;
// Delete the object, if not running only. // Delete the object, if not running only.
if (!fRunCalled) if (!fRunCalled) {
delete this; delete this;
// In case another thread called Quit(), things are a bit more complicated. } else if (find_thread(NULL) != fTaskID) {
// BLooper::Quit() handles that gracefully. // We are not the looper thread.
else if (find_thread(NULL) != fTaskID) // We push a _QUIT_ into the queue.
BLooper::Quit(); // TODO: When BLooper::AddMessage() is done, use that instead of
// prevent the BLooper destructor from killing the main thread // PostMessage()??? This would overtake messages that are still at
fTaskID = -1; // the port.
// NOTE: We must not unlock here -- otherwise we had to re-lock, which
// may not work. This is bad, since, if the port is full, it
// won't get emptier, as the looper thread needs to lock the object
// before dispatching messages.
while (PostMessage(_QUIT_, this) == B_WOULD_BLOCK)
snooze(10000);
} else {
// We are the looper thread.
// Just set fTerminating to true which makes us fall through the
// message dispatching loop and return from Run().
fTerminating = true;
}
// If we had to lock the object, unlock now.
if (unlock)
Unlock();
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool BApplication::QuitRequested() bool BApplication::QuitRequested()