diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-09-30 17:33:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 12:04:28 +0100 |
commit | 74f43e3b269c01dba7cd5215a8e825229bd5ecff (patch) | |
tree | df944d9c2dd54ab87ab578b12070df3446a21cbd /meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch | |
parent | 00545a358fb1fd29a9dd7a77ee54eaf303f41493 (diff) | |
download | openembedded-core-contrib-74f43e3b269c01dba7cd5215a8e825229bd5ecff.tar.gz |
glib: upgrade to 2.30.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch index b65a47462a..4ff7b80075 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch @@ -4,9 +4,9 @@ Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 Upstream-Status: Inappropriate [patches for test code] -diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c ---- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 -+++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 +diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c +--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 ++++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 @@ -5,8 +5,8 @@ #include <glib.h> @@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool- #define WAIT 5 /* seconds */ #define MAX_THREADS 10 -@@ -124,10 +124,10 @@ - DEBUG_MSG (("[unused] stopping unused threads")); - g_thread_pool_stop_unused_threads (); +@@ -130,10 +130,10 @@ + test_count_threads () == 0) + break; -- DEBUG_MSG (("[unused] waiting ONE second for threads to die")); -+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); +- DEBUG_MSG (("[unused] waiting ONE second for threads to die")); ++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); - /* Some time for threads to die. */ -- g_usleep (G_USEC_PER_SEC); -+ g_usleep (5 * G_USEC_PER_SEC); + /* Some time for threads to die. */ +- g_usleep (G_USEC_PER_SEC); ++ g_usleep (5 * G_USEC_PER_SEC); + } DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", - g_thread_pool_get_num_unused_threads (), |