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

Fix libkernelland_emu build after ConditionVariable and devfs changes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33736 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2009-10-22 23:50:15 +00:00
parent f28dd36b82
commit 4f5d9ca63d
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tests/add-ons/kernel/kernelland_emu/condition_variable.cpp
View File

@ -173,7 +173,7 @@ ConditionVariable::Unpublish(bool threadsLocked)
fObjectType = NULL; fObjectType = NULL;
if (!fEntries.IsEmpty()) if (!fEntries.IsEmpty())
_NotifyChecked(true, B_ENTRY_NOT_FOUND); _NotifyLocked(true, B_ENTRY_NOT_FOUND);
} }
@ -194,12 +194,18 @@ ConditionVariable::Wait(uint32 flags, bigtime_t timeout)
void void
ConditionVariable::_Notify(bool all, bool threadsLocked) ConditionVariable::_Notify(bool all, bool threadsLocked, status_t result)
{ {
MutexLocker locker(sConditionVariablesLock); MutexLocker locker(sConditionVariablesLock);
if (!fEntries.IsEmpty()) if (!fEntries.IsEmpty()) {
_NotifyChecked(all, B_OK); if (result > B_OK) {
panic("tried to notify with invalid result %ld\n", result);
result = B_ERROR;
}
_NotifyLocked(all, result);
}
} }
@ -207,7 +213,7 @@ ConditionVariable::_Notify(bool all, bool threadsLocked)
thread lock held. thread lock held.
*/ */
void void
ConditionVariable::_NotifyChecked(bool all, status_t result) ConditionVariable::_NotifyLocked(bool all, status_t result)
{ {
// dequeue and wake up the blocked threads // dequeue and wake up the blocked threads
while (ConditionVariableEntry* entry = fEntries.RemoveHead()) { while (ConditionVariableEntry* entry = fEntries.RemoveHead()) {

4
src/tests/add-ons/kernel/kernelland_emu/device_manager.cpp
View File

@ -13,9 +13,9 @@
extern "C" status_t extern "C" status_t
devfs_unpublish_partition(const char *path) devfs_unpublish_partition(const char *devicePath, const char *name)
{ {
printf("unpublish partition: %s\n", path); printf("unpublish partition: %s/%s\n", devicePath, name);
return B_OK; return B_OK;
} }