X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fbase%2Felock.h;h=01757182a06a7dc4166421a91a6a5990e3844004;hb=54df949dec999384dacb62f0e273a0518b131928;hp=7bf25eba3e71482801d1b279608ee69157a3f83c;hpb=e366c245644f158ea862b85deb78b731dc8f008a;p=vuplus_dvbapp

diff --git a/lib/base/elock.h b/lib/base/elock.h
index 7bf25eb..0175718 100644
--- a/lib/base/elock.h
+++ b/lib/base/elock.h
@@ -18,15 +18,83 @@ public:
 	}
 };
 
+class eRdWrLock
+{
+	friend class eRdLocker;
+	friend class eWrLocker;
+	pthread_rwlock_t m_lock;
+	eRdWrLock(eRdWrLock &);
+public:
+	eRdWrLock()
+	{
+		pthread_rwlock_init(&m_lock, 0);
+	}
+	~eRdWrLock()
+	{
+		pthread_rwlock_destroy(&m_lock);
+	}
+	void RdLock()
+	{
+		pthread_rwlock_rdlock(&m_lock);
+	}
+	void WrLock()
+	{
+		pthread_rwlock_wrlock(&m_lock);
+	}
+	void Unlock()
+	{
+		pthread_rwlock_unlock(&m_lock);
+	}
+};
+
+class eRdLocker
+{
+	eRdWrLock &m_lock;
+public:
+	eRdLocker(eRdWrLock &m)
+		: m_lock(m)
+	{
+		pthread_rwlock_rdlock(&m_lock.m_lock);
+	}
+	~eRdLocker()
+	{
+		pthread_rwlock_unlock(&m_lock.m_lock);
+	}
+};
+
+class eWrLocker
+{
+	eRdWrLock &m_lock;
+public:
+	eWrLocker(eRdWrLock &m)
+		: m_lock(m)
+	{
+		pthread_rwlock_wrlock(&m_lock.m_lock);
+	}
+	~eWrLocker()
+	{
+		pthread_rwlock_unlock(&m_lock.m_lock);
+	}
+};
+
 class eSingleLock
 {
 	friend class eSingleLocker;
 	pthread_mutex_t m_lock;
 	eSingleLock(eSingleLock &);
 public:
-	eSingleLock()
+	eSingleLock(bool recursive=false)
 	{
-		pthread_mutex_init(&m_lock, 0);
+		if (recursive)
+		{
+			pthread_mutexattr_t attr;
+			pthread_mutexattr_init(&attr);
+			pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+			pthread_mutex_init(&m_lock, &attr);
+			pthread_mutexattr_destroy(&attr);
+		}
+		else
+			pthread_mutex_init(&m_lock, 0);
 	}
 	~eSingleLock()
 	{