MT#62181 obsolete recursive AmMutex

Replace with std::recursive_mutex

Change-Id: I5ff6f10d60680bed03ef36653bceade139bbd063

core/AmAppTimer.cpp

@@ -69,7 +69,7 @@ public:
 };
 
 _AmAppTimer::_AmAppTimer()
-  : direct_timers_mut(true)
+  : direct_timers_mut()
 {
 }
 

core/AmAppTimer.h

@@ -57,7 +57,7 @@ class _AmAppTimer
   AmMutex user_timers_mut;
   TimerQueues user_timers;
 
-  AmMutex direct_timers_mut;
+  std::recursive_mutex direct_timers_mut;
   DirectTimers direct_timers;
 
   /** creates timer object and inserts it into our container */

core/AmThread.cpp

@@ -33,18 +33,9 @@
 #include <string>
 using std::string;
 
-AmMutex::AmMutex(bool recursive)
+AmMutex::AmMutex()
 {
-  if(recursive) {
-    pthread_mutexattr_t attr;
-
-    pthread_mutexattr_init(&attr);
-    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-    pthread_mutex_init(&m, &attr);
-  }
-  else {
-    pthread_mutex_init(&m,NULL);
-  }
+  pthread_mutex_init(&m,NULL);
 }
 
 AmMutex::~AmMutex()

core/AmThread.h

@@ -46,7 +46,7 @@ class AmMutex
   pthread_mutex_t m;
 
 public:
-  AmMutex(bool recursive = false);
+  AmMutex();
   ~AmMutex();
   void lock();
   void unlock();

core/sip/async_file.cpp

@@ -20,7 +20,7 @@ Possible issue:
 */
 
 async_file::async_file(unsigned int buf_len)
-  : AmMutex(true), fifo_buffer(buf_len),
+  : fifo_buffer(buf_len),
     evbase(NULL),closed(false),error(false),write_thresh(MIN_WRITE_SIZE)
 {
   if (buf_len <= MIN_WRITE_SIZE) {
@@ -41,7 +41,7 @@ async_file::~async_file()
 
 int async_file::write(const void* buf, unsigned int len)
 {
-  lock_guard<AmMutex> _l(*this);
+  lock_guard<std::recursive_mutex> _l(*this);
   if(closed) return Closed;
   if(error)  return Error;
 
@@ -58,7 +58,7 @@ int async_file::write(const void* buf, unsigned int len)
 
 int async_file::writev(const struct iovec *iov, int iovcnt)
 {
-  lock_guard<AmMutex> _l(*this);
+  lock_guard<std::recursive_mutex> _l(*this);
   if(closed) return Closed;
   if(error)  return Error;
 
@@ -75,7 +75,7 @@ int async_file::writev(const struct iovec *iov, int iovcnt)
 
 void async_file::close()
 {
-  lock_guard<AmMutex> _l(*this);
+  lock_guard<std::recursive_mutex> _l(*this);
   closed = true;
   event_active(ev_write, 0, 0);
 }
@@ -120,6 +120,6 @@ void async_file::write_cycle()
 
 unsigned int async_file::get_buffered_bytes()
 {
-  lock_guard<AmMutex> _l(*this);
+  lock_guard<std::recursive_mutex> _l(*this);
   return fifo_buffer::get_buffered_bytes();
 }

core/sip/async_file.h

@@ -6,7 +6,7 @@
 
 class async_file
   : protected fifo_buffer,
-    public AmMutex
+    public std::recursive_mutex
 {
   struct event_base* evbase;
   struct event*    ev_write;