aboutsummaryrefslogtreecommitdiff
path: root/tests/test-json-server.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-04-09 09:15:17 -0500
committerTed Gould <ted@gould.cx>2012-04-09 09:15:17 -0500
commit475110aa2fe3a47cf6331fbd5941f34a9461fd81 (patch)
treebf2318e8b94cf0b74ea17b496e9d5331a3c065ec /tests/test-json-server.c
parente0eb750e8c36a4116247ea80b4d055a9f821459a (diff)
parent2d60549a2394ce7d73907abcaca22b48553d6c5b (diff)
downloadlibdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.tar.gz
libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.tar.bz2
libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.zip
Catching up to trunk
Diffstat (limited to 'tests/test-json-server.c')
-rw-r--r--tests/test-json-server.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/tests/test-json-server.c b/tests/test-json-server.c
index 083de60..7165838 100644
--- a/tests/test-json-server.c
+++ b/tests/test-json-server.c
@@ -22,6 +22,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <glib.h>
#include <gio/gio.h>
+#include "callgrind.h"
#include <libdbusmenu-glib/server.h>
#include <libdbusmenu-glib/menuitem.h>
@@ -29,11 +30,14 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
static GMainLoop * mainloop = NULL;
-static gboolean
-timer_func (gpointer data)
+static void
+root_activate (void)
{
+ g_debug("Dumping callgrind data");
+ CALLGRIND_DUMP_STATS_AT("exported");
+ CALLGRIND_STOP_INSTRUMENTATION;
g_main_loop_quit(mainloop);
- return FALSE;
+ return;
}
static void
@@ -50,9 +54,13 @@ on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
return;
}
- dbusmenu_server_set_root(server, root);
+ g_signal_connect(G_OBJECT(root), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(root_activate), NULL);
- g_timeout_add(10000, timer_func, NULL);
+ g_debug("Starting Callgrind");
+ CALLGRIND_START_INSTRUMENTATION;
+ CALLGRIND_ZERO_STATS;
+ CALLGRIND_TOGGLE_COLLECT;
+ dbusmenu_server_set_root(server, root);
return;
}