diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-05-15 00:30:37 +0100 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2011-05-27 01:33:47 +0200 |
| commit | 7d76befe53d074de0b7a8d78a64a89c57908ec44 (patch) | |
| tree | 96ea94eae84c32f8b6753ef4fcc1422434045478 | |
| parent | 875703d0957adb972d542cfd174dba9bb95e8321 (diff) | |
| download | glibc-7d76befe53d074de0b7a8d78a64a89c57908ec44.tar.gz glibc-7d76befe53d074de0b7a8d78a64a89c57908ec44.tar.xz glibc-7d76befe53d074de0b7a8d78a64a89c57908ec44.zip | |
Fix initialization of optimization values for AIO
(cherry picked from commit 2fc54d6f9f7d6770ecb0e0bb5a3b977965bfe273)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/pthread/aio_misc.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 8fcbbbb780..884b21e766 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-05-14 Ulrich Drepper <drepper@gmail.com> + [BZ #12083] + * sysdeps/pthread/aio_misc.c (__aio_init): Compute optim.aio_num + correctly. + * libio/fileops.c (_IO_new_file_close_it): Initialize write_status. * iconv/loop.c (SINGLE) [STORE_REST]: Add input bytes to bytebuf before diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c index c82acbbc2d..ca3d1111e8 100644 --- a/sysdeps/pthread/aio_misc.c +++ b/sysdeps/pthread/aio_misc.c @@ -1,5 +1,5 @@ /* Handle general operations. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007, 2009 + Copyright (C) 1997-2001, 2003, 2004, 2006, 2007, 2009, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -26,6 +26,7 @@ #include <pthread.h> #include <stdlib.h> #include <unistd.h> +#include <sys/param.h> #include <sys/stat.h> #include <sys/time.h> #include <aio_misc.h> @@ -87,7 +88,7 @@ static int idle_thread_count; static struct aioinit optim = { 20, /* int aio_threads; Maximal number of threads. */ - 64, /* int aio_num; Number of expected simultanious requests. */ + 64, /* int aio_num; Number of expected simultaneous requests. */ 0, 0, 0, @@ -282,9 +283,10 @@ __aio_init (const struct aioinit *init) if (pool == NULL) { optim.aio_threads = init->aio_threads < 1 ? 1 : init->aio_threads; + assert (powerof2 (ENTRIES_PER_ROW)); optim.aio_num = (init->aio_num < ENTRIES_PER_ROW ? ENTRIES_PER_ROW - : init->aio_num & ~ENTRIES_PER_ROW); + : init->aio_num & ~(ENTRIES_PER_ROW - 1)); } if (init->aio_idle_time != 0) |