Changeset 6363

Timestamp:

07/01/08 02:41:30 (3 months ago)

Author:

flynd

Message:

Replaced CUserHashTable with std::map. A custom hash map shouldn't make any significant improvement with the number of items in a normal contact list so better and easier to use a std class instead. Also added some missing mutex locks on the user list.

Location:

trunk/licq

Files:

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

trunk/licq/include/licq_user.h

@@ -234 +234 @@
 class LicqGroup;
 
+typedef std::pair<std::string, unsigned long> UserMapKey;
+typedef std::map<UserMapKey, class ICQUser*> UserMap;
 typedef std::list<ICQUser *> UserList;
 typedef std::list<class ICQOwner *> OwnerList;
@@ -1152 +1154 @@
 };
 
-
-//=====CUsers===================================================================
-
-class CUserHashTable
-{
-public:
-  CUserHashTable(unsigned short _nSize);
-  ~CUserHashTable();
-
-  // For protocol plugins
-  ICQUser *Retrieve(const char *, unsigned long);
-  void Store(ICQUser *, const char *, unsigned long);
-  void Remove(const char *, unsigned long);
-
-protected:
-  // For protocol plugin
-  unsigned short HashValue(const char *);
-
-  void Lock(unsigned short _nLockType);
-  void Unlock();
-
-  std::vector < UserList > m_vlTable;
-
-  pthread_rdwr_t mutex_rw;
-  unsigned short m_nLockType;
-};
-
 /**
  * Class holding data for a user group in the contact list.
@@ -1512 +1487 @@
   GroupMap myGroups;
   UserList m_vpcUsers;
+  UserMap myUsers;
   OwnerList m_vpcOwners;
-  CUserHashTable m_hUsers;
   ICQOwner *m_xOwner;
   unsigned long m_nOwnerUin;

trunk/licq/src/user.cpp

@@ -487 +487 @@
 //=====CUserManager=============================================================
 CUserManager::CUserManager()
-  : m_hUsers(USER_HASH_SIZE),
-    m_szDefaultEncoding(NULL)
+  : m_szDefaultEncoding(NULL)
 {
   // Set up the basic all users and new users group
@@ -657 +656 @@
   ICQUser *u;
   usersConf.SetFlags(INI_FxWARN);
+  LockUserList(LOCK_W);
   for (unsigned short i = 1; i<= nUsers; i++)
   {
@@ -680 +680 @@
     u = new ICQUser(szId, nPPID, filename);
     u->AddToContactList();
-    m_hUsers.Store(u, szId, nPPID);
+    myUsers[UserMapKey(szId, nPPID)] = u;
     m_vpcUsers.push_back(u);
   }
+  UnlockUserList();
 
   return true;
@@ -689 +690 @@
 void CUserManager::AddUser(ICQUser *pUser, const char *_szId, unsigned long _nPPID)
 {
+  LockUserList(LOCK_W);
+
   pUser->Lock(LOCK_W);
 
@@ -710 +713 @@
   }
 
-  // Store the user in the hash table
-  m_hUsers.Store(pUser, _szId, _nPPID);
+  // Store the user in the lookup map
+  myUsers[UserMapKey(_szId, _nPPID)] = pUser;
   // Reorder the user to the correct place
   m_vpcUsers.push_back(pUser);
+
+  UnlockUserList();
 }
 
@@ -732 +737 @@
     m_vpcUsers.erase(iter);
   DropUser(u);
-  m_hUsers.Remove(_szId, _nPPID);
+  myUsers.erase(UserMapKey(_szId, _nPPID));
   UnlockUserList();
   delete u;
@@ -768 +773 @@
 
   if (u == NULL)
-    u = m_hUsers.Retrieve(_szId, _nPPID);
+  {
+    LockUserList(LOCK_R);
+    UserMap::iterator iter = myUsers.find(UserMapKey(_szId, _nPPID));
+    if (iter != myUsers.end())
+      u = iter->second;
+    UnlockUserList();
+  }
 
   if (u != NULL)
@@ -788 +799 @@
 bool CUserManager::IsOnList(const char *_szId, unsigned long _nPPID)
 {
-  if (FindOwner(_szId, _nPPID)) return true;
-  return m_hUsers.Retrieve(_szId, _nPPID) != NULL;
+  if (FindOwner(_szId, _nPPID))
+    return true;
+
+  LockUserList(LOCK_R);
+  UserMap::iterator iter = myUsers.find(UserMapKey(_szId, _nPPID));
+  bool found = (iter != myUsers.end());
+  UnlockUserList();
+
+  return found;
 }
 
@@ -1646 +1664 @@
   SetString(&m_szDefaultEncoding, defaultEncoding);
 }
-
-
-//=====CUserHashTable===========================================================
-CUserHashTable::CUserHashTable(unsigned short _nSize) : m_vlTable(_nSize)
-{
-  pthread_rdwr_init_np(&mutex_rw, NULL);
-  pthread_rdwr_set_name(&mutex_rw, __func__);
-  m_nLockType = LOCK_R;
-}
-
-CUserHashTable::~CUserHashTable()
-{
-  pthread_rdwr_destroy_np(&mutex_rw);
-}
-
-ICQUser *CUserHashTable::Retrieve(const char *_szId, unsigned long _nPPID)
-{
-  Lock(LOCK_R);
-
-  ICQUser *u = NULL;
-  char *szRealId;
-  ICQUser::MakeRealId(_szId, _nPPID, szRealId);
-  UserList &l = m_vlTable[HashValue(szRealId)];
-  char *szTempId = 0;
-  unsigned long nPPID;
-  UserList::iterator iter;
-  for (iter = l.begin(); iter != l.end(); ++iter)
-  {
-    nPPID = (*iter)->PPID();
-    ICQUser::MakeRealId((*iter)->IdString(), nPPID, szTempId);
-    if (_nPPID == nPPID && strcasecmp(szTempId, szRealId) == 0)
-    {
-      u = (*iter);
-      break;
-    }
-    delete [] szTempId; szTempId = 0;
-  }
-  if (iter == l.end()) u = NULL;
-
-  delete [] szRealId;
-  if (szTempId) delete [] szTempId;
-
-  Unlock();
-  return u;
-}
-
-void CUserHashTable::Store(ICQUser *u, const char *_szId, unsigned long _nPPID)
-{
-  Lock(LOCK_W);
-  char *szRealId;
-  ICQUser::MakeRealId(_szId, _nPPID, szRealId);
-  UserList &l = m_vlTable[HashValue(szRealId)];
-  delete [] szRealId;
-  l.push_front(u);
-  Unlock();
-}
-
-void CUserHashTable::Remove(const char *_szId, unsigned long _nPPID)
-{
-  Lock(LOCK_W);
-
-  char *szRealId;
-  ICQUser::MakeRealId(_szId, _nPPID, szRealId);
-  UserList &l = m_vlTable[HashValue(szRealId)];
-  delete [] szRealId;
-  char *szId;
-  unsigned long nPPID;
-  UserList::iterator iter;
-  for (iter = l.begin(); iter != l.end(); ++iter)
-  {
-    (*iter)->Lock(LOCK_R);
-    szId = (*iter)->IdString();
-    nPPID = (*iter)->PPID();
-    (*iter)->Unlock();
-    if (_nPPID == nPPID && strcmp(szId, _szId) == 0)
-    {
-      l.erase(iter);
-      break;
-    }
-  }
-
-  Unlock();
-}
-
-unsigned short CUserHashTable::HashValue(const char *_szId)
-{
-  int j = strlen(_szId);
-  unsigned short nRet = 0;
-  for (int i = 0; i < j; i++)
-    nRet += (unsigned short)_szId[i];
-
-  return (nRet % (USER_HASH_SIZE - 1));
-}
-
-void CUserHashTable::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 CUserHashTable::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;
-  }
-}
-