comparison src/blist.c @ 5247:60983a46700e

[gaim-migrate @ 5618] (22:40:26) Paco-Paco: gaim_find_buddy was an O(n) search through the blist tree, this adds an auxilliary hash to bring that down to O(1) committer: Tailor Script <[e-mail]>

5246:e9452def017f

	if (!node)
		return NULL;
	return gaim_blist_get_last_sibling(node->child);
}

/*****************************************************************************
 * Public API functions                                                      *
 *****************************************************************************/

struct gaim_buddy_list *gaim_blist_new()
{
	struct gaim_buddy_list *gbl = g_new0(struct gaim_buddy_list, 1);

	gbl->ui_ops = gaim_get_blist_ui_ops();

	if (gbl->ui_ops != NULL && gbl->ui_ops->new_list != NULL)
		gbl->ui_ops->new_list(gbl);

	return gbl;

void  gaim_blist_add_buddy (struct buddy *buddy, struct group *group, GaimBlistNode *node)
{
	GaimBlistNode *n = node, *bnode = (GaimBlistNode*)buddy;
	struct group *g = group;
	struct gaim_blist_ui_ops *ops = gaimbuddylist->ui_ops;
	gboolean save = FALSE;

	if (!n) {
		if (!g) {
			g = gaim_group_new(_("Buddies"));

		((GaimBlistNode*)buddy)->next = NULL;
		((GaimBlistNode*)buddy)->prev = NULL;
		((GaimBlistNode*)buddy)->parent = (GaimBlistNode*)g;
	}

	if (ops)
		ops->update(gaimbuddylist, (GaimBlistNode*)buddy);
	if (save)
		gaim_blist_save();
}

{
	struct gaim_blist_ui_ops *ops = gaimbuddylist->ui_ops;

	GaimBlistNode *gnode, *node = (GaimBlistNode*)buddy;
	struct group *group;

	gnode = node->parent;
	group = (struct group *)gnode;

	if(gnode->child == node)
		gnode->child = node->next;
	if (node->prev)
		node->prev->next = node->next;
	if (node->next)
		node->next->prev = node->prev;

	ops->remove(gaimbuddylist, node);
	g_hash_table_destroy(buddy->settings);
	g_free(buddy->name);
	g_free(buddy->alias);

}

struct buddy *gaim_find_buddy(struct gaim_account *account, const char *name)
{
	GaimBlistNode *group;
	GaimBlistNode *buddy;
	char *norm_name = g_strdup(normalize(name));

	if (!gaimbuddylist)
		return NULL;

	group = gaimbuddylist->root;
	while (group) {
		buddy = group->child;
		while (buddy) {
			if(GAIM_BLIST_NODE_IS_BUDDY(buddy)) {
				if (!gaim_utf8_strcasecmp(normalize(((struct buddy*)buddy)->name), norm_name) && account == ((struct buddy*)buddy)->account) {
					g_free(norm_name);
					return (struct buddy*)buddy;
				}
			}
			buddy = buddy->next;
		}
		group = group->next;
	}
	g_free(norm_name);
	return NULL;
}

struct group *gaim_find_group(const char *name)
{
	GaimBlistNode *node;

5247:60983a46700e

	if (!node)
		return NULL;
	return gaim_blist_get_last_sibling(node->child);
}

struct _gaim_hbuddy {
	char *name;
	struct gaim_account *account;
};

static guint _gaim_blist_hbuddy_hash (struct _gaim_hbuddy *hb)
{
	return g_str_hash(hb->name);
}

static guint _gaim_blist_hbuddy_equal (struct _gaim_hbuddy *hb1, struct _gaim_hbuddy *hb2)
{
	return ((!strcmp(hb1->name, hb2->name)) && hb1->account == hb2->account);
}

/*****************************************************************************
 * Public API functions                                                      *
 *****************************************************************************/

struct gaim_buddy_list *gaim_blist_new()
{
	struct gaim_buddy_list *gbl = g_new0(struct gaim_buddy_list, 1);

	gbl->ui_ops = gaim_get_blist_ui_ops();

	gbl->buddies = g_hash_table_new ((GHashFunc)_gaim_blist_hbuddy_hash, 
					 (GEqualFunc)_gaim_blist_hbuddy_equal);

	if (gbl->ui_ops != NULL && gbl->ui_ops->new_list != NULL)
		gbl->ui_ops->new_list(gbl);

	return gbl;

void  gaim_blist_add_buddy (struct buddy *buddy, struct group *group, GaimBlistNode *node)
{
	GaimBlistNode *n = node, *bnode = (GaimBlistNode*)buddy;
	struct group *g = group;
	struct gaim_blist_ui_ops *ops = gaimbuddylist->ui_ops;
	struct _gaim_hbuddy *hb;
	gboolean save = FALSE;

	if (!n) {
		if (!g) {
			g = gaim_group_new(_("Buddies"));

		((GaimBlistNode*)buddy)->next = NULL;
		((GaimBlistNode*)buddy)->prev = NULL;
		((GaimBlistNode*)buddy)->parent = (GaimBlistNode*)g;
	}

	hb = g_malloc(sizeof(struct _gaim_hbuddy));
	hb->name = g_strdup(normalize(buddy->name));
	hb->account = buddy->account;

	if (g_hash_table_lookup(gaimbuddylist->buddies, (gpointer)hb)) {
		/* This guy already exists */
		g_free(hb->name);
		g_free(hb);
	} else {
		g_hash_table_insert(gaimbuddylist->buddies, (gpointer)hb, (gpointer)buddy);
	}

	if (ops)
		ops->update(gaimbuddylist, (GaimBlistNode*)buddy);
	if (save)
		gaim_blist_save();
}

{
	struct gaim_blist_ui_ops *ops = gaimbuddylist->ui_ops;

	GaimBlistNode *gnode, *node = (GaimBlistNode*)buddy;
	struct group *group;
	struct _gaim_hbuddy hb, *key;
	struct buddy *val;

	gnode = node->parent;
	group = (struct group *)gnode;

	if(gnode->child == node)
		gnode->child = node->next;
	if (node->prev)
		node->prev->next = node->next;
	if (node->next)
		node->next->prev = node->prev;

	hb.name = normalize(buddy->name);
	hb.account = buddy->account;
	if (g_hash_table_lookup_extended(gaimbuddylist->buddies, &hb, (gpointer *)&key, (gpointer *)&val)) {
		g_hash_table_remove(gaimbuddylist->buddies, &hb);
		g_free(key->name);
		g_free(key);
	}

	ops->remove(gaimbuddylist, node);
	g_hash_table_destroy(buddy->settings);
	g_free(buddy->name);
	g_free(buddy->alias);

}

struct buddy *gaim_find_buddy(struct gaim_account *account, const char *name)
{
	struct buddy *buddy;
	struct _gaim_hbuddy hb;

	if (!gaimbuddylist)
		return NULL;

	hb.name = normalize(name);
	hb.account = account;
	buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb);

	return buddy;
}

struct group *gaim_find_group(const char *name)
{
	GaimBlistNode *node;