* $Id: monitor.c 3520 2007-06-30 22:15:35Z jilles $
*/
#include "stdinc.h"
-#include "tools.h"
#include "client.h"
-#include "memory.h"
-#include "balloc.h"
#include "monitor.h"
#include "hash.h"
-#include "event.h"
#include "numeric.h"
-static struct monitor *monitorTable[MONITOR_HASH_SIZE];
-BlockHeap *monitor_heap;
-
-static void cleanup_monitor(void *unused);
+struct monitor *monitorTable[MONITOR_HASH_SIZE];\r
+static rb_bh *monitor_heap;
void
init_monitor(void)
{
- monitor_heap = BlockHeapCreate(sizeof(struct monitor), MONITOR_HEAP_SIZE);
- eventAddIsh("cleanup_monitor", cleanup_monitor, NULL, 3600);
+ monitor_heap = rb_bh_create(sizeof(struct monitor), MONITOR_HEAP_SIZE, "monitor_heap");
}
static inline unsigned int
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 *
find_monitor(const char *name, int add)
{
- struct monitor *monptr;
-
- unsigned int hashv = hash_monitor_nick(name);
-
- for(monptr = monitorTable[hashv]; monptr; monptr = monptr->hnext)
- {
- if(!irccmp(monptr->name, name))
- return monptr;
- }
-
- if(add)
- {
- monptr = BlockHeapAlloc(monitor_heap);
- strlcpy(monptr->name, name, sizeof(monptr->name));
-
- monptr->hnext = monitorTable[hashv];
- monitorTable[hashv] = monptr;
-
- return monptr;
- }
-
+ struct monitor *monptr;\r
+\r
+ unsigned int hashv = hash_monitor_nick(name);\r
+\r
+ for(monptr = monitorTable[hashv]; monptr; monptr = monptr->hnext)\r
+ {\r
+ if(!irccmp(monptr->name, name))\r
+ return monptr;\r
+ }\r
+\r
+ if(add)\r
+ {\r
+ monptr = rb_bh_alloc(monitor_heap);\r
+ rb_strlcpy(monptr->name, name, sizeof(monptr->name));\r
+\r
+ monptr->hnext = monitorTable[hashv];\r
+ monitorTable[hashv] = monptr;\r
+\r
+ return monptr;\r
+ }\r
+\r
return NULL;
}
+void\r
+free_monitor(struct monitor *monptr)\r
+{\r
+ rb_bh_free(monitor_heap, monptr);\r
+}
+
/* monitor_signon()
*
* inputs - client who has just connected
void
monitor_signon(struct Client *client_p)
{
- char buf[USERHOST_REPLYLEN];
- struct monitor *monptr = find_monitor(client_p->name, 0);
-
- /* noones watching this nick */
- if(monptr == NULL)
- return;
-
- rb_snprintf(buf, sizeof(buf), "%s!%s@%s",
- client_p->name, client_p->username, client_p->host);
-
+ char buf[USERHOST_REPLYLEN];\r
+ struct monitor *monptr = find_monitor(client_p->name, 0);\r
+\r
+ /* noones watching this nick */\r
+ if(monptr == NULL)\r
+ return;\r
+\r
+ rb_snprintf(buf, sizeof(buf), "%s!%s@%s", client_p->name, client_p->username, client_p->host);\r
+\r
sendto_monitor(monptr, form_str(RPL_MONONLINE), me.name, "*", buf);
}
void
monitor_signoff(struct Client *client_p)
{
- struct monitor *monptr = find_monitor(client_p->name, 0);
-
- /* noones watching this nick */
- if(monptr == NULL)
- return;
-
- sendto_monitor(monptr, form_str(RPL_MONOFFLINE), me.name, "*",
+ struct monitor *monptr = find_monitor(client_p->name, 0);\r
+\r
+ /* noones watching this nick */\r
+ if(monptr == NULL)\r
+ return;\r
+\r
+ sendto_monitor(monptr, form_str(RPL_MONOFFLINE), me.name, "*",\r
client_p->name);
}
void
clear_monitor(struct Client *client_p)
{
- struct monitor *monptr;
- rb_dlink_node *ptr, *next_ptr;
-
- RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head)
- {
- monptr = ptr->data;
-
- /* we leave the actual entry around with no users, itll be
- * cleaned up periodically by cleanup_monitor() --anfl
- */
- rb_dlinkFindDestroy(client_p, &monptr->users);
- free_rb_dlink_node(ptr);
- }
-
- client_p->localClient->monitor_list.head = client_p->localClient->monitor_list.tail = NULL;
+ struct monitor *monptr;\r
+ rb_dlink_node *ptr, *next_ptr;\r
+\r
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head)\r
+ {\r
+ monptr = ptr->data;\r
+\r
+ rb_dlinkFindDestroy(client_p, &monptr->users);\r
+ rb_free_rb_dlink_node(ptr);\r
+ }\r
+\r
+ client_p->localClient->monitor_list.head = client_p->localClient->monitor_list.tail = NULL;\r
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;
- }
- }
-}