Need to initialize linebuf separately.

[irc/rqf/shadowircd.git] / src / s_stats.c

diff --git a/src/s_stats.c b/src/s_stats.c
index 17a1d6ed3325fd4bd25b0c84246d23e2fee20774..c972293a3344cd948e6f0529db3ce17746fe0aaf 100644 (file)
--- a/src/s_stats.c
+++ b/src/s_stats.c
@@ -30,9 +30,7 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "send.h"
-#include "memory.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "whowas.h"
@@ -70,7 +68,7 @@ tstats(struct Client *source_p)
        sp = &tmp;
        memcpy(sp, ServerStats, sizeof(struct ServerStatistics));
 
-       DLINK_FOREACH(ptr, serv_list.head)
+       RB_DLINK_FOREACH(ptr, serv_list.head)
        {
                target_p = ptr->data;
 
@@ -78,7 +76,7 @@ tstats(struct Client *source_p)
                sp->is_sbr += target_p->localClient->receiveB;
                sp->is_sks += target_p->localClient->sendK;
                sp->is_skr += target_p->localClient->receiveK;
-               sp->is_sti += CurrentTime - target_p->localClient->firsttime;
+               sp->is_sti += rb_current_time() - target_p->localClient->firsttime;
                sp->is_sv++;
                if(sp->is_sbs > 1023)
                {
@@ -92,7 +90,7 @@ tstats(struct Client *source_p)
                }
        }
 
-       DLINK_FOREACH(ptr, lclient_list.head)
+       RB_DLINK_FOREACH(ptr, lclient_list.head)
        {
                target_p = ptr->data;
 
@@ -100,7 +98,7 @@ tstats(struct Client *source_p)
                sp->is_cbr += target_p->localClient->receiveB;
                sp->is_cks += target_p->localClient->sendK;
                sp->is_ckr += target_p->localClient->receiveK;
-               sp->is_cti += CurrentTime - target_p->localClient->firsttime;
+               sp->is_cti += rb_current_time() - target_p->localClient->firsttime;
                sp->is_cl++;
                if(sp->is_cbs > 1023)
                {
@@ -115,7 +113,7 @@ tstats(struct Client *source_p)
 
        }
 
-       DLINK_FOREACH(ptr, unknown_list.head)
+       RB_DLINK_FOREACH(ptr, unknown_list.head)
        {
                sp->is_ni++;
        }
@@ -218,7 +216,7 @@ count_memory(struct Client *source_p)
 
        count_whowas_memory(&ww, &wwm);
 
-       DLINK_FOREACH(ptr, global_client_list.head)
+       RB_DLINK_FOREACH(ptr, global_client_list.head)
        {
                target_p = ptr->data;
                if(MyConnect(target_p))
@@ -240,7 +238,7 @@ count_memory(struct Client *source_p)
        }
 
        /* Count up all channels, ban lists, except lists, Invex lists */
-       DLINK_FOREACH(ptr, global_channel_list.head)
+       RB_DLINK_FOREACH(ptr, global_channel_list.head)
        {
                chptr = ptr->data;
                channel_count++;
@@ -249,7 +247,7 @@ count_memory(struct Client *source_p)
                channel_users += rb_dlink_list_length(&chptr->members);
                channel_invites += rb_dlink_list_length(&chptr->invites);
 
-               DLINK_FOREACH(rb_dlink, chptr->banlist.head)
+               RB_DLINK_FOREACH(rb_dlink, chptr->banlist.head)
                {
                        actualBan = rb_dlink->data;
                        channel_bans++;
@@ -257,7 +255,7 @@ count_memory(struct Client *source_p)
                        channel_ban_memory += sizeof(rb_dlink_node) + sizeof(struct Ban);
                }
 
-               DLINK_FOREACH(rb_dlink, chptr->exceptlist.head)
+               RB_DLINK_FOREACH(rb_dlink, chptr->exceptlist.head)
                {
                        actualBan = rb_dlink->data;
                        channel_except++;
@@ -265,7 +263,7 @@ count_memory(struct Client *source_p)
                        channel_except_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
                }
 
-               DLINK_FOREACH(rb_dlink, chptr->invexlist.head)
+               RB_DLINK_FOREACH(rb_dlink, chptr->invexlist.head)
                {
                        actualBan = rb_dlink->data;
                        channel_invex++;
@@ -273,7 +271,7 @@ count_memory(struct Client *source_p)
                        channel_invex_memory += (sizeof(rb_dlink_node) + sizeof(struct Ban));
                }
 
-               DLINK_FOREACH(rb_dlink, chptr->quietlist.head)
+               RB_DLINK_FOREACH(rb_dlink, chptr->quietlist.head)
                {
                        actualBan = rb_dlink->data;
                        channel_quiets++;
@@ -286,7 +284,7 @@ count_memory(struct Client *source_p)
 
        class_count = rb_dlink_list_length(&class_list) + 1;
 
-       count_linebuf_memory(&linebuf_count, &linebuf_memory_used);
+       rb_count_rb_linebuf_memory(&linebuf_count, &linebuf_memory_used);
 
        sendto_one_numeric(source_p, RPL_STATSDEBUG,
                           "z :Users %u(%lu) Invites %u(%lu)",