summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Watkins <noahwatkins@gmail.com>2013-07-20 18:41:39 -0700
committerNoah Watkins <noahwatkins@gmail.com>2013-07-22 19:54:37 -0700
commit88f4a962e13335450fdd87131aa059686b26aede (patch)
tree1b2bb5d6ed4be7e0fb0d1278b906248ffefe4fd8
parent2c5b68c38385044f006d8cc60fe9a7563d85b9c0 (diff)
downloadceph-88f4a962e13335450fdd87131aa059686b26aede.tar.gz
log: remove unused lock
m_lock is initialized and destroyed, but never used. Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
-rw-r--r--src/log/Log.cc4
-rw-r--r--src/log/Log.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/src/log/Log.cc b/src/log/Log.cc
index e06afbfe1e2..afeb1208002 100644
--- a/src/log/Log.cc
+++ b/src/log/Log.cc
@@ -42,9 +42,6 @@ Log::Log(SubsystemMap *s)
{
int ret;
- ret = pthread_spin_init(&m_lock, PTHREAD_PROCESS_SHARED);
- assert(ret == 0);
-
ret = pthread_mutex_init(&m_flush_mutex, NULL);
assert(ret == 0);
@@ -73,7 +70,6 @@ Log::~Log()
if (m_fd >= 0)
TEMP_FAILURE_RETRY(::close(m_fd));
- pthread_spin_destroy(&m_lock);
pthread_mutex_destroy(&m_queue_mutex);
pthread_mutex_destroy(&m_flush_mutex);
pthread_cond_destroy(&m_cond_loggers);
diff --git a/src/log/Log.h b/src/log/Log.h
index f6a27dc5b37..b5e16fdde79 100644
--- a/src/log/Log.h
+++ b/src/log/Log.h
@@ -21,7 +21,6 @@ class Log : private Thread
SubsystemMap *m_subs;
- pthread_spinlock_t m_lock;
pthread_mutex_t m_queue_mutex;
pthread_mutex_t m_flush_mutex;
pthread_cond_t m_cond_loggers;