Changeset 1211

Timestamp:

01/27/08 13:45:08 (10 months ago)

Author:

shawnw

Message:

Include basic intmap stats in @stats/tables

Files:

• 1.8.3/branches/devel/hdrs/intmap.h (modified) (1 diff)
• 1.8.3/branches/devel/src/cque.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/game.c (modified) (3 diffs)
• 1.8.3/branches/devel/src/intmap.c (modified) (2 diffs)

1.8.3/branches/devel/hdrs/intmap.h

@@ -21 +21 @@
-bool im_delete(intmap*, uint32_t);
-void im_dump_graph(intmap*, const char *);
-
+
+
-#endif /* INTMAP_H */

1.8.3/branches/devel/src/cque.c

@@ -69 +69 @@
-slab *bque_slab = NULL; /**< slab for 'struct bque' allocations */
-
-static 
+
-static uint32_t top_pid = 0;
+#define MAX_PID (1U << 15)
-
-static BQUE *qfirst = NULL, *qlast = NULL, *qwait = NULL;
@@ -265 +266 @@
-
-  while (1) {
-(1U << 16)
+MAX_PID
-      pid = 0;
-    if (im_exists(queue_map, pid))

1.8.3/branches/devel/src/game.c

@@ -61 +61 @@
-#include "htab.h"
-#include "ptab.h"
+#include "intmap.h"
-#include "log.h"
-#include "lock.h"
@@ -2341 +2342 @@
-extern PTAB ptab_attrib;
-extern PTAB ptab_flag;
+extern intmap *queue_map, *descs_by_fd;
-
-/** Reports stats on various in-memory data structures.
@@ -2369 +2371 @@
-  st_stats(player, &object_names, "ObjNames");
-  st_stats(player, &lock_names, "LockNames");
+  notify(player, "Integer Maps:");
+  im_stats_header(player);
+  im_stats(player, queue_map, "Queue IDs");
+  im_stats(player, descs_by_fd, "Connections");
+
-#if (COMPRESSION_TYPE >= 3) && defined(COMP_STATS)
-  if (Wizard(player)) {

1.8.3/branches/devel/src/intmap.c

@@ -22 +22 @@
- *
- * There are various properties of patricia trees that aren't used at
-
+
+
+
- *
- * Normally patricia trees use the leftmost bit as position 0. I've
@@ -458 +460 @@
-  fclose(fp);
-}
+
+/** Header line for @stats/tables for intmaps */
+void
+im_stats_header(dbref player)
+{
+  notify(player, "Map         Entries ~Memory");
+}
+
+/** @stats/tables line */
+void
+im_stats(dbref player, intmap *im, const char *name)
+{
+  notify_format(player, "%-11s %7d %7u", name, im->count,
+                (unsigned int)(sizeof(*im) + (sizeof(patricia) * im->count)));
+}