lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-02 16:01:20 +03:00
Code Activity

* nscd/mem.c (gc): Correctly determine highest used array element

Browse Source 
in mark.
This commit is contained in:
Ulrich Drepper
2008-05-18 04:25:44 +00:00
parent 77d40f10ec
commit fa526148d6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2008-05-17 Ulrich Drepper <drepper@redhat.com> 2008-05-17 Ulrich Drepper <drepper@redhat.com>
* nscd/mem.c (gc): Correctly determine highest used array element
in mark.
* nscd/mem.c (markrange): Add assert to check entries are all * nscd/mem.c (markrange): Add assert to check entries are all
aligned. Small cleanup in bitmap use. aligned. Small cleanup in bitmap use.

6
nscd/mem.c
View File

@@ -131,8 +131,8 @@ gc (struct database_dyn *db)
size_t stack_used = sizeof (bool) * db->head->module; size_t stack_used = sizeof (bool) * db->head->module;
if (__builtin_expect (stack_used > MAX_STACK_USE, 0)) if (__builtin_expect (stack_used > MAX_STACK_USE, 0))
stack_used = 0; stack_used = 0;
size_t memory_needed = ((db->head->first_free / BLOCK_ALIGN + BITS - 1) size_t nmark = (db->head->first_free / BLOCK_ALIGN + BITS - 1) / BITS;
/ BITS) * sizeof (BITMAP_T); size_t memory_needed = nmark * sizeof (BITMAP_T);
if (stack_used + memory_needed <= MAX_STACK_USE) if (stack_used + memory_needed <= MAX_STACK_USE)
{ {
mark = (BITMAP_T *) alloca (memory_needed); mark = (BITMAP_T *) alloca (memory_needed);
@@ -234,7 +234,7 @@ gc (struct database_dyn *db)
qsort (he, cnt, sizeof (struct hashentry *), sort_he); qsort (he, cnt, sizeof (struct hashentry *), sort_he);
/* Determine the highest used address. */ /* Determine the highest used address. */
size_t high = sizeof (mark); size_t high = nmark;
while (high > 0 && mark[high - 1] == 0) while (high > 0 && mark[high - 1] == 0)
--high; --high;