Author: Ghostwolf <foxxe@wtfs.net>

[ircu2.10.12-pk.git] / ircd / s_debug.c

diff --git a/ircd/s_debug.c b/ircd/s_debug.c
index 32134b9f74f6b3ecd1193cd352ebe6b046fd2739..c45a5325917a1fb9bf532641859b7cd91192599b 100644 (file)
--- a/ircd/s_debug.c
+++ b/ircd/s_debug.c
@@ -20,12 +20,15 @@
  * $Id$
  *
  */
+#include "config.h"
+
 #include "s_debug.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
 #include "hash.h"
 #include "ircd_alloc.h"
+#include "ircd_features.h"
 #include "ircd_log.h"
 #include "ircd_osdep.h"
 #include "ircd_reply.h"
@@ -51,129 +54,100 @@
 #include <string.h>
 #include <unistd.h>
 
-/* *INDENT-OFF* */
-
 /*
  * Option string.  Must be before #ifdef DEBUGMODE.
  */
-char serveropts[] = {
-#if BUFFERPOOL < 1000000
-    'b',
-#if BUFFERPOOL > 99999
-    (char)('0' + (BUFFERPOOL/100000)),
-#endif
-#if BUFFERPOOL > 9999
-    (char)('0' + (BUFFERPOOL/10000) % 10),
-#endif
-    (char)('0' + (BUFFERPOOL/1000) % 10),
-#else
-    'B',
-#if BUFFERPOOL > 99999999
-    (char)('0' + (BUFFERPOOL/100000000)),
-#endif
-#if BUFFERPOOL > 9999999
-    (char)('0' + (BUFFERPOOL/10000000) % 10),
-#endif
-    (char)('0' + (BUFFERPOOL/1000000) % 10),
-#endif
-#ifdef  CHROOTDIR
-    'c',
-#endif
-#ifdef  CMDLINE_CONFIG
-    'C',
-#endif
-#ifdef  DO_ID
-    'd',
+static char serveropts[256]; /* should be large enough for anything */
+
+const char* debug_serveropts(void)
+{
+  int bp;
+  int i = 0;
+#define AddC(c)        serveropts[i++] = (c)
+
+  bp = feature_int(FEAT_BUFFERPOOL);
+  if (bp < 1000000) {
+    AddC('b');
+    if (bp > 99999)
+      AddC((char)('0' + (bp / 100000)));
+    if (bp > 9999)
+      AddC((char)('0' + (bp / 10000) % 10));
+    AddC((char)('0' + (bp / 1000) % 10));
+  } else {
+    AddC('B');
+    if (bp > 99999999)
+      AddC((char)('0' + (bp / 100000000)));
+    if (bp > 9999999)
+      AddC((char)('0' + (bp / 10000000) % 10));
+    AddC((char)('0' + (bp / 1000000) % 10));
+  }
+
+#ifndef NDEBUG
+  AddC('A');
 #endif
 #ifdef  DEBUGMODE
-    'D',
-#endif
-#ifdef  LOCOP_REHASH
-    'e',
-#endif
-#ifdef  OPER_REHASH
-    'E',
-#endif
-#ifdef OPER_NO_CHAN_LIMIT
-    'F',
-#endif
-#ifdef OPER_MODE_LCHAN
-    'f',
-#endif
-#ifdef  HUB
-    'H',
-#endif
-#if defined(SHOW_INVISIBLE_USERS) ||  defined(SHOW_ALL_INVISIBLE_USERS)
-#ifdef  SHOW_ALL_INVISIBLE_USERS
-    'I',
-#else
-    'i',
-#endif
-#endif
-#ifdef  OPER_KILL
-#ifdef  LOCAL_KILL_ONLY
-    'k',
-#else
-    'K',
-#endif
-#endif
-#ifdef  LEAST_IDLE
-    'L',
-#endif
-#ifdef OPER_WALK_THROUGH_LMODES
-    'l',
-#endif
-#ifdef  IDLE_FROM_MSG
-    'M',
-#endif
-#ifdef  USEONE
-    'O',
-#endif
-#ifdef NO_OPER_DEOP_LCHAN
-    'o',
-#endif
-#ifdef  CRYPT_OPER_PASSWORD
-    'p',
-#endif
-#ifdef  CRYPT_LINK_PASSWORD
-    'P',
-#endif
-#ifdef  DEBUGMALLOC
-#ifdef  MEMLEAKSTATS
-    'Q',
-#else
-    'q',
-#endif
-#endif
-#ifdef  RELIABLE_CLOCK
-    'R',
-#endif
-#ifdef  LOCOP_RESTART
-    's',
-#endif
-#ifdef  OPER_RESTART
-    'S',
-#endif
-#ifdef  OPER_REMOTE
-    't',
+  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)
-    'U',
-#endif
-#ifdef  VIRTUAL_HOST
-    'v',
-#endif
-#ifdef BADCHAN
-    'W',
-#ifdef LOCAL_BADCHAN
-    'x',
-#endif
+  AddC('U');
 #endif
-    '\0'
-};
 
-/* *INDENT-ON* */
+  if (feature_bool(FEAT_VIRTUAL_HOST))
+    AddC('v');
 
+  serveropts[i] = '\0';
+
+  return serveropts;
+}
 
 /*
  * debug_init
@@ -283,7 +257,7 @@ void count_memory(struct Client *cptr, char *nick)
       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))
@@ -316,13 +290,6 @@ void count_memory(struct Client *cptr, char *nick)
   {
     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)
@@ -377,7 +344,7 @@ void count_memory(struct Client *cptr, char *nick)
             ":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;
 
@@ -414,7 +381,7 @@ void count_memory(struct Client *cptr, char *nick)
       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