Changeset 5c90890

Timestamp:

2018-07-12T08:54:12Z (6 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

c82e4ca

Parents:

b9d1fdc

git-author:

dequis <dx@…> (03-07-18 06:17:17)

git-committer:

dequis <dx@…> (12-07-18 08:54:12)

Message:

Stop using the irc->users linked list, use the hash table instead

irc_user_new() mentions that the reason this list is kept is for easy
iteration. Luckily, this is the future, and GHashTableIter exists now.

The main point of this is to get rid of the g_slist_insert_sorted() in
irc_user_set_nick() which is a particularly slow part of loading large
user lists, and scales poorly

In a test with discord, the GUILD_SYNC event is now 4 times faster, on
top of the improvements of the other bee_user hash tables patch.
Combining both patches it went from 136 to 6 seconds for 50k members.

Files:

• irc.c (modified) (3 diffs)
• irc.h (modified) (1 diff)
• irc_channel.c (modified) (3 diffs)
• irc_commands.c (modified) (1 diff)
• irc_im.c (modified) (1 diff)
• irc_user.c (modified) (4 diffs)
• root_commands.c (modified) (4 diffs)

irc.c

@@ -242 +242 @@
 {
         GSList *l;
+        GHashTableIter iter;
+        gpointer itervalue;
 
         irc->status |= USTATUS_SHUTDOWN;
@@ -271 +273 @@
         bee_free(irc->b);
 
-        while (irc->users) {
-                irc_user_free(irc, (irc_user_t *) irc->users->data);
+        g_hash_table_iter_init(&iter, irc->nick_user_hash);
+
+        while (g_hash_table_iter_next(&iter, NULL, &itervalue)) {
+                g_hash_table_iter_remove(&iter);
+                irc_user_free(irc, (irc_user_t *) itervalue);
         }
 
@@ -292 +297 @@
         irc->fd = -1;
 
-        g_hash_table_foreach_remove(irc->nick_user_hash, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->nick_user_hash);
 

irc.h

@@ -102 +102 @@
         GSList *file_transfers;
 
-        GSList *users, *channels;
+        GSList *users G_GNUC_DEPRECATED;
+        GSList *channels;
         struct irc_channel *default_channel;
         GHashTable *nick_user_hash;

irc_channel.c

@@ -121 +121 @@
 {
         irc_t *irc;
-        GSList *l;
+        GHashTableIter iter;
+        gpointer itervalue;
 
         if (ic == NULL) {
@@ -146 +147 @@
         }
 
-        for (l = irc->users; l; l = l->next) {
-                irc_user_t *iu = l->data;
+        g_hash_table_iter_init(&iter, irc->nick_user_hash);
+
+        while (g_hash_table_iter_next(&iter, NULL, &itervalue)) {
+                irc_user_t *iu = itervalue;
 
                 if (iu->last_channel == ic) {
@@ -729 +732 @@
                 }
         } else if (g_strcasecmp(set_getstr(&irc->b->set, "default_target"), "last") == 0 &&
-                   ic->last_target && g_slist_find(irc->users, ic->last_target)) {
+                   ic->last_target && g_hash_table_contains(irc->nick_user_hash, ic->last_target->key)) {
                 iu = ic->last_target;
         } else {

irc_commands.c

@@ -449 +449 @@
 
         if (!channel || *channel == '0' || *channel == '*' || !*channel) {
-                irc_send_who(irc, irc->users, "**");
+                GList *all_users = g_hash_table_get_values(irc->nick_user_hash);
+                irc_send_who(irc, (GSList *) all_users, "**");
+                g_list_free(all_users);
         } else if ((ic = irc_channel_by_name(irc, channel))) {
                 irc_send_who(irc, ic->users, channel);

irc_im.c

@@ -181 +181 @@
         }
         if (iu == NULL) {
-                for (l = irc->users; l; l = l->next) {
-                        iu = l->data;
+                GHashTableIter iter;
+                gpointer itervalue;
+                g_hash_table_iter_init(&iter, irc->nick_user_hash);
+
+                while (g_hash_table_iter_next(&iter, NULL, &itervalue)) {
+                        iu = itervalue;
                         if (iu->bu) {
-                                bee_irc_channel_update(irc, ic, l->data);
+                                bee_irc_channel_update(irc, ic, iu);
                         }
                 }

irc_user.c

@@ -37 +37 @@
         iu->key = g_strdup(nick);
         nick_lc(irc, iu->key);
-        /* Using the hash table for speed and irc->users for easy iteration
-           through the list (since the GLib API doesn't have anything sane
-           for that.) */
         g_hash_table_insert(irc->nick_user_hash, iu->key, iu);
-        irc->users = g_slist_insert_sorted(irc->users, iu, irc_user_cmp);
 
         return iu;
@@ -87 +83 @@
         irc_user_quit(iu, msg);
 
-        irc->users = g_slist_remove(irc->users, iu);
         g_hash_table_remove(irc->nick_user_hash, iu->key);
 
@@ -148 +143 @@
         }
 
-        irc->users = g_slist_remove(irc->users, iu);
         g_hash_table_remove(irc->nick_user_hash, iu->key);
 
@@ -175 +169 @@
         iu->key = g_strdup(key);
         g_hash_table_insert(irc->nick_user_hash, iu->key, iu);
-        irc->users = g_slist_insert_sorted(irc->users, iu, irc_user_cmp);
 
         if (iu == irc->user) {

root_commands.c

@@ -773 +773 @@
         bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
         nick_del(bu);
-        if (g_slist_find(irc->users, iu)) {
+        if (g_hash_table_contains(irc->nick_user_hash, iu->key)) {
                 bee_user_free(irc->b, bu);
         }
@@ -1033 +1033 @@
 {
         int online = 0, away = 0, offline = 0, ismatch = 0;
-        GSList *l;
+        GList *l, *users;
         GRegex *regex = NULL;
         GError *error = NULL;
@@ -1074 +1074 @@
         }
 
-        for (l = irc->users; l; l = l->next) {
+        users = g_hash_table_get_values(irc->nick_user_hash);
+        users = g_list_sort(users, irc_user_cmp);
+
+        for (l = users; l; l = l->next) {
                 irc_user_t *iu = l->data;
                 bee_user_t *bu = iu->bu;
@@ -1119 +1122 @@
                 }
         }
+
+        g_list_free(users);
 
         irc_rootmsg(irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online,