This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-534-gfc75bf4
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 5 Jun 2014 21:39:08 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-534-gfc75bf4
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, master has been updated
via fc75bf464d128f6a722d6cca7012c996f1f73425 (commit)
from d89b3d80f92035acda41010b8d68b32bc471b846 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fc75bf464d128f6a722d6cca7012c996f1f73425
commit fc75bf464d128f6a722d6cca7012c996f1f73425
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Fri Jun 6 02:59:49 2014 +0530
Inline nested function check_list
diff --git a/ChangeLog b/ChangeLog
index 17f0c83..8fe1ad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-05 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * nptl/allocatestack.c (check_list): Inlined function...
+ (__reclaim_stacks): ... here.
+
2014-06-05 OndÅ?ej BÃlka <neleai@seznam.cz>
[BZ #15698]
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 1e22f7d..d0d155c 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -830,26 +830,23 @@ __reclaim_stacks (void)
if (add_p)
{
- /* We always add at the beginning of the list. So in this
- case we only need to check the beginning of these lists. */
- int check_list (list_t *l)
- {
- if (l->next->prev != l)
- {
- assert (l->next->prev == elem);
-
- elem->next = l->next;
- elem->prev = l;
- l->next = elem;
-
- return 1;
- }
-
- return 0;
- }
-
- if (check_list (&stack_used) == 0)
- (void) check_list (&stack_cache);
+ /* We always add at the beginning of the list. So in this case we
+ only need to check the beginning of these lists to see if the
+ pointers at the head of the list are inconsistent. */
+ list_t *l = NULL;
+
+ if (stack_used.next->prev != &stack_used)
+ l = &stack_used;
+ else if (stack_cache.next->prev != &stack_cache)
+ l = &stack_cache;
+
+ if (l != NULL)
+ {
+ assert (l->next->prev == elem);
+ elem->next = l->next;
+ elem->prev = l;
+ l->next = elem;
+ }
}
else
{
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
nptl/allocatestack.c | 37 +++++++++++++++++--------------------
2 files changed, 22 insertions(+), 20 deletions(-)
hooks/post-receive
--
GNU C Library master sources