Remove unused debug lock code

Change-Id: I05dd8370dbd2590f87533fe3dd87af7e8a69cfa7
Signed-off-by: TaeminYeom <taemin.yeom@samsung.com>

diff --git a/src/shared/lock.cpp b/src/shared/lock.cpp
index 650e5c7..9e6836f 100644 (file)
--- a/src/shared/lock.cpp
+++ b/src/shared/lock.cpp
@@ -41,84 +41,17 @@ cmutex::~cmutex()
 
 void cmutex::lock(void)
 {
-#ifdef _LOCK_DEBUG
-       lock("mutex", __MODULE__, __func__, __LINE__);
-#else
-       lock_impl();
-#endif
-}
-
-void cmutex::lock(const char* expr, const char *module, const char *func, int line)
-{
-       int ret = 0;
-       char m_curent_info[OWNER_INFO_LEN];
-       struct timeval sv;
-       unsigned long long lock_waiting_start_time = 0;
-       unsigned long long lock_acquired_time = 0;
-       unsigned long long waiting_time = 0;
-
-       snprintf(m_curent_info, OWNER_INFO_LEN, "%s:%s(%d)", module, func, line);
-
-       ret = try_lock_impl();
-
-       if (ret == 0) {
-               pthread_mutex_lock(&m_mutex);
-               snprintf(m_owner_info, OWNER_INFO_LEN, "%s", m_curent_info);
-               pthread_mutex_unlock(&m_mutex);
-               return;
-       }
-
-       gettimeofday(&sv, NULL);
-       lock_waiting_start_time = MICROSECONDS(sv);
-
        pthread_mutex_lock(&m_mutex);
-       _I("%s is waiting for getting %s(%p) owned in %s",
-               m_curent_info, expr, this, m_owner_info);
-       pthread_mutex_unlock(&m_mutex);
-
-       lock_impl();
-
-       gettimeofday(&sv, NULL);
-       lock_acquired_time = MICROSECONDS(sv);
-
-       waiting_time = lock_acquired_time - lock_waiting_start_time;
-
-       pthread_mutex_lock(&m_mutex);
-       _I("%s acquires lock after waiting %lluus, %s(%p) was previously owned in %s",
-               m_curent_info, waiting_time, expr, this, m_owner_info);
-       snprintf(m_owner_info, OWNER_INFO_LEN, "%s", m_curent_info);
-       pthread_mutex_unlock(&m_mutex);
 }
 
 void cmutex::unlock(void)
 {
-       unlock_impl();
+       pthread_mutex_unlock(&m_mutex);
 }
 
 int cmutex::try_lock(void)
 {
-       return try_lock_impl();
-}
-
-int cmutex::lock_impl(void)
-{
-       return pthread_mutex_lock(&m_mutex);
-}
-
-int cmutex::try_lock_impl(void)
-{
-       return pthread_mutex_trylock(&m_mutex);
-}
-
-int cmutex::unlock_impl(void)
-{
-       return pthread_mutex_unlock(&m_mutex);
-}
-
-Autolock::Autolock(cmutex &m, const char* expr, const char *module, const char *func, int line)
-: m_lock(m)
-{
-       m_lock.lock(expr, module, func, line);
+       pthread_mutex_trylock(&m_mutex);
 }
 
 Autolock::Autolock(cmutex &m)

diff --git a/src/shared/lock.h b/src/shared/lock.h
index 3961779..2aa8ceb 100644 (file)
--- a/src/shared/lock.h
+++ b/src/shared/lock.h
@@ -28,15 +28,9 @@ namespace sensor {
 #define MICROSECONDS(tv) ((tv.tv_sec * 1000000ll) + tv.tv_usec)
 #endif
 
-#ifdef _LOCK_DEBUG
-#define AUTOLOCK(x)      Autolock x##_autolock((x), #x, __MODULE__, __func__, __LINE__)
-#define LOCK(x)          (x).lock(#x, __MODULE__, __func__, __LINE__)
-#define UNLOCK(x)        (x).unlock()
-#else
 #define AUTOLOCK(x)      Autolock x##_autolock((x))
 #define LOCK(x)          (x).lock()
 #define UNLOCK(x)        (x).unlock()
-#endif
 
 class cmutex {
 public:
@@ -44,15 +38,9 @@ public:
        virtual ~cmutex();
 
        void lock(void);
-       void lock(const char* expr, const char *module, const char *func, int line);
        void unlock(void);
        int try_lock(void);
 
-protected:
-       int lock_impl(void);
-       int try_lock_impl(void);
-       int unlock_impl(void);
-
 private:
        pthread_mutex_t m_mutex;
        static const int OWNER_INFO_LEN = 256;
@@ -63,7 +51,6 @@ class Autolock {
 private:
        cmutex& m_lock;
 public:
-       Autolock(cmutex &m, const char* expr, const char *module, const char *func, int line);
        Autolock(cmutex &m);
        ~Autolock();
 };