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

headers: Remove libroot_lock.h.

Browse Source 
Not used (the one file that included it did not actually use it),
and no longer needed with the introduction of user_mutex.
This commit is contained in:
Augustin Cavalier 2020-03-14 15:18:01 -04:00
parent 0ab9c3c538
commit 74592da9a0
2 changed files with 0 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
headers/private/libroot/libroot_lock.h
View File

@ -1,90 +0,0 @@
/*
* Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
* Distributed under the terms of the NewOS License.
*/
#ifndef _LIBROOT_LOCK_H
#define _LIBROOT_LOCK_H
#include <OS.h>
// TODO: Copied from the kernel private lock.h/lock.c. We should somehow make
// that code reusable.
namespace BPrivate {
typedef struct benaphore {
sem_id sem;
int32 count;
} benaphore;
static inline status_t
benaphore_init(benaphore *ben, const char *name)
{
if (ben == NULL || name == NULL)
return B_BAD_VALUE;
ben->count = 1;
ben->sem = create_sem(0, name);
if (ben->sem >= B_OK)
return B_OK;
return ben->sem;
}
static inline status_t
benaphore_lock_etc(benaphore *ben, uint32 flags, bigtime_t timeout)
{
// TODO: This function really shouldn't be used, since timeouts screw the
// benaphore behavior.
if (atomic_add(&ben->count, -1) <= 0)
return acquire_sem_etc(ben->sem, 1, flags, timeout);
return B_OK;
}
static inline status_t
benaphore_lock(benaphore *ben)
{
if (atomic_add(&ben->count, -1) <= 0) {
status_t error;
do {
error = acquire_sem(ben->sem);
} while (error == B_INTERRUPTED);
return error;
}
return B_OK;
}
static inline status_t
benaphore_unlock(benaphore *ben)
{
if (atomic_add(&ben->count, 1) < 0)
return release_sem(ben->sem);
return B_OK;
}
} // namespace BPrivate
using BPrivate::benaphore;
using BPrivate::benaphore_init;
using BPrivate::benaphore_lock_etc;
using BPrivate::benaphore_lock;
using BPrivate::benaphore_unlock;
#endif // _LIBROOT_LOCK_H

1
src/system/libroot/posix/pthread/pthread_rwlock.cpp
View File

@ -10,7 +10,6 @@
#include <Debug.h> #include <Debug.h>
#include <AutoLocker.h> #include <AutoLocker.h>
#include <libroot_lock.h>
#include <syscalls.h> #include <syscalls.h>
#include <user_mutex_defs.h> #include <user_mutex_defs.h>
#include <user_thread.h> #include <user_thread.h>