tidying and docs

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 49560fb52b45f78f288e855f89c512afe47e5345..5f57f2043e781aa96dfec068e0f4e0eb204efbd5 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2006 Richard Kettlewell
+ * Copyright (C) 2006, 2007 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 
 #include <getopt.h>
 #include <locale.h>
+#include <pcre.h>
 
 /* Apologies for the numerous de-consting casts, but GLib et al do not seem to
  * have heard of const. */
@@ -250,6 +251,94 @@ static void log_volume(void attribute((unused)) *v,
   }
 }
 
+#if MDEBUG
+static int widget_count, container_count;
+
+static void count_callback(GtkWidget *w,
+                           gpointer attribute((unused)) data) {
+  ++widget_count;
+  if(GTK_IS_CONTAINER(w)) {
+    ++container_count;
+    gtk_container_foreach(GTK_CONTAINER(w), count_callback, 0);
+  }
+}
+
+static void count_widgets(void) {
+  widget_count = 0;
+  container_count = 1;
+  if(toplevel)
+    gtk_container_foreach(GTK_CONTAINER(toplevel), count_callback, 0);
+  fprintf(stderr, "widget count: %8d  container count: %8d\n",
+          widget_count, container_count);
+}
+#endif
+
+#if MTRACK
+const char *mtag = "init";
+static hash *mtrack_hash;
+
+static int *mthfind(const char *tag) {
+  static const int zero = 0;
+  int *cp = hash_find(mtrack_hash, tag);
+  if(!cp) {
+    hash_add(mtrack_hash, tag, &zero, HASH_INSERT);
+    cp = hash_find(mtrack_hash, tag);
+  }
+  return cp;
+}
+
+static void *trap_malloc(size_t n) {
+  void *ptr = malloc(n + sizeof(char *));
+
+  *(const char **)ptr = mtag;
+  ++*mthfind(mtag);
+  return (char *)ptr + sizeof(char *);
+}
+
+static void trap_free(void *ptr) {
+  const char *tag;
+  if(!ptr)
+    return;
+  ptr = (char *)ptr - sizeof(char *);
+  tag = *(const char **)ptr;
+  --*mthfind(tag);
+  free(ptr);
+}
+
+static void *trap_realloc(void *ptr, size_t n) {
+  if(!ptr)
+    return trap_malloc(n);
+  if(!n) {
+    trap_free(ptr);
+    return 0;
+  }
+  ptr = (char *)ptr - sizeof(char *);
+  ptr = realloc(ptr, n + sizeof(char *));
+  *(const char **)ptr = mtag;
+  return (char *)ptr + sizeof(char *);
+}
+
+static int report_tags_callback(const char *key, void *value,
+                                void attribute((unused)) *u) {
+  fprintf(stderr, "%16s: %d\n", key, *(int *)value);
+  return 0;
+}
+
+static void report_tags(void) {
+  hash_foreach(mtrack_hash, report_tags_callback, 0);
+  fprintf(stderr, "\n");
+}
+
+static const GMemVTable glib_memvtable = {
+  trap_malloc,
+  trap_realloc,
+  trap_free,
+  0,
+  0,
+  0
+};
+#endif
+
 /* Called once every 10 minutes */
 static gboolean periodic(gpointer attribute((unused)) data) {
   D(("periodic"));
@@ -258,6 +347,13 @@ static gboolean periodic(gpointer attribute((unused)) data) {
   /* Update everything to be sure that the connection to the server hasn't
    * mysteriously gone stale on us. */
   all_update();
+#if MDEBUG
+  count_widgets();
+  fprintf(stderr, "cache size: %zu\n", cache_count());
+#endif
+#if MTRACK
+  report_tags();
+#endif
   return TRUE;                          /* don't remove me */
 }
 
@@ -319,9 +415,15 @@ int main(int argc, char **argv) {
   int n;
   disorder_eclient *logclient;
 
-  mem_init(1);
+  mem_init();
+  /* garbage-collect PCRE's memory */
+  pcre_malloc = xmalloc;
+  pcre_free = xfree;
+#if MTRACK
+  mtrack_hash = hash_new(sizeof (int));
+  g_mem_set_vtable((GMemVTable *)&glib_memvtable);
+#endif
   if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
-  /* Causes GTK+ to 0-fill lots of things, which helps the garbage collector. */
   gtk_init(&argc, &argv);
   gtk_rc_parse_string(style);
   while((n = getopt_long(argc, argv, "hVc:dtH", options, 0)) >= 0) {
@@ -335,16 +437,22 @@ int main(int argc, char **argv) {
     default: fatal(0, "invalid option");
     }
   }
+  signal(SIGPIPE, SIG_IGN);
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);
   if(config_read()) fatal(0, "cannot read configuration");
   /* create the clients */
-  client = gtkclient();
-  logclient = gtkclient();
+  if(!(client = gtkclient())
+     || !(logclient = gtkclient()))
+    return 1;                           /* already reported an error */
   disorder_eclient_log(logclient, &gdisorder_log_callbacks, 0);
   /* periodic operations (e.g. expiring the cache) */
+#if MDEBUG || MTRACK
+  g_timeout_add(5000/*milliseconds*/, periodic, 0);
+#else
   g_timeout_add(600000/*milliseconds*/, periodic, 0);
+#endif
   /* The point of this is to try and get a handle on mysterious
    * unresponsiveness.  It's not very useful in production use. */
   if(0)
@@ -354,6 +462,7 @@ int main(int argc, char **argv) {
   gtk_rc_reset_styles(gtk_settings_get_for_screen(gdk_screen_get_default()));
   gtk_widget_show_all(toplevel);
   D(("enter main loop"));
+  MTAG("misc");
   g_main_loop_run(mainloop);
   return 0;
 }