pidgin.2.9.0: b5dacc36: Pluck the performance improvement code n...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Tue Jun 21 22:50:49 EDT 2011
----------------------------------------------------------------------
Revision: b5dacc3619f2b5f5cc81e8d2869682d9446252b8
Parent: 57325553c219097eacd8d28bf2d6f2df6a4912aa
Author: darkrain42 at pidgin.im
Date: 06/21/11 22:48:46
Branch: im.pidgin.pidgin.2.9.0
URL: http://d.pidgin.im/viewmtn/revision/info/b5dacc3619f2b5f5cc81e8d2869682d9446252b8
Changelog:
Pluck the performance improvement code needed for large IRC channels.
Changes against parent 57325553c219097eacd8d28bf2d6f2df6a4912aa
patched ChangeLog
patched ChangeLog.API
patched libpurple/conversation.c
patched libpurple/conversation.h
patched libpurple/value.h
patched pidgin/gtkconv.c
-------------- next part --------------
============================================================
--- ChangeLog 0491c1c3e48e9253602f5867714f8b4ca45f3971
+++ ChangeLog 798cc1c198ef70b547269d6c109d664911538f35
@@ -2,6 +2,8 @@ version 2.9.0 (06/23/2011):
version 2.9.0 (06/23/2011):
Pidgin:
+ * Significantly improved performance of larger IRC channels (regression
+ introduced in 2.8.0)
* Fix Conversation->Add on AIM and MSN.
* Entries in the chat user list are sorted properly again. This was
inadvertenly broken in 2.8.0.
============================================================
--- libpurple/conversation.c 5d997f74639ed482eeb33a121b140ba6d52d4ce3
+++ libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401
@@ -70,6 +70,23 @@ static void _purple_conversations_hconv_
g_free(hc);
}
+static guint _purple_conversation_user_hash(gconstpointer data)
+{
+ const gchar *name = data;
+ gchar *collated;
+ guint hash;
+
+ collated = g_utf8_collate_key(name, -1);
+ hash = g_str_hash(collated);
+ g_free(collated);
+ return hash;
+}
+
+static gboolean _purple_conversation_user_equal(gconstpointer a, gconstpointer b)
+{
+ return !g_utf8_collate(a, b);
+}
+
void
purple_conversations_set_ui_ops(PurpleConversationUiOps *ops)
{
@@ -393,6 +410,8 @@ purple_conversation_new(PurpleConversati
conv->u.chat = g_new0(PurpleConvChat, 1);
conv->u.chat->conv = conv;
+ conv->u.chat->users = g_hash_table_new_full(_purple_conversation_user_hash,
+ _purple_conversation_user_equal, g_free, NULL);
PURPLE_DBUS_REGISTER_POINTER(conv->u.chat, PurpleConvChat);
chats = g_list_prepend(chats, conv);
@@ -547,6 +566,8 @@ purple_conversation_destroy(PurpleConver
conv->u.im = NULL;
}
else if (conv->type == PURPLE_CONV_TYPE_CHAT) {
+ g_hash_table_destroy(conv->u.chat->users);
+ conv->u.chat->users = NULL;
g_list_foreach(conv->u.chat->in_room, (GFunc)purple_conv_chat_cb_destroy, NULL);
g_list_free(conv->u.chat->in_room);
@@ -1677,10 +1698,10 @@ purple_conv_chat_add_users(PurpleConvCha
cbuddy = purple_conv_chat_cb_new(user, alias, flag);
cbuddy->buddy = purple_find_buddy(conv->account, user) != NULL;
- /* This seems dumb. Why should we set users thousands of times? */
- purple_conv_chat_set_users(chat,
- g_list_prepend(chat->in_room, cbuddy));
+ chat->in_room = g_list_prepend(chat->in_room, cbuddy);
+ g_hash_table_replace(chat->users, g_strdup(cbuddy->name), cbuddy);
+
cbuddies = g_list_prepend(cbuddies, cbuddy);
if (!quiet && new_arrivals) {
@@ -1771,17 +1792,18 @@ purple_conv_chat_rename_user(PurpleConvC
flags = purple_conv_chat_user_get_flags(chat, old_user);
cb = purple_conv_chat_cb_new(new_user, new_alias, flags);
cb->buddy = purple_find_buddy(conv->account, new_user) != NULL;
- purple_conv_chat_set_users(chat,
- g_list_prepend(chat->in_room, cb));
+ chat->in_room = g_list_prepend(chat->in_room, cb);
+ g_hash_table_replace(chat->users, g_strdup(cb->name), cb);
+
if (ops != NULL && ops->chat_rename_user != NULL)
ops->chat_rename_user(conv, old_user, new_user, new_alias);
cb = purple_conv_chat_cb_find(chat, old_user);
if (cb) {
- purple_conv_chat_set_users(chat,
- g_list_remove(chat->in_room, cb));
+ chat->in_room = g_list_remove(chat->in_room, cb);
+ g_hash_table_remove(chat->users, cb->name);
purple_conv_chat_cb_destroy(cb);
}
@@ -1874,8 +1896,8 @@ purple_conv_chat_remove_users(PurpleConv
cb = purple_conv_chat_cb_find(chat, user);
if (cb) {
- purple_conv_chat_set_users(chat,
- g_list_remove(chat->in_room, cb));
+ chat->in_room = g_list_remove(chat->in_room, cb);
+ g_hash_table_remove(chat->users, cb->name);
purple_conv_chat_cb_destroy(cb);
}
@@ -1955,8 +1977,11 @@ purple_conv_chat_clear_users(PurpleConvC
purple_conv_chat_cb_destroy(cb);
}
+ g_hash_table_remove_all(chat->users);
+ chat->users = NULL;
+
g_list_free(users);
- purple_conv_chat_set_users(chat, NULL);
+ chat->in_room = NULL;
}
@@ -2146,19 +2171,10 @@ purple_conv_chat_cb_find(PurpleConvChat
PurpleConvChatBuddy *
purple_conv_chat_cb_find(PurpleConvChat *chat, const char *name)
{
- GList *l;
- PurpleConvChatBuddy *cb = NULL;
-
g_return_val_if_fail(chat != NULL, NULL);
g_return_val_if_fail(name != NULL, NULL);
- for (l = purple_conv_chat_get_users(chat); l; l = l->next) {
- cb = l->data;
- if (!g_utf8_collate(cb->name, name))
- return cb;
- }
-
- return NULL;
+ return g_hash_table_lookup(chat->users, name);
}
void
@@ -2167,6 +2183,9 @@ purple_conv_chat_cb_destroy(PurpleConvCh
if (cb == NULL)
return;
+ purple_signal_emit(purple_conversations_get_handle(),
+ "deleting-chat-buddy", cb);
+
g_free(cb->alias);
g_free(cb->alias_key);
g_free(cb->name);
@@ -2573,6 +2592,11 @@ purple_conversations_init(void)
purple_value_new(PURPLE_TYPE_STRING),
purple_value_new(PURPLE_TYPE_STRING));
+ purple_signal_register(handle, "deleting-chat-buddy",
+ purple_marshal_VOID__POINTER, NULL, 1,
+ purple_value_new(PURPLE_TYPE_SUBTYPE,
+ PURPLE_SUBTYPE_CHATBUDDY));
+
purple_signal_register(handle, "chat-inviting-user",
purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3,
purple_value_new(PURPLE_TYPE_SUBTYPE,
============================================================
--- libpurple/conversation.h 1b5c4abc64bc9456e7f4d60bf23713f150e1da94
+++ libpurple/conversation.h ee3ba57ce65309287c60fa7d3f0d504418cfe2e7
@@ -271,7 +271,9 @@ struct _PurpleConvChat
{
PurpleConversation *conv; /**< The parent conversation. */
- GList *in_room; /**< The users in the room. */
+ GList *in_room; /**< The users in the room.
+ * @deprecated Will be removed in 3.0.0
+ */
GList *ignored; /**< Ignored users. */
char *who; /**< The person who set the topic. */
char *topic; /**< The topic. */
@@ -279,6 +281,9 @@ struct _PurpleConvChat
char *nick; /**< Your nick in this chat. */
gboolean left; /**< We left the chat and kept the window open */
+ GHashTable *users; /**< Hash table of the users in the room.
+ * @since 2.9.0
+ */
};
/**
@@ -304,6 +309,7 @@ struct _PurpleConvChatBuddy
GHashTable *attributes; /**< A hash table of attributes about the user, such as
* real name, user at host, etc.
*/
+ gpointer ui_data; /** < The UI can put whatever it wants here. */
};
/**
@@ -1065,6 +1071,8 @@ PurpleConversation *purple_conv_chat_get
* @param users The list of users.
*
* @return The list passed.
+ *
+ * @deprecated This function will be removed in 3.0.0. You shouldn't be using it anyway.
*/
GList *purple_conv_chat_set_users(PurpleConvChat *chat, GList *users);
============================================================
--- pidgin/gtkconv.c 9883fe02982cc4c5794a082e88efce5db317eca2
+++ pidgin/gtkconv.c 8f0665ce1cf62aa0886e99d5c403e7462104b42a
@@ -3978,6 +3978,16 @@ static void
}
static void
+deleting_chat_buddy_cb(PurpleConvChatBuddy *cb)
+{
+ if (cb->ui_data) {
+ GtkTreeRowReference *ref = cb->ui_data;
+ gtk_tree_row_reference_free(ref);
+ cb->ui_data = NULL;
+ }
+}
+
+static void
add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const char *old_name)
{
PidginConversation *gtkconv;
@@ -3985,7 +3995,9 @@ add_chat_buddy_common(PurpleConversation
PurpleConvChat *chat;
PurpleConnection *gc;
PurplePluginProtocolInfo *prpl_info;
+ GtkTreeModel *tm;
GtkListStore *ls;
+ GtkTreePath *newpath;
const char *stock;
GtkTreeIter iter;
gboolean is_me = FALSE;
@@ -4006,7 +4018,8 @@ add_chat_buddy_common(PurpleConversation
if (!gc || !(prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)))
return;
- ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list)));
+ tm = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
+ ls = GTK_LIST_STORE(tm);
stock = get_chat_buddy_status_icon(chat, name, flags);
@@ -4051,6 +4064,15 @@ add_chat_buddy_common(PurpleConversation
CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
-1);
+ if (cb->ui_data) {
+ GtkTreeRowReference *ref = cb->ui_data;
+ gtk_tree_row_reference_free(ref);
+ }
+
+ newpath = gtk_tree_model_get_path(tm, &iter);
+ cb->ui_data = gtk_tree_row_reference_new(tm, newpath);
+ gtk_tree_path_free(newpath);
+
if (is_me && color)
gdk_color_free(color);
g_free(alias_key);
@@ -6108,6 +6130,28 @@ pidgin_conv_write_conv(PurpleConversatio
update_typing_message(gtkconv, NULL);
}
+static gboolean get_iter_from_chatbuddy(PurpleConvChatBuddy *cb, GtkTreeIter *iter)
+{
+ GtkTreeRowReference *ref = cb->ui_data;
+ GtkTreePath *path;
+ GtkTreeModel *model;
+
+ if (!ref)
+ return FALSE;
+
+ if ((path = gtk_tree_row_reference_get_path(ref)) == NULL)
+ return FALSE;
+
+ model = gtk_tree_row_reference_get_model(ref);
+ if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(model), iter, path)) {
+ gtk_tree_path_free(path);
+ return FALSE;
+ }
+
+ gtk_tree_path_free(path);
+ return TRUE;
+}
+
static void
pidgin_conv_chat_add_users(PurpleConversation *conv, GList *cbuddies, gboolean new_arrivals)
{
@@ -6158,11 +6202,10 @@ pidgin_conv_chat_rename_user(PurpleConve
PurpleConvChat *chat;
PidginConversation *gtkconv;
PidginChatPane *gtkchat;
- PurpleConvChatBuddy *cbuddy;
+ PurpleConvChatBuddy *old_cbuddy, *new_cbuddy;
GtkTreeIter iter;
GtkTreeModel *model;
GtkTextTag *tag;
- int f = 1;
chat = PURPLE_CONV_CHAT(conv);
gtkconv = PIDGIN_CONVERSATION(conv);
@@ -6173,20 +6216,13 @@ pidgin_conv_chat_rename_user(PurpleConve
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
return;
- while (f != 0) {
- char *val;
+ old_cbuddy = purple_conv_chat_cb_find(chat, old_name);
+ if (get_iter_from_chatbuddy(old_cbuddy, &iter)) {
+ GtkTreeRowReference *ref = old_cbuddy->ui_data;
- gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &val, -1);
-
- if (!purple_utf8_strcasecmp(old_name, val)) {
- gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
- g_free(val);
- break;
- }
-
- f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
-
- g_free(val);
+ gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+ gtk_tree_row_reference_free(ref);
+ old_cbuddy->ui_data = NULL;
}
if ((tag = get_buddy_tag(conv, old_name, 0, FALSE)))
@@ -6194,14 +6230,14 @@ pidgin_conv_chat_rename_user(PurpleConve
if ((tag = get_buddy_tag(conv, old_name, PURPLE_MESSAGE_NICK, FALSE)))
g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL);
- if (!purple_conv_chat_find_user(chat, old_name))
+ if (!old_cbuddy)
return;
g_return_if_fail(new_alias != NULL);
- cbuddy = purple_conv_chat_cb_find(chat, new_name);
+ new_cbuddy = purple_conv_chat_cb_find(chat, new_name);
- add_chat_buddy_common(conv, cbuddy, old_name);
+ add_chat_buddy_common(conv, new_cbuddy, old_name);
}
static void
@@ -6228,6 +6264,7 @@ pidgin_conv_chat_remove_users(PurpleConv
model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
+ /* XXX: Break? */
continue;
do {
@@ -6267,8 +6304,6 @@ pidgin_conv_chat_update_user(PurpleConve
PidginChatPane *gtkchat;
GtkTreeIter iter;
GtkTreeModel *model;
- int f = 1;
- char *alias = NULL;
chat = PURPLE_CONV_CHAT(conv);
gtkconv = PIDGIN_CONVERSATION(conv);
@@ -6279,35 +6314,16 @@ pidgin_conv_chat_update_user(PurpleConve
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
return;
- while (f != 0) {
- char *val;
-
- gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &val, -1);
-
- if (!purple_utf8_strcasecmp(user, val)) {
- gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_ALIAS_COLUMN, &alias, -1);
- gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
- g_free(val);
- break;
- }
-
- f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
-
- g_free(val);
+ cbuddy = purple_conv_chat_cb_find(chat, user);
+ if (get_iter_from_chatbuddy(cbuddy, &iter)) {
+ GtkTreeRowReference *ref = cbuddy->ui_data;
+ gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+ gtk_tree_row_reference_free(ref);
+ cbuddy->ui_data = NULL;
}
- if (!purple_conv_chat_find_user(chat, user))
- {
- g_free(alias);
- return;
- }
-
- g_return_if_fail(alias != NULL);
-
- cbuddy = purple_conv_chat_cb_find(chat, user);
if (cbuddy)
add_chat_buddy_common(conv, cbuddy, NULL);
- g_free(alias);
}
gboolean
@@ -8088,6 +8104,9 @@ pidgin_conversations_init(void)
purple_signal_connect(purple_conversations_get_handle(), "cleared-message-history",
handle, G_CALLBACK(clear_conversation_scrollback_cb), NULL);
+ purple_signal_connect(purple_conversations_get_handle(), "deleting-chat-buddy",
+ handle, G_CALLBACK(deleting_chat_buddy_cb), NULL);
+
purple_conversations_set_ui_ops(&conversation_ui_ops);
hidden_convwin = pidgin_conv_window_new();
============================================================
--- libpurple/value.h 3a7b6a6dd8106466d5a438203706c2bc0c2b6cd9
+++ libpurple/value.h 2e4ee485ddf46affd4170adf8e560b17024fdbba
@@ -79,7 +79,8 @@ typedef enum
PURPLE_SUBTYPE_XMLNODE,
PURPLE_SUBTYPE_USERINFO,
PURPLE_SUBTYPE_STORED_IMAGE,
- PURPLE_SUBTYPE_CERTIFICATEPOOL
+ PURPLE_SUBTYPE_CERTIFICATEPOOL,
+ PURPLE_SUBTYPE_CHATBUDDY
} PurpleSubType;
/**
============================================================
--- ChangeLog.API e02882f4b3534ee8781d6c7c4d9da699d0ca588f
+++ ChangeLog.API 7fbdec40f2814ddeb7558211fab7647ed3c3da84
@@ -1,8 +1,17 @@ version 2.9.0:
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
version 2.9.0:
- * No changes
+ libpurple:
+ Added:
+ * Hash table to PurpleConvChat struct, used to make
+ purple_conv_chat_cb_find O(1).
+ * ui_data pointer to PurpleConvChatBuddy struct.
+ * deleting-chat-buddy signal (conversation signals)
+ Deprecated:
+ * purple_conv_chat_set_users
+ * PurpleConvChat in_room list
+
version 2.8.0 (06/07/2011):
libpurple:
Added:
More information about the Commits
mailing list