Changeset 22510

Timestamp:

10/11/07 13:55:27 (14 months ago)

Author:

axeld

Message:

Updated to latest kernel versions.

Files:

• haiku/trunk/src/tests/add-ons/kernel/kernelland_emu.cpp (modified) (4 diffs)

haiku/trunk/src/tests/add-ons/kernel/kernelland_emu.cpp

@@ -821 +821 @@
 
 
-int
+int32
 recursive_lock_get_recursion(recursive_lock *lock)
 {
@@ -864 +864 @@
 
 
-bool
+status_t
 recursive_lock_lock(recursive_lock *lock)
 {
-        thread_id thid = find_thread(NULL);
-        bool retval = false;
-
-        if (thid != lock->holder) {
-                acquire_sem(lock->sem);
-                
-                lock->holder = thid;
-                retval = true;
+        thread_id thread = find_thread(NULL);
+
+        if (thread != lock->holder) {
+                status_t status = acquire_sem(lock->sem);
+                if (status < B_OK)
+                        return status;
+
+                lock->holder = thread;
         }
         lock->recursion++;
-        return retval;
-}
-
-
-bool
+        return B_OK;
+}
+
+
+void
 recursive_lock_unlock(recursive_lock *lock)
 {
-        thread_id thid = find_thread(NULL);
-        bool retval = false;
-
-        if (thid != lock->holder)
+        if (find_thread(NULL) != lock->holder)
                 panic("recursive_lock %p unlocked by non-holder thread!\n", lock);
 
         if (--lock->recursion == 0) {
                 lock->holder = -1;
-                release_sem(lock->sem);
-                retval = true;
-        }
-        return retval;
+                release_sem_etc(lock->sem, 1, 0/*B_DO_NOT_RESCHEDULE*/);
+        }
 }
 
@@ -935 +930 @@
 
 
-void
+status_t
 mutex_lock(mutex *mutex)
 {
@@ -942 +937 @@
         // ToDo: if acquire_sem() fails, we shouldn't panic - but we should definitely
         //      change the mutex API to actually return the status code
-        if (acquire_sem(mutex->sem) == B_OK) {
-                if (me == mutex->holder)
-                        panic("mutex_lock failure: mutex %p (sem = 0x%lx) acquired twice by thread 0x%lx\n", mutex, mutex->sem, me);
-        }
+        status_t status = acquire_sem(mutex->sem);
+        if (status < B_OK)
+                return status;
+
+        if (me == mutex->holder)
+                panic("mutex_lock failure: mutex %p (sem = 0x%lx) acquired twice by thread 0x%lx\n", mutex, mutex->sem, me);
 
         mutex->holder = me;
+        return B_OK;
 }