* $Id$
*
*/
+#include "config.h"
+
#include "s_debug.h"
#include "channel.h"
#include "class.h"
#include "client.h"
+#include "gline.h"
#include "hash.h"
#include "ircd_alloc.h"
#include "ircd_features.h"
#include "ircd_osdep.h"
#include "ircd_reply.h"
#include "ircd.h"
+#include "jupe.h"
#include "list.h"
+#include "motd.h"
#include "msgq.h"
#include "numeric.h"
#include "numnicks.h"
#include "res.h"
#include "s_bsd.h"
#include "s_conf.h"
+#include "s_stats.h"
#include "send.h"
#include "struct.h"
#include "sys.h"
AddC((char)('0' + (bp / 1000000) % 10));
}
-#ifdef CHROOTDIR
- AddC('c');
+#ifndef NDEBUG
+ AddC('A');
#endif
#ifdef DEBUGMODE
AddC('D');
#endif
- if (feature_bool(FEAT_LOCOP_REHASH))
- AddC('e');
-
- if (feature_bool(FEAT_OPER_REHASH))
- AddC('E');
-
- if (feature_bool(FEAT_OPER_NO_CHAN_LIMIT))
- AddC('F');
-
- if (feature_bool(FEAT_OPER_MODE_LCHAN))
- AddC('f');
-
if (feature_bool(FEAT_HUB))
AddC('H');
- if (feature_bool(FEAT_SHOW_ALL_INVISIBLE_USERS))
- AddC('I');
- else if (feature_bool(FEAT_SHOW_INVISIBLE_USERS))
- AddC('i');
-
- if (feature_bool(FEAT_OPER_KILL)) {
- if (feature_bool(FEAT_LOCAL_KILL_ONLY))
- AddC('k');
- else
- AddC('K');
- }
-
- if (feature_bool(FEAT_OPER_WALK_THROUGH_LMODES))
- AddC('l');
-
if (feature_bool(FEAT_IDLE_FROM_MSG))
AddC('M');
- if (feature_bool(FEAT_NO_OPER_DEOP_LCHAN))
- AddC('o');
-
- if (feature_bool(FEAT_CRYPT_OPER_PASSWORD))
- AddC('p');
-
if (feature_bool(FEAT_RELIABLE_CLOCK))
AddC('R');
- if (feature_bool(FEAT_LOCOP_RESTART))
- AddC('s');
-
- if (feature_bool(FEAT_OPER_RESTART))
- AddC('S');
-
#if defined(USE_POLL) && defined(HAVE_POLL_H)
AddC('U');
#endif
* different field names for "struct rusage".
* -avalon
*/
-void send_usage(struct Client *cptr, char *nick)
+void send_usage(struct Client *cptr, const struct StatDesc *sd,
+ char *param)
{
os_get_rusage(cptr, CurrentTime - cli_since(&me), debug_enumerator);
}
#endif /* DEBUGMODE */
-void count_memory(struct Client *cptr, char *nick)
+void count_memory(struct Client *cptr, const struct StatDesc *sd,
+ char *param)
{
struct Client *acptr;
struct SLink *link;
const struct ConnectionClass* cltmp;
struct Membership* member;
- int c = 0, /* clients */
+ int acc = 0, /* accounts */
+ c = 0, /* clients */
cn = 0, /* connections */
ch = 0, /* channels */
lcc = 0, /* local client conf links */
int usi = 0, /* users invited */
aw = 0, /* aways set */
- wwa = 0; /* whowas aways */
+ wwa = 0, /* whowas aways */
+ gl = 0, /* glines */
+ ju = 0; /* jupes */
size_t chm = 0, /* memory used by channels */
chbm = 0, /* memory used by channel bans */
awm = 0, /* memory used by aways */
wwam = 0, /* whowas away memory used */
wwm = 0, /* whowas array memory used */
+ glm = 0, /* memory used by glines */
+ jum = 0, /* memory used by jupes */
com = 0, /* memory used by conf lines */
dbufs_allocated = 0, /* memory used by dbufs */
dbufs_used = 0, /* memory used by dbufs */
msg_allocated = 0, /* memory used by struct Msg */
- msg_used = 0, /* memory used by struct Msg */
msgbuf_allocated = 0, /* memory used by struct MsgBuf */
- msgbuf_used = 0, /* memory used by struct MsgBuf */
rm = 0, /* res memory used */
totcl = 0, totch = 0, totww = 0, tot = 0;
count_whowas_memory(&wwu, &wwm, &wwa, &wwam);
- wwm += sizeof(struct Whowas) * NICKNAMEHISTORYLENGTH;
+ wwm += sizeof(struct Whowas) * feature_int(FEAT_NICKNAMEHISTORYLENGTH);
wwm += sizeof(struct Whowas *) * WW_MAX;
for (acptr = GlobalClientList; acptr; acptr = cli_next(acptr))
awm += (strlen(cli_user(acptr)->away) + 1);
}
}
+
+ if (IsAccount(acptr))
+ acc++;
}
cm = c * sizeof(struct Client);
cnm = cn * sizeof(struct Connection);
{
ch++;
chm += (strlen(chptr->chname) + sizeof(struct Channel));
-#if 0
- /*
- * XXX - Members already counted in clients, don't count twice
- */
- for (member = chptr->members; member; member = member->next_member)
- chu++;
-#endif
for (link = chptr->invites; link; link = link->next)
chi++;
for (link = chptr->banlist; link; link = link->next)
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":Clients %d(%zu) Connections %d(%zu)", c, cm, cn, cnm);
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
- ":Users %d(%zu) Invites %d(%zu)", us, us * sizeof(struct User),
+ ":Users %d(%zu) Accounts %d(%zu) Invites %d(%zu)",
+ us, us * sizeof(struct User), acc, acc * (ACCOUNTLEN + 1),
usi, usi * sizeof(struct SLink));
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":User channels %d(%zu) Aways %d(%zu)", memberships,
":Whowas users %d(%zu) away %d(%zu)", wwu,
wwu * sizeof(struct User), wwa, wwam);
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Whowas array %d(%zu)",
- NICKNAMEHISTORYLENGTH, wwm);
+ feature_int(FEAT_NICKNAMEHISTORYLENGTH), wwm);
totww = wwu * sizeof(struct User) + wwam + wwm;
+ motd_memory_count(cptr);
+
+ gl = gline_memory_count(&glm);
+ ju = jupe_memory_count(&jum);
+ send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
+ ":Glines %d(%zu) Jupes %d(%zu)", gl, glm, ju, jum);
+
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":Hash: client %d(%zu), chan is the same", HASHSIZE,
sizeof(void *) * HASHSIZE);
":DBufs allocated %d(%zu) used %d(%zu)", DBufAllocCount,
dbufs_allocated, DBufUsedCount, dbufs_used);
- msgq_count_memory(&msg_allocated, &msg_used, &msgbuf_allocated,
- &msgbuf_used);
- send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
- ":Msgs allocated %d(%zu) used %d(%zu)", msgCounts.alloc,
- msg_allocated, msgCounts.used, msg_used);
- send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
- ":MsgBufs allocated %d(%zu) used %d(%zu)", msgBufCounts.alloc,
- msgbuf_allocated, msgBufCounts.used, msgbuf_used);
+ /* The DBuf caveats now count for this, but this routine now sends
+ * replies all on its own.
+ */
+ msgq_count_memory(cptr, &msg_allocated, &msgbuf_allocated);
rm = cres_mem(cptr);
dbufs_allocated + msg_allocated + msgbuf_allocated + rm;
tot += sizeof(void *) * HASHSIZE * 3;
-#if !defined(NDEBUG)
+#if defined(MDEBUG)
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Allocations: %zu(%zu)",
fda_get_block_count(), fda_get_byte_count());
#endif
projects / ircu2.10.12-pk.git / blobdiff