Define _GNU_SOURCE for stpcpy

Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>

	* gstrfuncs.c: Define _GNU_SOURCE for stpcpy

	* tests/mainloop-test.c (main): Wait for all threads
	to start before beginning tests.

diff --git a/ChangeLog b/ChangeLog
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 191a9b61b8b50d66c3249f995de86fa067bd60a3..e40cc24e03116d09d3c07d45274b77c9f284aea8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Apr 17 10:43:36 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c: Define _GNU_SOURCE for stpcpy
+
+       * tests/mainloop-test.c (main): Wait for all threads
+       to start before beginning tests.
+
 2001-04-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthreadpool.c (g_thread_pool_thread_proxy): Until now every

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 5f12e39b1d18828041a28612086b43e3c14606ec..bf5ac55b347e55820876a001e790a7c466a141a3 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -32,6 +32,8 @@
 #include <config.h>
 #endif
 
+#define _GNU_SOURCE            /* For stpcpy */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/gstrfuncs.c b/gstrfuncs.c
index 5f12e39b1d18828041a28612086b43e3c14606ec..bf5ac55b347e55820876a001e790a7c466a141a3 100644 (file)
--- a/gstrfuncs.c
+++ b/gstrfuncs.c
@@ -32,6 +32,8 @@
 #include <config.h>
 #endif
 
+#define _GNU_SOURCE            /* For stpcpy */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tests/mainloop-test.c b/tests/mainloop-test.c
index 8710b3f45cd6442f297052be04df0fc6a4dfeab8..5aba25ea36a1e893cbbd6212827bee317ecb6011 100644 (file)
--- a/tests/mainloop-test.c
+++ b/tests/mainloop-test.c
@@ -17,8 +17,10 @@
 #define CRAWLER_TIMEOUT_RANGE 40
 #define RECURSER_TIMEOUT 50
 
-G_LOCK_DEFINE_STATIC (context_array_lock);
 GPtrArray *context_array;
+GMutex *context_array_mutex;
+GCond *context_array_cond;
+
 GMainLoop *main_loop;
 
 G_LOCK_DEFINE_STATIC (crawler_array_lock);
@@ -133,9 +135,14 @@ adder_thread (gpointer data)
 
   context = g_main_context_get (g_thread_self());
 
-  G_LOCK (context_array_lock);
+  g_mutex_lock (context_array_mutex);
+  
   g_ptr_array_add (context_array, context);
-  G_UNLOCK (context_array_lock);
+
+  if (context_array->len == NTHREADS)
+    g_cond_broadcast (context_array_cond);
+  
+  g_mutex_unlock (context_array_mutex);
 
   addr_data.dest = channels[1];
   addr_data.loop = g_main_loop_new (context, FALSE);
@@ -165,11 +172,11 @@ adder_thread (gpointer data)
 
   g_print ("Timeout run %d times\n", addr_data.count);
 
-  G_LOCK (context_array_lock);
+  g_mutex_lock (context_array_mutex);
   g_ptr_array_remove (context_array, context);
   if (context_array->len == 0)
     g_main_loop_quit (main_loop);
-  G_UNLOCK (context_array_lock);
+  g_mutex_unlock (context_array_mutex);
 
   cleanup_crawlers (context);
 }
@@ -318,10 +325,10 @@ create_crawler (void)
   GSource *source = g_timeout_source_new (g_random_int_range (0, CRAWLER_TIMEOUT_RANGE));
   g_source_set_callback (source, (GSourceFunc)crawler_callback, source, NULL);
 
-  G_LOCK (context_array_lock);
+  g_mutex_lock (context_array_mutex);
   g_source_attach (source, context_array->pdata[g_random_int_range (0, context_array->len)]);
   g_source_unref (source);
-  G_UNLOCK (context_array_lock);
+  g_mutex_unlock (context_array_mutex);
 
   G_LOCK (crawler_array_lock);
   g_ptr_array_add (crawler_array, source);
@@ -363,13 +370,13 @@ recurser_start (gpointer data)
   GMainContext *context;
   GSource *source;
   
-  G_LOCK (context_array_lock);
+  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_callback (source, recurser_idle, context, NULL);
   g_source_attach (source, context);
   g_source_unref (source);
-  G_UNLOCK (context_array_lock);
+  g_mutex_unlock (context_array_mutex);
 
   return TRUE;
 }
@@ -386,6 +393,9 @@ main (int   argc,
   g_thread_init (NULL);
 
   context_array = g_ptr_array_new ();
+  context_array_mutex = g_mutex_new ();
+  context_array_cond = g_cond_new (); 
+
   crawler_array = g_ptr_array_new ();
 
   main_loop = g_main_loop_new (NULL, FALSE);
@@ -393,6 +403,15 @@ main (int   argc,
   for (i = 0; i < NTHREADS; i++)
     create_adder_thread ();
 
+  /* Wait for all threads to start
+   */
+  g_mutex_lock (context_array_mutex);
+  
+  if (context_array->len < NTHREADS)
+    g_cond_wait (context_array_cond, context_array_mutex);
+  
+  g_mutex_unlock (context_array_mutex);
+  
   for (i = 0; i < NCRAWLERS; i++)
     create_crawler ();