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

* IsLocked() now also uses the fCachedStack method that check_lock() is

Browse Source 
already using.
* We don't have to try posting _QUIT_ more than once, as it cannot block; the
  looper is local, so direct message passing is used in this case.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23690 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-01-21 18:24:13 +00:00
parent 5fa74667c5
commit 616e68e76c
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Looper.cpp
+9 -16
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2007, Haiku. * Copyright 2001-2008, Haiku.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -461,7 +461,7 @@ BLooper::Quit()
// As with sem in _Lock(), we need to cache this here in case the looper // As with sem in _Lock(), we need to cache this here in case the looper
// disappears before we get to the wait_for_thread() below // disappears before we get to the wait_for_thread() below
thread_id tid = Thread(); thread_id thread = Thread();
// We need to unlock here. Otherwise the looper thread can't // We need to unlock here. Otherwise the looper thread can't
// dispatch the _QUIT_ message we're going to post. // dispatch the _QUIT_ message we're going to post.
@@ -471,21 +471,12 @@ BLooper::Quit()
// our own, the rest of the message queue has to get processed. So // our own, the rest of the message queue has to get processed. So
// we put this in the queue, and when it shows up, we'll call Quit() // we put this in the queue, and when it shows up, we'll call Quit()
// from our own thread. // from our own thread.
// A little testing with BMessageFilter shows _QUIT_ is being used here. // QuitRequested() will not be called in this case.
// I got suspicious when my test QuitRequested() wasn't getting called PostMessage(_QUIT_);
// when Quit() was invoked from another thread. Makes a nice proof that
// this is how it's handled, too.
while (PostMessage(_QUIT_) == B_WOULD_BLOCK) {
// There's a slight chance that PostMessage() will return B_WOULD_BLOCK
// because the port is full, so we'll wait a bit and re-post until
// we won't block.
snooze(25000);
}
// We have to wait until the looper is done processing any remaining messages. // We have to wait until the looper is done processing any remaining messages.
int32 temp; status_t status;
while (wait_for_thread(tid, &temp) == B_INTERRUPTED) while (wait_for_thread(thread, &status) == B_INTERRUPTED)
; ;
} }
@@ -547,7 +538,9 @@ BLooper::IsLocked() const
return false; return false;
} }
return find_thread(NULL) == fOwner; uint32 stack;
return ((uint32)&stack & ~(B_PAGE_SIZE - 1)) == fCachedStack
|| find_thread(NULL) == fOwner;
} }