Deprecate g_thread_create_full()

[platform/upstream/glib.git] / tests / mainloop-test.c

diff --git a/tests/mainloop-test.c b/tests/mainloop-test.c
index 869a720..206f80e 100644 (file)
--- a/tests/mainloop-test.c
+++ b/tests/mainloop-test.c
@@ -12,6 +12,7 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>             /* For _O_BINARY used by pipe() macro */
 #include <io.h>                        /* for _pipe() */
+#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
 #endif
 
 #define ITERS 10000
@@ -155,13 +156,15 @@ adder_thread (gpointer data)
   addr_data.dest = channels[1];
   addr_data.loop = g_main_loop_new (context, FALSE);
   addr_data.count = 0;
-  
+
   adder_source = g_io_create_watch (channels[0], G_IO_IN | G_IO_HUP);
+  g_source_set_name (adder_source, "Adder I/O");
   g_source_set_callback (adder_source, (GSourceFunc)adder_callback, &addr_data, NULL);
   g_source_attach (adder_source, context);
   g_source_unref (adder_source);
 
   timeout_source = g_timeout_source_new (10);
+  g_source_set_name (timeout_source, "Adder timeout");
   g_source_set_callback (timeout_source, (GSourceFunc)timeout_callback, &addr_data, NULL);
   g_source_set_priority (timeout_source, G_PRIORITY_HIGH);
   g_source_attach (timeout_source, context);
@@ -176,7 +179,9 @@ adder_thread (gpointer data)
   
   g_main_loop_unref (addr_data.loop);
 
+#ifdef VERBOSE
   g_print ("Timeout run %d times\n", addr_data.count);
+#endif
 
   g_mutex_lock (context_array_mutex);
   g_ptr_array_remove (context_array, context);
@@ -332,6 +337,7 @@ static void
 create_crawler (void)
 {
   GSource *source = g_timeout_source_new (g_random_int_range (0, CRAWLER_TIMEOUT_RANGE));
+  g_source_set_name (source, "Crawler timeout");
   g_source_set_callback (source, (GSourceFunc)crawler_callback, source, NULL);
 
   G_LOCK (crawler_array_lock);
@@ -383,6 +389,7 @@ recurser_start (gpointer data)
   g_mutex_lock (context_array_mutex);
   context = context_array->pdata[g_random_int_range (0, context_array->len)];
   source = g_idle_source_new ();
+  g_source_set_name (source, "Recursing idle source");
   g_source_set_callback (source, recurser_idle, context, NULL);
   g_source_attach (source, context);
   g_source_unref (source);
@@ -395,9 +402,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  /* Only run the test, if threads are enabled and a default thread
-     implementation is available */
-#if defined(G_THREADS_ENABLED) && ! defined(G_THREADS_IMPL_NONE)
   gint i;
 
   g_thread_init (NULL);
@@ -430,6 +434,5 @@ main (int   argc,
   g_main_loop_run (main_loop);
   g_main_loop_unref (main_loop);
 
-#endif
   return 0;
 }