summaryrefslogtreecommitdiff
path: root/src/components/utils/src/lock_posix.cc
diff options
context:
space:
mode:
authorConlain Kelly <conlain.k@gmail.com>2018-06-25 16:56:02 -0400
committerConlain Kelly <conlain.k@gmail.com>2018-06-25 16:56:02 -0400
commit8ab148e256a02040d27673770f8ef7b60acf2745 (patch)
tree1aa366d86e0269e2466397314a89e2163e6ddb24 /src/components/utils/src/lock_posix.cc
parent3a8340c86bbaae60fc17f8ca8cbd03c1da193dc3 (diff)
downloadsdl_core-8ab148e256a02040d27673770f8ef7b60acf2745.tar.gz
undo dumb style changes
Diffstat (limited to 'src/components/utils/src/lock_posix.cc')
-rw-r--r--src/components/utils/src/lock_posix.cc22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/components/utils/src/lock_posix.cc b/src/components/utils/src/lock_posix.cc
index 9b63ea4218..e5e6d7fad0 100644
--- a/src/components/utils/src/lock_posix.cc
+++ b/src/components/utils/src/lock_posix.cc
@@ -30,14 +30,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "utils/lock.h"
#include <errno.h>
-#include <signal.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <cstring>
-#include <iostream>
-#include "utils/lock.h"
#include "utils/logger.h"
namespace sync_primitives {
@@ -71,9 +69,9 @@ Lock::~Lock() {
#endif
int32_t status = pthread_mutex_destroy(&mutex_);
if (status != 0) {
- LOG4CXX_FATAL(
- logger_,
- "Failed to destroy mutex " << &mutex_ << ": " << strerror(status));
+ LOG4CXX_FATAL(logger_,
+ "Failed to destroy mutex " << &mutex_ << ": "
+ << strerror(status));
NOTREACHED();
}
}
@@ -81,9 +79,9 @@ Lock::~Lock() {
void Lock::Acquire() {
const int32_t status = pthread_mutex_lock(&mutex_);
if (status != 0) {
- LOG4CXX_FATAL(
- logger_,
- "Failed to acquire mutex " << &mutex_ << ": " << strerror(status));
+ LOG4CXX_FATAL(logger_,
+ "Failed to acquire mutex " << &mutex_ << ": "
+ << strerror(status));
NOTREACHED();
} else {
AssertFreeAndMarkTaken();
@@ -94,9 +92,9 @@ void Lock::Release() {
AssertTakenAndMarkFree();
const int32_t status = pthread_mutex_unlock(&mutex_);
if (status != 0) {
- LOG4CXX_FATAL(
- logger_,
- "Failed to unlock mutex" << &mutex_ << ": " << strerror(status));
+ LOG4CXX_FATAL(logger_,
+ "Failed to unlock mutex" << &mutex_ << ": "
+ << strerror(status));
NOTREACHED();
}
}