vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

monitor.{c,h} stuff for libratbox3.

Browse source
This commit is contained in:
Valery Yatsko 2008-04-02 02:55:34 +04:00
parent 637c4932f6
commit 423f18a073
2 changed files with 66 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/monitor.h
View file

@ -10,6 +10,8 @@
#ifndef INCLUDED_monitor_h #ifndef INCLUDED_monitor_h
#define INCLUDED_monitor_h #define INCLUDED_monitor_h
struct BlockHeap;
struct monitor struct monitor
{ {
struct monitor *hnext; struct monitor *hnext;
@ -17,14 +19,15 @@ struct monitor
rb_dlink_list users; rb_dlink_list users;
}; };
extern BlockHeap *monitor_heap; extern struct monitor *monitorTable[];
#define MONITOR_HASH_BITS 16
#define MONITOR_HASH_SIZE (1<<MONITOR_HASH_BITS)
#define MONITOR_HASH_SIZE 65536 void free_monitor(struct monitor *);
#define MONITOR_HASH_BITS 16
void init_monitor(void); void init_monitor(void);
struct monitor *find_monitor(const char *name, int add); struct monitor *find_monitor(const char *name, int add);
void clear_monitor(struct Client *);
void monitor_signon(struct Client *); void monitor_signon(struct Client *);
void monitor_signoff(struct Client *); void monitor_signoff(struct Client *);

148
src/monitor.c
View file

@ -37,51 +37,54 @@
#include "hash.h" #include "hash.h"
#include "numeric.h" #include "numeric.h"
static struct monitor *monitorTable[MONITOR_HASH_SIZE]; struct monitor *monitorTable[MONITOR_HASH_SIZE];
BlockHeap *monitor_heap; static rb_bh *monitor_heap;
static void cleanup_monitor(void *unused);
void void
init_monitor(void) init_monitor(void)
{ {
monitor_heap = BlockHeapCreate(sizeof(struct monitor), MONITOR_HEAP_SIZE); monitor_heap = rb_bh_create(sizeof(struct monitor), MONITOR_HEAP_SIZE, "monitor_heap");
eventAddIsh("cleanup_monitor", cleanup_monitor, NULL, 3600);
} }
static inline unsigned int static inline unsigned int
hash_monitor_nick(const char *name) hash_monitor_nick(const char *name)
{ {
return fnv_hash_upper((const unsigned char *) name, MONITOR_HASH_BITS); return fnv_hash_upper((const unsigned char *)name, MONITOR_HASH_BITS, 0);
} }
struct monitor * struct monitor *
find_monitor(const char *name, int add) find_monitor(const char *name, int add)
{ {
struct monitor *monptr; struct monitor *monptr;
unsigned int hashv = hash_monitor_nick(name); unsigned int hashv = hash_monitor_nick(name);
for(monptr = monitorTable[hashv]; monptr; monptr = monptr->hnext) for(monptr = monitorTable[hashv]; monptr; monptr = monptr->hnext)
{ {
if(!irccmp(monptr->name, name)) if(!irccmp(monptr->name, name))
return monptr; return monptr;
} }
if(add) if(add)
{ {
monptr = BlockHeapAlloc(monitor_heap); monptr = rb_bh_alloc(monitor_heap);
strlcpy(monptr->name, name, sizeof(monptr->name)); rb_strlcpy(monptr->name, name, sizeof(monptr->name));
monptr->hnext = monitorTable[hashv]; monptr->hnext = monitorTable[hashv];
monitorTable[hashv] = monptr; monitorTable[hashv] = monptr;
return monptr; return monptr;
} }
return NULL; return NULL;
} }
void
free_monitor(struct monitor *monptr)
{
rb_bh_free(monitor_heap, monptr);
}
/* monitor_signon() /* monitor_signon()
* *
* inputs - client who has just connected * inputs - client who has just connected
@ -92,16 +95,15 @@ find_monitor(const char *name, int add)
void void
monitor_signon(struct Client *client_p) monitor_signon(struct Client *client_p)
{ {
char buf[USERHOST_REPLYLEN]; char buf[USERHOST_REPLYLEN];
struct monitor *monptr = find_monitor(client_p->name, 0); struct monitor *monptr = find_monitor(client_p->name, 0);
/* noones watching this nick */ /* noones watching this nick */
if(monptr == NULL) if(monptr == NULL)
return; return;
rb_snprintf(buf, sizeof(buf), "%s!%s@%s", rb_snprintf(buf, sizeof(buf), "%s!%s@%s", client_p->name, client_p->username, client_p->host);
client_p->name, client_p->username, client_p->host);
sendto_monitor(monptr, form_str(RPL_MONONLINE), me.name, "*", buf); sendto_monitor(monptr, form_str(RPL_MONONLINE), me.name, "*", buf);
} }
@ -115,62 +117,30 @@ monitor_signon(struct Client *client_p)
void void
monitor_signoff(struct Client *client_p) monitor_signoff(struct Client *client_p)
{ {
struct monitor *monptr = find_monitor(client_p->name, 0); struct monitor *monptr = find_monitor(client_p->name, 0);
/* noones watching this nick */ /* noones watching this nick */
if(monptr == NULL) if(monptr == NULL)
return; return;
sendto_monitor(monptr, form_str(RPL_MONOFFLINE), me.name, "*", sendto_monitor(monptr, form_str(RPL_MONOFFLINE), me.name, "*",
client_p->name); client_p->name);
} }
void void
clear_monitor(struct Client *client_p) clear_monitor(struct Client *client_p)
{ {
struct monitor *monptr; struct monitor *monptr;
rb_dlink_node *ptr, *next_ptr; rb_dlink_node *ptr, *next_ptr;
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head)
{ {
monptr = ptr->data; monptr = ptr->data;
/* we leave the actual entry around with no users, itll be rb_dlinkFindDestroy(client_p, &monptr->users);
* cleaned up periodically by cleanup_monitor() --anfl rb_free_rb_dlink_node(ptr);
*/ }
rb_dlinkFindDestroy(client_p, &monptr->users);
free_rb_dlink_node(ptr); client_p->localClient->monitor_list.head = client_p->localClient->monitor_list.tail = NULL;
}
client_p->localClient->monitor_list.head = client_p->localClient->monitor_list.tail = NULL;
client_p->localClient->monitor_list.length = 0; client_p->localClient->monitor_list.length = 0;
} }
static void
cleanup_monitor(void *unused)
{
struct monitor *last_ptr = NULL;
struct monitor *next_ptr, *ptr;
int i;
for(i = 0; i < MONITOR_HASH_SIZE; i++)
{
last_ptr = NULL;
for(ptr = monitorTable[i]; ptr; ptr = next_ptr)
{
next_ptr = ptr->hnext;
if(!rb_dlink_list_length(&ptr->users))
{
if(last_ptr)
last_ptr->hnext = next_ptr;
else
monitorTable[i] = next_ptr;
BlockHeapFree(monitor_heap, ptr);
}
else
last_ptr = ptr;
}
}
}