This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.11.90-20-2-g2e76ab2
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 May 2010 17:09:01 -0000
- Subject: GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.11.90-20-2-g2e76ab2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, fedora/master has been updated
via 2e76ab2332a7fb9e73a4047625b915bff93bd427 (commit)
via 8bff84622140b61a35c7def2d2baeb87a644b05f (commit)
from 3087d4a5dea53c30fe9ec80f845383c8d519b36c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2e76ab2332a7fb9e73a4047625b915bff93bd427
commit 2e76ab2332a7fb9e73a4047625b915bff93bd427
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Apr 16 19:29:53 2010 +0200
Fix AIO when thread creation failed
diff --git a/rtkaio/sysdeps/unix/sysv/linux/kaio_misc.c b/rtkaio/sysdeps/unix/sysv/linux/kaio_misc.c
index 76e0c43..1b30a9f 100644
--- a/rtkaio/sysdeps/unix/sysv/linux/kaio_misc.c
+++ b/rtkaio/sysdeps/unix/sysv/linux/kaio_misc.c
@@ -1,5 +1,5 @@
/* Handle general operations.
- Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2006
+ Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2006,2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -617,7 +617,8 @@ __aio_enqueue_user_request (struct requestlist *newp)
running = newp->running = allocated;
/* Now try to start a thread. */
- if (aio_create_helper_thread (&thid, handle_fildes_io, newp) == 0)
+ result = aio_create_helper_thread (&thid, handle_fildes_io, newp);
+ if (result == 0)
/* We managed to enqueue the request. All errors which can
happen now can be recognized by calls to `aio_return' and
`aio_error'. */
@@ -628,10 +629,14 @@ __aio_enqueue_user_request (struct requestlist *newp)
running = newp->running = yes;
if (nthreads == 0)
- /* We cannot create a thread in the moment and there is
- also no thread running. This is a problem. `errno' is
- set to EAGAIN if this is only a temporary problem. */
- result = -1;
+ {
+ /* We cannot create a thread in the moment and there is
+ also no thread running. This is a problem. `errno' is
+ set to EAGAIN if this is only a temporary problem. */
+ __aio_remove_request (NULL, newp, 0);
+ }
+ else
+ result = 0;
}
}
}
@@ -658,7 +663,7 @@ struct requestlist *
internal_function
__aio_enqueue_request_ctx (aiocb_union *aiocbp, int operation, kctx_t kctx)
{
- int policy, prio;
+ int policy, prio, result;
struct sched_param param;
struct requestlist *newp;
int op = (operation & 0xffff);
@@ -793,10 +798,13 @@ __aio_enqueue_request_ctx (aiocb_union *aiocbp, int operation, kctx_t kctx)
newp->kioctx = KCTX_NONE;
}
- if (__aio_enqueue_user_request (newp))
+ result = __aio_enqueue_user_request (newp);
+ if (result)
{
/* Something went wrong. */
__aio_free_request (newp);
+ aiocbp->aiocb.__error_code = result;
+ __set_errno (result);
newp = NULL;
}
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8bff84622140b61a35c7def2d2baeb87a644b05f
commit 8bff84622140b61a35c7def2d2baeb87a644b05f
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Apr 16 18:51:30 2010 +0200
Don't install librtkaio.a
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 4c6fd2c..c7f4cfd 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -406,7 +406,7 @@ cd build-%{nptl_target_cpu}-linuxnptl && \
librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*`
%ifarch %{rtkaioarches}
-rm -f $RPM_BUILD_ROOT{,%{_prefix}}/%{_lib}/librtkaio.so*
+rm -f $RPM_BUILD_ROOT{,%{_prefix}}/%{_lib}/librtkaio.*
rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/librt.so.*
mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio
mv $RPM_BUILD_ROOT/%{_lib}/librtkaio-*.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/
-----------------------------------------------------------------------
Summary of changes:
fedora/glibc.spec.in | 2 +-
rtkaio/sysdeps/unix/sysv/linux/kaio_misc.c | 24 ++++++++++++++++--------
2 files changed, 17 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources