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

* Replaced cutex::release_count by flags field. It is only one thread

Browse Source 
that can unlock the mutex, so one bit is sufficient.
* Added cutex_init_etc() which has an additional "flags" parameter.
  The only specifyable flag is CUTEX_FLAG_CLONE_NAME, which causes the
  function to strdup() the given name and free() its copy in
  cutex_destroy().
* cutex_destroy() does now unblock waiting threads.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25280 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-05-01 18:06:09 +00:00
parent 2988eab3dc
commit ee96aa8f6e
2 changed files with 94 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/lock.h
+10 -5
View File
@@ -49,9 +49,11 @@ typedef struct cutex {
#else
int32 count;
#endif
int32 release_count;
uint8 flags;
} cutex;
#define CUTEX_FLAG_CLONE_NAME 0x1
#if 0 && KDEBUG // XXX disable this for now, it causes problems when including thread.h here
# include <thread.h>
@@ -121,22 +123,24 @@ extern status_t rw_lock_write_unlock(rw_lock *lock);
extern void cutex_init(cutex* lock, const char *name);
// name is *not* cloned nor freed in cutex_destroy()
extern void cutex_init_etc(cutex* lock, const char *name, uint32 flags);
extern void cutex_destroy(cutex* lock);
// implementation private:
extern void _cutex_lock(cutex* lock);
extern status_t _cutex_lock(cutex* lock);
extern void _cutex_unlock(cutex* lock);
extern status_t _cutex_trylock(cutex* lock);
static inline void
static inline status_t
cutex_lock(cutex* lock)
{
#ifdef KDEBUG
_cutex_lock(lock);
return _cutex_lock(lock);
#else
if (atomic_add(&lock->count, -1) < 0)
_cutex_lock(lock);
return _cutex_lock(lock);
return B_OK;
#endif
}
@@ -149,6 +153,7 @@ cutex_trylock(cutex* lock)
#else
if (atomic_test_and_set(&lock->count, -1, 0) != 0)
return B_WOULD_BLOCK;
return B_OK;
#endif
}