projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: whitespace
[oota-llvm.git]
/
lib
/
Support
/
Mutex.cpp
diff --git
a/lib/Support/Mutex.cpp
b/lib/Support/Mutex.cpp
index da5baab4be468bc73c1cce1d70b6f1b1aaeed71c..c8d3844d0c9618a19133836c06aabac831f42e35 100644
(file)
--- a/
lib/Support/Mutex.cpp
+++ b/
lib/Support/Mutex.cpp
@@
-42,7
+42,7
@@
using namespace sys;
// Construct a Mutex using pthread calls
MutexImpl::MutexImpl( bool recursive)
// Construct a Mutex using pthread calls
MutexImpl::MutexImpl( bool recursive)
- : data_(
0
)
+ : data_(
nullptr
)
{
// Declare the pthread_mutex data structures
pthread_mutex_t* mutex =
{
// Declare the pthread_mutex data structures
pthread_mutex_t* mutex =
@@
-59,12
+59,6
@@
MutexImpl::MutexImpl( bool recursive)
errorcode = pthread_mutexattr_settype(&attr, kind);
assert(errorcode == 0);
errorcode = pthread_mutexattr_settype(&attr, kind);
assert(errorcode == 0);
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- // Make it a process local mutex
- errorcode = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
- assert(errorcode == 0);
-#endif
-
// Initialize the mutex
errorcode = pthread_mutex_init(mutex, &attr);
assert(errorcode == 0);
// Initialize the mutex
errorcode = pthread_mutex_init(mutex, &attr);
assert(errorcode == 0);
@@
-81,7
+75,7
@@
MutexImpl::MutexImpl( bool recursive)
MutexImpl::~MutexImpl()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
MutexImpl::~MutexImpl()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
- assert(mutex !=
0
);
+ assert(mutex !=
nullptr
);
pthread_mutex_destroy(mutex);
free(mutex);
}
pthread_mutex_destroy(mutex);
free(mutex);
}
@@
-90,7
+84,7
@@
bool
MutexImpl::acquire()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
MutexImpl::acquire()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
- assert(mutex !=
0
);
+ assert(mutex !=
nullptr
);
int errorcode = pthread_mutex_lock(mutex);
return errorcode == 0;
int errorcode = pthread_mutex_lock(mutex);
return errorcode == 0;
@@
-100,7
+94,7
@@
bool
MutexImpl::release()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
MutexImpl::release()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
- assert(mutex !=
0
);
+ assert(mutex !=
nullptr
);
int errorcode = pthread_mutex_unlock(mutex);
return errorcode == 0;
int errorcode = pthread_mutex_unlock(mutex);
return errorcode == 0;
@@
-110,7
+104,7
@@
bool
MutexImpl::tryacquire()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
MutexImpl::tryacquire()
{
pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data_);
- assert(mutex !=
0
);
+ assert(mutex !=
nullptr
);
int errorcode = pthread_mutex_trylock(mutex);
return errorcode == 0;
int errorcode = pthread_mutex_trylock(mutex);
return errorcode == 0;