Changeset 6364 for trunk/licq/include/licq_user.h

Timestamp:

07/01/08 03:07:09 (5 months ago)

Author:

flynd

Message:

Removed the user list since there is no need to have both a list and a map.

Files:

• trunk/licq/include/licq_user.h (modified) (9 diffs)

trunk/licq/include/licq_user.h

@@ -33 +33 @@
   {                                                      \
     ICQUser *pUser;                                      \
-    UserList *_ul_ = gUserManager.LockUserList(LOCK_R);  \
-    for (UserList::iterator _i_ = _ul_->begin();         \
+    const UserMap* _ul_ = gUserManager.LockUserList(LOCK_R); \
+    for (UserMap::const_iterator _i_ = _ul_->begin();    \
          _i_ != _ul_->end(); _i_++)                      \
     {                                                    \
-      pUser = *_i_;                                      \
+      pUser = _i_->second;                               \
       pUser->Lock(x);                                    \
       {
@@ -44 +44 @@
   {                                                      \
     ICQUser *pUser;                                      \
-    UserList *_ul_ = gUserManager.LockUserList(LOCK_R);  \
-    for (UserList::iterator _i_ = _ul_->begin();         \
+    const UserMap* _ul_ = gUserManager.LockUserList(LOCK_R); \
+    for (UserMap::const_iterator _i_ = _ul_->begin();    \
          _i_ != _ul_->end(); _i_++)                      \
     {                                                    \
-      pUser = *_i_;                                      \
-      if (pUser->PPID() == x)                            \
-      {                                                  \
-        pUser->Lock(y);                                  \
-        {
+      if (_i_->first.second != x)                        \
+        continue;                                        \
+      pUser = _i_->second;                               \
+      pUser->Lock(y);                                    \
+      {
 
 #define FOR_EACH_OWNER_START(x)                           \
@@ -85 +85 @@
   }
 
-#define FOR_EACH_PROTO_USER_END        \
-        }                                \
-        pUser->Unlock();                 \
-      }                                  \
-    }                                    \
-    gUserManager.UnlockUserList();       \
-  }
+#define FOR_EACH_PROTO_USER_END FOR_EACH_USER_END
 
 #define FOR_EACH_USER_BREAK              \
@@ -178 +172 @@
   {                                                      \
     unsigned long nUin;                                  \
-    UserList *_ul_ = gUserManager.LockUserList(LOCK_R);  \
-    for (UserList::iterator _i_ = _ul_->begin();         \
+    const UserMap* _ul_ = gUserManager.LockUserList(LOCK_R); \
+    for (UserMap::const_iterator _i_ = _ul_->begin();    \
          _i_ != _ul_->end(); _i_++)                      \
     {                                                    \
-      nUin = (*_i_)->Uin();                              \
+      nUin = _i_->second->Uin();                         \
       {
 
@@ -188 +182 @@
   {                                                      \
     char *szId;                                          \
-    UserList *_ul_ = gUserManager.LockUserList(LOCK_R);  \
-    for (UserList::iterator _i_ = _ul_->begin();         \
+    UserMap* _ul_ = gUserManager.LockUserList(LOCK_R);   \
+    for (UserMap::const_iterator _i_ = _ul_->begin();    \
          _i_ != _ul_->end(); _i_++)                      \
     {                                                    \
-      if ((*_i_)->PPID() == x)                           \
-      {                                                  \
-        szId = (*_i_)->IdString();                       \
-        {
+      if (_i_->first.second != x)                        \
+        continue;                                        \
+      szId = (*_i_)->IdString();                         \
+      {
 
 #define FOR_EACH_UIN_END                 \
@@ -203 +197 @@
   }
 
-#define FOR_EACH_PROTO_ID_END            \
-        }                                \
-      }                                  \
-    }                                    \
-    gUserManager.UnlockUserList();       \
-  }
+#define FOR_EACH_PROTO_ID_END FOR_EACH_UIN_END
 
 #define FOR_EACH_UIN_BREAK               \
@@ -236 +225 @@
 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;
 typedef std::set<unsigned short> UserGroupList;
@@ -1290 +1278 @@
   bool IsOnList(unsigned long nUin);
 
-  UserList *LockUserList(unsigned short);
+  /**
+   * Lock user list for access
+   * call UnlockUserList when lock is no longer needed
+   *
+   * @param lockType Type of lock (LOCK_R or LOCK_W)
+   * @return Map of all users indexed by UserMapKey
+   */
+  UserMap* LockUserList(unsigned short lockType);
+
+  /**
+   * Release user list lock
+   */
   void UnlockUserList();
 
@@ -1486 +1485 @@
 
   GroupMap myGroups;
-  UserList m_vpcUsers;
   UserMap myUsers;
   OwnerList m_vpcOwners;