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

* Minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32758 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-08-27 14:36:31 +00:00
parent 88cf71d26a
commit 6f6dceac96
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/Locker.cpp
+17 -27
View File
@@ -1,11 +1,13 @@
/* /*
* Copyright (c) 2001-2005, Haiku, Inc. * Copyright 2001-2009, Haiku, Inc.
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
* *
* Author: Erik Jaesler <[email protected]> * Authors:
* Erik Jaesler <[email protected]>
*/ */
/** Semaphore-type class for thread safety */
/*! Semaphore-type class for thread safety */
#include <OS.h> #include <OS.h>
@@ -14,7 +16,7 @@
#include "support_kit_config.h" #include "support_kit_config.h"
//
// Data Member Documentation: // Data Member Documentation:
// //
// The "fBenaphoreCount" member is set to 1 if the BLocker style is // The "fBenaphoreCount" member is set to 1 if the BLocker style is
@@ -40,13 +42,6 @@
// //
//
// Constructors:
//
// All constructors just pass their arguments to InitLocker(). Note that
// the default for "name" is "some BLocker" and "benaphore_style" is true.
//
BLocker::BLocker() BLocker::BLocker()
{ {
InitLocker(NULL, true); InitLocker(NULL, true);
@@ -71,11 +66,10 @@ BLocker::BLocker(const char *name, bool benaphoreStyle)
} }
// /*! This constructor is not documented. The final argument is ignored for
// This constructor is not documented. The final argument is ignored for now. In Be's headers, its called "for_IPC". DO NOT USE THIS
// now. In Be's headers, its called "for_IPC". DO NOT USE THIS CONSTRUCTOR!
// CONSTRUCTOR! */
//
BLocker::BLocker(const char *name, bool benaphoreStyle, BLocker::BLocker(const char *name, bool benaphoreStyle,
bool) bool)
{ {
@@ -83,10 +77,6 @@ BLocker::BLocker(const char *name, bool benaphoreStyle,
} }
//
// The destructor just deletes the semaphore. By deleting the semaphore,
// any threads waiting to acquire the BLocker will be unblocked.
//
BLocker::~BLocker() BLocker::~BLocker()
{ {
delete_sem(fSemaphoreID); delete_sem(fSemaphoreID);
@@ -101,7 +91,7 @@ BLocker::InitCheck() const
bool bool
BLocker::Lock(void) BLocker::Lock()
{ {
status_t result; status_t result;
return AcquireLock(B_INFINITE_TIMEOUT, &result); return AcquireLock(B_INFINITE_TIMEOUT, &result);
@@ -120,7 +110,7 @@ BLocker::LockWithTimeout(bigtime_t timeout)
void void
BLocker::Unlock(void) BLocker::Unlock()
{ {
// If the thread currently holds the lockdecrement // If the thread currently holds the lockdecrement
if (IsLocked()) { if (IsLocked()) {
@@ -153,14 +143,14 @@ BLocker::Unlock(void)
thread_id thread_id
BLocker::LockingThread(void) const BLocker::LockingThread() const
{ {
return fLockOwner; return fLockOwner;
} }
bool bool
BLocker::IsLocked(void) const BLocker::IsLocked() const
{ {
// This member returns true if the calling thread holds the lock. // This member returns true if the calling thread holds the lock.
// The easiest way to determine this is to compare the result of // The easiest way to determine this is to compare the result of
@@ -170,21 +160,21 @@ BLocker::IsLocked(void) const
int32 int32
BLocker::CountLocks(void) const BLocker::CountLocks() const
{ {
return fRecursiveCount; return fRecursiveCount;
} }
int32 int32
BLocker::CountLockRequests(void) const BLocker::CountLockRequests() const
{ {
return fBenaphoreCount; return fBenaphoreCount;
} }
sem_id sem_id
BLocker::Sem(void) const BLocker::Sem() const
{ {
return fSemaphoreID; return fSemaphoreID;
} }