#include "ircd.h"
#include "jupe.h"
#include "list.h"
+#include "listener.h"
#include "motd.h"
#include "msgq.h"
#include "numeric.h"
#include "res.h"
#include "s_bsd.h"
#include "s_conf.h"
+#include "s_user.h"
#include "s_stats.h"
#include "send.h"
#include "struct.h"
#include "sys.h"
#include "whowas.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <errno.h>
#include <fcntl.h>
#include <stdarg.h>
#if defined(USE_POLL) && defined(HAVE_POLL_H)
AddC('U');
#endif
+#ifdef IPV6
+ AddC('6');
+#endif
serveropts[i] = '\0';
* If the -t option is not given on the command line when the server is
* started, all debugging output is sent to the file set by LPATH in config.h
* Here we just open that file and make sure it is opened to fd 2 so that
- * any fprintf's to stderr also goto the logfile. If the debuglevel is not
+ * any fprintf's to stderr also go to the logfile. If the debuglevel is not
* set from the command line by -x, use /dev/null as the dummy logfile as long
- * as DEBUGMODE has been defined, else dont waste the fd.
+ * as DEBUGMODE has been defined, else don't waste the fd.
* @param use_tty Passed to log_debug_init().
*/
void debug_init(int use_tty)
cn = 0, /* connections */
ch = 0, /* channels */
lcc = 0, /* local client conf links */
- us = 0, /* user structs */
chi = 0, /* channel invites */
chb = 0, /* channel bans */
wwu = 0, /* whowas users */
cl = 0, /* classes */
co = 0, /* conf lines */
+ listeners = 0, /* listeners */
memberships = 0; /* channel memberships */
int usi = 0, /* users invited */
chbm = 0, /* memory used by channel bans */
cm = 0, /* memory used by clients */
cnm = 0, /* memory used by connections */
+ us = 0, /* user structs */
+ usm = 0, /* memory used by user structs */
awm = 0, /* memory used by aways */
wwam = 0, /* whowas away memory used */
wwm = 0, /* whowas array memory used */
dbufs_used = 0, /* memory used by dbufs */
msg_allocated = 0, /* memory used by struct Msg */
msgbuf_allocated = 0, /* memory used by struct MsgBuf */
+ listenersm = 0, /* memory used by listetners */
rm = 0, /* res memory used */
totcl = 0, totch = 0, totww = 0, tot = 0;
}
if (cli_user(acptr))
{
- us++;
for (link = cli_user(acptr)->invited; link; link = link->next)
usi++;
for (member = cli_user(acptr)->channel; member; member = member->next_channel)
}
cm = c * sizeof(struct Client);
cnm = cn * sizeof(struct Connection);
+ user_count_memory(&us, &usm);
for (chptr = GlobalChannelList; chptr; chptr = chptr->next)
{
chm += (strlen(chptr->chname) + sizeof(struct Channel));
for (link = chptr->invites; link; link = link->next)
chi++;
- for (ban = chptr->banlist; link; ban = ban->next)
+ for (ban = chptr->banlist; ban; ban = ban->next)
{
chb++;
chbm += strlen(ban->who) + strlen(ban->banstr) + 2 + sizeof(*ban);
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) Accounts %d(%zu) Invites %d(%zu)",
- us, us * sizeof(struct User), acc, acc * (ACCOUNTLEN + 1),
+ ":Users %zu(%zu) Accounts %d(%zu) Invites %d(%zu)",
+ us, usm, acc, acc * (ACCOUNTLEN + 1),
usi, usi * sizeof(struct SLink));
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":User channels %d(%zu) Aways %d(%zu)", memberships,
memberships * sizeof(struct Membership), aw, awm);
- send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Attached confs %d(%zu)",
- lcc, lcc * sizeof(struct SLink));
totcl = cm + cnm + us * sizeof(struct User) + memberships * sizeof(struct Membership) + awm;
totcl += lcc * sizeof(struct SLink) + usi * sizeof(struct SLink);
- send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Conflines %d(%zu)", co,
- com);
-
- send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Classes %d(%zu)", cl,
- cl * sizeof(struct ConnectionClass));
+ send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Conflines %d(%zu) Attached %d(%zu) Classes %d(%zu)",
+ co, com, lcc, lcc * sizeof(struct SLink),
+ cl, cl * sizeof(struct ConnectionClass));
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":Channels %d(%zu) Bans %d(%zu)", ch, chm, chb, chbm);
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
- ":Channel membrs %d(%zu) invite %d(%zu)", memberships,
+ ":Channel Members %d(%zu) Invites %d(%zu)", memberships,
memberships * sizeof(struct Membership), chi,
chi * sizeof(struct SLink));
totch = chm + chbm + chi * sizeof(struct SLink);
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
- ":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)",
- feature_int(FEAT_NICKNAMEHISTORYLENGTH), wwm);
+ ":Whowas Users %d(%zu) Away %d(%zu) Array %d(%zu)",
+ wwu, wwu * sizeof(struct User), wwa, wwam,
+ feature_int(FEAT_NICKNAMEHISTORYLENGTH), wwm);
totww = wwu * sizeof(struct User) + wwam + wwm;
":Hash: client %d(%zu), chan is the same", HASHSIZE,
sizeof(void *) * HASHSIZE);
+ count_listener_memory(&listeners, &listenersm);
+ send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
+ ":Listeners allocated %d(%zu)", listeners, listenersm);
/*
* NOTE: this count will be accurate only for the exact instant that this
* message is being sent, so the count is affected by the dbufs that
totww, totch, totcl, com, dbufs_allocated, msg_allocated,
msgbuf_allocated);
}
-