MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-30 12:48:54 +02:00
Code Issues Releases Wiki Activity

ircd: scache: use irc_radixtree

Browse source
This commit is contained in:
William Pitcock 2016-01-09 05:55:46 -06:00
parent ed4d1541ff
commit a21e57bebe
1 changed files with 37 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
ircd/scache.c
View file

@ -1,5 +1,5 @@
/* /*
* ircd-ratbox: A slightly useful ircd. * charybdis
* scache.c: Server names cache. * scache.c: Server names cache.
* *
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@ -20,8 +20,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
*
* $Id: scache.c 6 2005-09-10 01:02:21Z nenolod $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -34,7 +32,7 @@
#include "scache.h" #include "scache.h"
#include "s_conf.h" #include "s_conf.h"
#include "s_assert.h" #include "s_assert.h"
#include "irc_radixtree.h"
/* /*
* ircd used to store full servernames in anUser as well as in the * ircd used to store full servernames in anUser as well as in the
@ -46,11 +44,11 @@
* *
* reworked to serve for flattening/delaying /links also * reworked to serve for flattening/delaying /links also
* -- jilles * -- jilles
*
* reworked to make use of irc_radixtree.
* -- kaniini
*/ */
#define SCACHE_HASH_SIZE 257
#define SC_ONLINE 1 #define SC_ONLINE 1
#define SC_HIDDEN 2 #define SC_HIDDEN 2
@ -62,43 +60,24 @@ struct scache_entry
time_t known_since; time_t known_since;
time_t last_connect; time_t last_connect;
time_t last_split; time_t last_split;
struct scache_entry *next;
}; };
static struct scache_entry *scache_hash[SCACHE_HASH_SIZE]; static struct irc_radixtree *scache_tree = NULL;
void void
clear_scache_hash_table(void) clear_scache_hash_table(void)
{ {
memset(scache_hash, 0, sizeof(scache_hash)); scache_tree = irc_radixtree_create("server names cache", irc_radixtree_irccasecanon);
}
static int
sc_hash(const char *string)
{
int hash_value;
hash_value = 0;
while (*string)
{
hash_value += ToLower(*string++);
}
return hash_value % SCACHE_HASH_SIZE;
} }
static struct scache_entry * static struct scache_entry *
find_or_add(const char *name) find_or_add(const char *name)
{ {
int hash_index;
struct scache_entry *ptr; struct scache_entry *ptr;
ptr = scache_hash[hash_index = sc_hash(name)]; ptr = irc_radixtree_retrieve(scache_tree, name);
for (; ptr; ptr = ptr->next) if (ptr != NULL)
{ return ptr;
if(!irccmp(ptr->name, name))
return ptr;
}
ptr = (struct scache_entry *) rb_malloc(sizeof(struct scache_entry)); ptr = (struct scache_entry *) rb_malloc(sizeof(struct scache_entry));
s_assert(0 != ptr); s_assert(0 != ptr);
@ -110,8 +89,8 @@ find_or_add(const char *name)
ptr->last_connect = 0; ptr->last_connect = 0;
ptr->last_split = 0; ptr->last_split = 0;
ptr->next = scache_hash[hash_index]; irc_radixtree_add(scache_tree, ptr->name, ptr);
scache_hash[hash_index] = ptr;
return ptr; return ptr;
} }
@ -155,29 +134,23 @@ void
scache_send_flattened_links(struct Client *source_p) scache_send_flattened_links(struct Client *source_p)
{ {
struct scache_entry *scache_ptr; struct scache_entry *scache_ptr;
int i; struct irc_radixtree_iteration_state iter;
int show; int show;
for (i = 0; i < SCACHE_HASH_SIZE; i++) IRC_RADIXTREE_FOREACH(scache_ptr, &iter, scache_tree)
{ {
scache_ptr = scache_hash[i]; if (!irccmp(scache_ptr->name, me.name))
while (scache_ptr) show = FALSE;
{ else if (scache_ptr->flags & SC_HIDDEN &&
if (!irccmp(scache_ptr->name, me.name)) !ConfigServerHide.disable_hidden)
show = FALSE; show = FALSE;
else if (scache_ptr->flags & SC_HIDDEN && else if (scache_ptr->flags & SC_ONLINE)
!ConfigServerHide.disable_hidden) show = scache_ptr->known_since < rb_current_time() - ConfigServerHide.links_delay;
show = FALSE; else
else if (scache_ptr->flags & SC_ONLINE) show = scache_ptr->last_split > rb_current_time() - ConfigServerHide.links_delay && scache_ptr->last_split - scache_ptr->known_since > ConfigServerHide.links_delay;
show = scache_ptr->known_since < rb_current_time() - ConfigServerHide.links_delay; if (show)
else sendto_one_numeric(source_p, RPL_LINKS, form_str(RPL_LINKS),
show = scache_ptr->last_split > rb_current_time() - ConfigServerHide.links_delay && scache_ptr->last_split - scache_ptr->known_since > ConfigServerHide.links_delay; scache_ptr->name, me.name, 1, scache_ptr->info);
if (show)
sendto_one_numeric(source_p, RPL_LINKS, form_str(RPL_LINKS),
scache_ptr->name, me.name, 1, scache_ptr->info);
scache_ptr = scache_ptr->next;
}
} }
sendto_one_numeric(source_p, RPL_LINKS, form_str(RPL_LINKS), sendto_one_numeric(source_p, RPL_LINKS, form_str(RPL_LINKS),
me.name, me.name, 0, me.info); me.name, me.name, 0, me.info);
@ -197,21 +170,16 @@ void
scache_send_missing(struct Client *source_p) scache_send_missing(struct Client *source_p)
{ {
struct scache_entry *scache_ptr; struct scache_entry *scache_ptr;
int i; struct irc_radixtree_iteration_state iter;
for (i = 0; i < SCACHE_HASH_SIZE; i++) IRC_RADIXTREE_FOREACH(scache_ptr, &iter, scache_tree)
{ {
scache_ptr = scache_hash[i]; if (!(scache_ptr->flags & SC_ONLINE) && scache_ptr->last_split > rb_current_time() - MISSING_TIMEOUT)
while (scache_ptr) sendto_one_numeric(source_p, RPL_MAP, "** %s (recently split)",
{ scache_ptr->name);
if (!(scache_ptr->flags & SC_ONLINE) && scache_ptr->last_split > rb_current_time() - MISSING_TIMEOUT)
sendto_one_numeric(source_p, RPL_MAP, "** %s (recently split)",
scache_ptr->name);
scache_ptr = scache_ptr->next;
}
} }
} }
/* /*
* count_scache * count_scache
* inputs - pointer to where to leave number of servers cached * inputs - pointer to where to leave number of servers cached
@ -223,21 +191,15 @@ void
count_scache(size_t * number_servers_cached, size_t * mem_servers_cached) count_scache(size_t * number_servers_cached, size_t * mem_servers_cached)
{ {
struct scache_entry *scache_ptr; struct scache_entry *scache_ptr;
int i; struct irc_radixtree_iteration_state iter;
*number_servers_cached = 0; *number_servers_cached = 0;
*mem_servers_cached = 0; *mem_servers_cached = 0;
for (i = 0; i < SCACHE_HASH_SIZE; i++) IRC_RADIXTREE_FOREACH(scache_ptr, &iter, scache_tree)
{ {
scache_ptr = scache_hash[i]; *number_servers_cached = *number_servers_cached + 1;
while (scache_ptr) *mem_servers_cached = *mem_servers_cached +
{ sizeof(struct scache_entry);
*number_servers_cached = *number_servers_cached + 1;
*mem_servers_cached = *mem_servers_cached +
sizeof(struct scache_entry );
scache_ptr = scache_ptr->next;
}
} }
} }