Changeset 6459 for trunk/licq

Timestamp:

07/24/08 01:02:45 (4 months ago)

Author:

flynd

Message:

Marked mutexes as mutable so it's possible to use a const pointer to a fetched ICQUser.

Location:

trunk/licq

Files:

• include/licq_user.h (modified) (7 diffs)
• src/user.cpp (modified) (9 diffs)

trunk/licq/include/licq_user.h

@@ -917 +917 @@
 
   virtual bool User()  { return true; }
-  void Lock(unsigned short);
-  void Unlock();
+  void Lock(unsigned short lockType) const;
+  void Unlock() const;
 
   // Deprecated functions, to be removed
@@ -1091 +1091 @@
   static unsigned short s_nNumUserEvents;
 
-  pthread_rdwr_t mutex_rw;
-  unsigned short m_nLockType;
+  mutable pthread_rdwr_t myMutex;
+  mutable unsigned short myLockType;
   static pthread_mutex_t mutex_nNumUserEvents;
 
@@ -1237 +1237 @@
    * @param lockType Type of lock (LOCK_R or LOCK_W)
    */
-  void Lock(unsigned short lockType);
+  void Lock(unsigned short lockType) const;
 
   /**
    * Release current lock for group
    */
-  void Unlock();
+  void Unlock() const;
 
 private:
@@ -1250 +1250 @@
   unsigned short myIcqGroupId;
 
-  pthread_rdwr_t myMutex;
-  unsigned short myLockType;
+  mutable pthread_rdwr_t myMutex;
+  mutable unsigned short myLockType;
 };
 
@@ -1281 +1281 @@
    * Release owner lock
    */
-  void DropOwner(ICQOwner* owner);
+  void DropOwner(const ICQOwner* owner);
 
   bool IsOnList(const char *, unsigned long);
@@ -1296 +1296 @@
   // ICQ Protocol only (from original Licq)
   void AddUser(ICQUser *);
-  void DropUser(ICQUser *);
+  void DropUser(const ICQUser* user);
 
   // Deprecated user functions, to be removed
@@ -1364 +1364 @@
    * @param group The group to unlock
    */
-  void DropGroup(LicqGroup* group);
+  void DropGroup(const LicqGroup* group);
 
   /**

trunk/licq/src/user.cpp

@@ -448 +448 @@
  * ICQUser::Lock
  *-------------------------------------------------------------------------*/
-void ICQUser::Lock(unsigned short _nLockType)
-{
-  switch (_nLockType)
-  {
-  case LOCK_R:
-    pthread_rdwr_rlock_np (&mutex_rw);
-    break;
-  case LOCK_W:
-    pthread_rdwr_wlock_np(&mutex_rw);
-    break;
-  default:
-    assert(false);
-    return;
-  }
-  m_nLockType = _nLockType;
+void ICQUser::Lock(unsigned short lockType) const
+{
+  switch (lockType)
+  {
+    case LOCK_R:
+      pthread_rdwr_rlock_np(&myMutex);
+      break;
+    case LOCK_W:
+      pthread_rdwr_wlock_np(&myMutex);
+      break;
+    default:
+      assert(false);
+      return;
+  }
+  myLockType = lockType;
 }
 
@@ -469 +469 @@
  * ICQUser::Unlock
  *-------------------------------------------------------------------------*/
-void ICQUser::Unlock()
-{
-  unsigned short nLockType = m_nLockType;
-  m_nLockType = LOCK_R;
-  switch (nLockType)
-  {
-  case LOCK_R:
-    pthread_rdwr_runlock_np(&mutex_rw);
-    break;
-  case LOCK_W:
-    pthread_rdwr_wunlock_np(&mutex_rw);
-    break;
-  default:
-    assert(false);
-    break;
+void ICQUser::Unlock() const
+{
+  unsigned short lockType = myLockType;
+  myLockType = LOCK_R;
+  switch (lockType)
+  {
+    case LOCK_R:
+      pthread_rdwr_runlock_np(&myMutex);
+      break;
+    case LOCK_W:
+      pthread_rdwr_wunlock_np(&myMutex);
+      break;
+    default:
+      assert(false);
+      break;
   }
 }
@@ -884 +884 @@
 }
 
-void CUserManager::DropGroup(LicqGroup* group)
+void CUserManager::DropGroup(const LicqGroup* group)
 {
   if (group != NULL)
@@ -1323 +1323 @@
  * CUserManager::DropUser
  *-------------------------------------------------------------------------*/
-void CUserManager::DropUser(ICQUser *u)
+void CUserManager::DropUser(const ICQUser* u)
 {
   if (u == NULL) return;
@@ -1391 +1391 @@
 }
 
-void CUserManager::DropOwner(ICQOwner* owner)
+void CUserManager::DropOwner(const ICQOwner* owner)
 {
   if (owner == NULL)
@@ -1701 +1701 @@
 }
 
-void LicqGroup::Lock(unsigned short lockType)
+void LicqGroup::Lock(unsigned short lockType) const
 {
   switch (lockType)
@@ -1718 +1718 @@
 }
 
-void LicqGroup::Unlock()
+void LicqGroup::Unlock() const
 {
   unsigned short lockType = myLockType;
@@ -2205 +2205 @@
 */
 
-  pthread_rdwr_destroy_np(&mutex_rw);
+  pthread_rdwr_destroy_np(&myMutex);
 }
 
@@ -2370 +2370 @@
   m_szClientInfo = NULL;
 
-  pthread_rdwr_init_np (&mutex_rw, NULL);
-  pthread_rdwr_set_name(&mutex_rw, m_szId);
+  pthread_rdwr_init_np(&myMutex, NULL);
+  pthread_rdwr_set_name(&myMutex, m_szId);
 }