summaryrefslogtreecommitdiff
path: root/media/libcubeb/src/cubeb_utils_unix.h
diff options
context:
space:
mode:
Diffstat (limited to 'media/libcubeb/src/cubeb_utils_unix.h')
-rw-r--r--media/libcubeb/src/cubeb_utils_unix.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/media/libcubeb/src/cubeb_utils_unix.h b/media/libcubeb/src/cubeb_utils_unix.h
index b6618ca45e..80219d58b1 100644
--- a/media/libcubeb/src/cubeb_utils_unix.h
+++ b/media/libcubeb/src/cubeb_utils_unix.h
@@ -8,12 +8,13 @@
#if !defined(CUBEB_UTILS_UNIX)
#define CUBEB_UTILS_UNIX
-#include <errno.h>
#include <pthread.h>
+#include <errno.h>
#include <stdio.h>
/* This wraps a critical section to track the owner in debug mode. */
-class owned_critical_section {
+class owned_critical_section
+{
public:
owned_critical_section()
{
@@ -28,7 +29,7 @@ public:
#ifndef NDEBUG
int r =
#endif
- pthread_mutex_init(&mutex, &attr);
+ pthread_mutex_init(&mutex, &attr);
#ifndef NDEBUG
assert(r == 0);
#endif
@@ -41,29 +42,29 @@ public:
#ifndef NDEBUG
int r =
#endif
- pthread_mutex_destroy(&mutex);
+ pthread_mutex_destroy(&mutex);
#ifndef NDEBUG
assert(r == 0);
#endif
}
- void lock()
+ void enter()
{
#ifndef NDEBUG
int r =
#endif
- pthread_mutex_lock(&mutex);
+ pthread_mutex_lock(&mutex);
#ifndef NDEBUG
assert(r == 0 && "Deadlock");
#endif
}
- void unlock()
+ void leave()
{
#ifndef NDEBUG
int r =
#endif
- pthread_mutex_unlock(&mutex);
+ pthread_mutex_unlock(&mutex);
#ifndef NDEBUG
assert(r == 0 && "Unlocking unlocked mutex");
#endif
@@ -81,8 +82,8 @@ private:
pthread_mutex_t mutex;
// Disallow copy and assignment because pthread_mutex_t cannot be copied.
- owned_critical_section(const owned_critical_section &);
- owned_critical_section & operator=(const owned_critical_section &);
+ owned_critical_section(const owned_critical_section&);
+ owned_critical_section& operator=(const owned_critical_section&);
};
#endif /* CUBEB_UTILS_UNIX */