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 13:18:07 +0100 |
| commit | da0798420ea1b98bd383e4bad7f748bfaa96f18b (patch) | |
| tree | f1770e7c02d5ec02685994dd7c497f370c80e67a /meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch | |
| parent | 263852e5a27ca2256ff11d72c0c80e963bdbee0a (diff) | |
| download | poky-da0798420ea1b98bd383e4bad7f748bfaa96f18b.tar.gz | |
glib: upgrade to 2.30.0
(From OE-Core rev: 74f43e3b269c01dba7cd5215a8e825229bd5ecff)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | |||
| 4 | 4 | ||
| 5 | Upstream-Status: Inappropriate [patches for test code] | 5 | Upstream-Status: Inappropriate [patches for test code] |
| 6 | 6 | ||
| 7 | diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c | 7 | diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c |
| 8 | --- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 | 8 | --- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 |
| 9 | +++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 | 9 | +++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 |
| 10 | @@ -5,8 +5,8 @@ | 10 | @@ -5,8 +5,8 @@ |
| 11 | 11 | ||
| 12 | #include <glib.h> | 12 | #include <glib.h> |
| @@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool- | |||
| 18 | 18 | ||
| 19 | #define WAIT 5 /* seconds */ | 19 | #define WAIT 5 /* seconds */ |
| 20 | #define MAX_THREADS 10 | 20 | #define MAX_THREADS 10 |
| 21 | @@ -124,10 +124,10 @@ | 21 | @@ -130,10 +130,10 @@ |
| 22 | DEBUG_MSG (("[unused] stopping unused threads")); | 22 | test_count_threads () == 0) |
| 23 | g_thread_pool_stop_unused_threads (); | 23 | break; |
| 24 | 24 | ||
| 25 | - DEBUG_MSG (("[unused] waiting ONE second for threads to die")); | 25 | - DEBUG_MSG (("[unused] waiting ONE second for threads to die")); |
| 26 | + DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); | 26 | + DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); |
| 27 | 27 | ||
| 28 | /* Some time for threads to die. */ | 28 | /* Some time for threads to die. */ |
| 29 | - g_usleep (G_USEC_PER_SEC); | 29 | - g_usleep (G_USEC_PER_SEC); |
| 30 | + g_usleep (5 * G_USEC_PER_SEC); | 30 | + g_usleep (5 * G_USEC_PER_SEC); |
| 31 | } | ||
| 31 | 32 | ||
| 32 | DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", | 33 | DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", |
| 33 | g_thread_pool_get_num_unused_threads (), | ||