Skip to content

Commit

Permalink
Consolidate arena_lookup and arena_lock into a single arena_get
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Siddhesh Poyarekar committed Feb 18, 2015
1 parent 8a35c3f commit 94c5a52
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 1 addition & 2 deletions malloc/malloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 94c5a52

Please sign in to comment.