[haiku-commits] r34341 - in haiku/trunk: headers/private/shared src/system/libroot/os

From: ingo_weinhold@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 29 Nov 2009 12:14:50 +0100 (CET)
Author: bonefish
Date: 2009-11-29 12:14:50 +0100 (Sun, 29 Nov 2009)
New Revision: 34341
Changeset: http://dev.haiku-os.org/changeset/34341/haiku

Modified:
   haiku/trunk/headers/private/shared/locks.h
   haiku/trunk/src/system/libroot/os/locks.cpp
Log:
Added a lazy_recursive_lock implementation -- identical to recursive_lock,
just using a lazy_mutex instead.


Modified: haiku/trunk/headers/private/shared/locks.h
===================================================================
--- haiku/trunk/headers/private/shared/locks.h  2009-11-29 10:47:01 UTC (rev 
34340)
+++ haiku/trunk/headers/private/shared/locks.h  2009-11-29 11:14:50 UTC (rev 
34341)
@@ -60,13 +60,27 @@
        int                     recursion;
 } recursive_lock;
 
-extern status_t        recursive_lock_init(recursive_lock *lock, const char 
*name);
-extern void recursive_lock_destroy(recursive_lock *lock);
-extern status_t recursive_lock_lock(recursive_lock *lock);
-extern status_t recursive_lock_trylock(recursive_lock *lock);
-extern void recursive_lock_unlock(recursive_lock *lock);
-extern int32 recursive_lock_get_recursion(recursive_lock *lock);
+status_t       recursive_lock_init(recursive_lock *lock, const char *name);
+void           recursive_lock_destroy(recursive_lock *lock);
+status_t       recursive_lock_lock(recursive_lock *lock);
+void           recursive_lock_unlock(recursive_lock *lock);
+int32          recursive_lock_get_recursion(recursive_lock *lock);
 
+
+typedef struct lazy_recursive_lock {
+       lazy_mutex      lock;
+       thread_id       holder;
+       int                     recursion;
+} lazy_recursive_lock;
+
+status_t       lazy_recursive_lock_init(lazy_recursive_lock *lock,
+                               const char *name);
+                               // name will not be cloned and must rename valid
+void           lazy_recursive_lock_destroy(lazy_recursive_lock *lock);
+status_t       lazy_recursive_lock_lock(lazy_recursive_lock *lock);
+void           lazy_recursive_lock_unlock(lazy_recursive_lock *lock);
+int32          lazy_recursive_lock_get_recursion(lazy_recursive_lock *lock);
+
 #ifdef __cplusplus
 } // extern "C"
 

Modified: haiku/trunk/src/system/libroot/os/locks.cpp
===================================================================
--- haiku/trunk/src/system/libroot/os/locks.cpp 2009-11-29 10:47:01 UTC (rev 
34340)
+++ haiku/trunk/src/system/libroot/os/locks.cpp 2009-11-29 11:14:50 UTC (rev 
34341)
@@ -427,3 +427,65 @@
                mutex_unlock(&lock->lock);
        }
 }
+
+
+// #pragma mark - lazy recursive lock
+
+
+int32
+lazy_recursive_lock_get_recursion(lazy_recursive_lock *lock)
+{
+       if (lock->holder == find_thread(NULL))
+               return lock->recursion;
+
+       return -1;
+}
+
+
+status_t
+lazy_recursive_lock_init(lazy_recursive_lock *lock, const char *name)
+{
+       lock->holder = -1;
+       lock->recursion = 0;
+       return lazy_mutex_init(&lock->lock, name != NULL ? name : "recursive 
lock");
+}
+
+
+void
+lazy_recursive_lock_destroy(lazy_recursive_lock *lock)
+{
+       if (lock == NULL)
+               return;
+
+       lazy_mutex_destroy(&lock->lock);
+}
+
+
+status_t
+lazy_recursive_lock_lock(lazy_recursive_lock *lock)
+{
+       thread_id thread = find_thread(NULL);
+
+       if (thread != lock->holder) {
+               lazy_mutex_lock(&lock->lock);
+               lock->holder = thread;
+       }
+
+       lock->recursion++;
+       return B_OK;
+}
+
+
+void
+lazy_recursive_lock_unlock(lazy_recursive_lock *lock)
+{
+       if (find_thread(NULL) != lock->holder) {
+               debugger("lazy_recursive_lock unlocked by non-holder 
thread!\n");
+               return;
+       }
+
+       if (--lock->recursion == 0) {
+               lock->holder = -1;
+               lazy_mutex_unlock(&lock->lock);
+       }
+}
[haiku-commits] r34341 - in haiku/trunk: headers/private/shared src/system/libroot/os

Other related posts:
