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

* no longer reschedule after releasing the bits lock.

Browse Source 
* LockBits() now fails with B_BUSY in case the current buffer is NULL.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21513 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-06-27 12:10:46 +00:00
parent 117b384e5e
commit c5812d39a5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Bitmap.cpp
+8 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2006, Haiku Inc. * Copyright 2001-2007, Haiku Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -420,6 +420,12 @@ BBitmap::LockBits(uint32 *state)
status = acquire_sem(data->lock); status = acquire_sem(data->lock);
} while (status == B_INTERRUPTED); } while (status == B_INTERRUPTED);
if (data->buffer == NULL) {
// the app_server does not grant us access to the frame buffer
// right now - let's release the lock and fail
release_sem_etc(data->lock, 1, B_DO_NOT_RESCHEDULE);
return B_BUSY;
}
return status; return status;
} }
@@ -442,7 +448,7 @@ BBitmap::UnlockBits()
return; return;
overlay_client_data* data = (overlay_client_data*)fBasePointer; overlay_client_data* data = (overlay_client_data*)fBasePointer;
release_sem(data->lock); release_sem_etc(data->lock, 1, B_DO_NOT_RESCHEDULE);
} }