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.21-95-g94c5a52
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Feb 2015 05:53:45 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-95-g94c5a52
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 94c5a52a841f807a23dbdd19a5ddeb505cc1d543 (commit)
from 8a35c3fe122d49ba76dff815b3537affb5a50b45 (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=94c5a52a841f807a23dbdd19a5ddeb505cc1d543
commit 94c5a52a841f807a23dbdd19a5ddeb505cc1d543
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed Feb 18 11:06:05 2015 +0530
Consolidate arena_lookup and arena_lock into a single arena_get
This seems to have been left behind as an artifact of some old changes
and can now be merged. Verified that the only generated code change
on x86_64 is that of line numbers in asserts, like so:
@@ -27253,7 +27253,7 @@ Disassembly of section .text:
416f09: 48 89 42 20 mov %rax,0x20(%rdx)
416f0d: e9 7e f6 ff ff jmpq 416590 <_int_free+0x230>
416f12: b9 3f 9f 4a 00 mov $0x4a9f3f,%ecx
- 416f17: ba d5 0f 00 00 mov $0xfd5,%edx
+ 416f17: ba d6 0f 00 00 mov $0xfd6,%edx
416f1c: be a8 9b 4a 00 mov $0x4a9ba8,%esi
416f21: bf 6a 9c 4a 00 mov $0x4a9c6a,%edi
416f26: e8 45 e8 ff ff callq 415770 <__malloc_assert>
diff --git a/ChangeLog b/ChangeLog
index cdf49aa..3ada4f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-18 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * malloc/malloc.c (__libc_malloc): Consolidate arena_lookup and
+ arena_lock into a single arena_get.
+
2015-02-17 Carlos O'Donell <carlos@redhat.com>
* dl-reloc.c: Inlucde libc-internal.h.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index ad9487e..f361bad 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2886,9 +2886,8 @@ __libc_malloc (size_t bytes)
if (__builtin_expect (hook != NULL, 0))
return (*hook)(bytes, RETURN_ADDRESS (0));
- arena_lookup (ar_ptr);
+ arena_get (ar_ptr, bytes);
- arena_lock (ar_ptr, bytes);
if (!ar_ptr)
return 0;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
malloc/malloc.c | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources