X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/320598d40fb55001274c097d4a1a09c31b8d0335..e1d4a32b103161e3b3ec51c0895f2ca88413078f:/disobedience/disobedience.c diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c index e0a987a..5f57f20 100644 --- a/disobedience/disobedience.c +++ b/disobedience/disobedience.c @@ -22,6 +22,7 @@ #include #include +#include /* 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 */ } @@ -320,6 +416,13 @@ int main(int argc, char **argv) { disorder_eclient *logclient; 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"); gtk_init(&argc, &argv); gtk_rc_parse_string(style); @@ -345,7 +448,11 @@ int main(int argc, char **argv) { 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) @@ -355,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; }