|
 |
f096bf |
commit 46809ccf0281e7556e55f50f25ad5c811fad6ba3
|
|
|
f096bf |
Author: philippe <philippe@a5019735-40e9-0310-863c-91ae7b9d1cf9>
|
|
|
f096bf |
Date: Sun Feb 14 22:14:19 2016 +0000
|
|
|
f096bf |
|
|
|
f096bf |
Fix Bug 359133 - m_deduppoolalloc.c:258 (vgPlain_allocEltDedupPA): Assertion 'eltSzB <= ddpa->poolSzB' failed.
|
|
|
f096bf |
|
|
|
f096bf |
When the elt to allocate is bigger than the pool size, allocate
|
|
|
f096bf |
a specific pool only for this element.
|
|
|
f096bf |
|
|
|
f096bf |
|
|
|
f096bf |
|
|
|
f096bf |
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15787 a5019735-40e9-0310-863c-91ae7b9d1cf9
|
|
|
f096bf |
|
|
|
f096bf |
diff --git a/coregrind/m_deduppoolalloc.c b/coregrind/m_deduppoolalloc.c
|
|
|
f096bf |
index 92016d8..f7ebd27 100644
|
|
|
f096bf |
--- a/coregrind/m_deduppoolalloc.c
|
|
|
f096bf |
+++ b/coregrind/m_deduppoolalloc.c
|
|
|
f096bf |
@@ -255,7 +255,6 @@ const void* VG_(allocEltDedupPA) (DedupPoolAlloc *ddpa, SizeT eltSzB,
|
|
|
f096bf |
ht_node *ht_ins;
|
|
|
f096bf |
vg_assert(ddpa);
|
|
|
f096bf |
vg_assert(ddpa->ht_elements);
|
|
|
f096bf |
- vg_assert (eltSzB <= ddpa->poolSzB);
|
|
|
f096bf |
|
|
|
f096bf |
ddpa->nr_alloc_calls++;
|
|
|
f096bf |
|
|
|
f096bf |
@@ -272,15 +271,24 @@ const void* VG_(allocEltDedupPA) (DedupPoolAlloc *ddpa, SizeT eltSzB,
|
|
|
f096bf |
and insert it in the hash table of inserted elements. */
|
|
|
f096bf |
|
|
|
f096bf |
// Add a new pool or grow pool if not enough space in the current pool
|
|
|
f096bf |
- if (UNLIKELY(ddpa->curpool_free == NULL
|
|
|
f096bf |
- || ddpa->curpool_free + eltSzB - 1 > ddpa->curpool_limit)) {
|
|
|
f096bf |
- ddpa_add_new_pool_or_grow (ddpa);
|
|
|
f096bf |
+ if (eltSzB + ddpa->eltAlign > ddpa->poolSzB) {
|
|
|
f096bf |
+ // Element (+eltAlign for worst case) bigger than the pool size
|
|
|
f096bf |
+ // => allocate a specific pool just for this element
|
|
|
f096bf |
+ UChar *newpool = ddpa->alloc_fn (ddpa->cc, eltSzB + ddpa->eltAlign);
|
|
|
f096bf |
+ /* add to our collection of pools */
|
|
|
f096bf |
+ VG_(addToXA)( ddpa->pools, &newpool );
|
|
|
f096bf |
+ elt_ins = ddpa_align (ddpa, newpool);
|
|
|
f096bf |
+ } else {
|
|
|
f096bf |
+ if (UNLIKELY(ddpa->curpool_free == NULL
|
|
|
f096bf |
+ || ddpa->curpool_free + eltSzB - 1 > ddpa->curpool_limit)) {
|
|
|
f096bf |
+ ddpa_add_new_pool_or_grow (ddpa);
|
|
|
f096bf |
+ }
|
|
|
f096bf |
+ elt_ins = ddpa->curpool_free;
|
|
|
f096bf |
+ ddpa->curpool_free = ddpa_align(ddpa, ddpa->curpool_free + eltSzB);
|
|
|
f096bf |
}
|
|
|
f096bf |
|
|
|
f096bf |
- elt_ins = ddpa->curpool_free;
|
|
|
f096bf |
- VG_(memcpy)(elt_ins, elt, eltSzB);
|
|
|
f096bf |
- ddpa->curpool_free = ddpa_align(ddpa, ddpa->curpool_free + eltSzB);
|
|
|
f096bf |
|
|
|
f096bf |
+ VG_(memcpy)(elt_ins, elt, eltSzB);
|
|
|
f096bf |
ht_ins = VG_(allocEltPA) (ddpa->ht_node_pa);
|
|
|
f096bf |
ht_ins->key = ht_elt.key;
|
|
|
f096bf |
ht_ins->eltSzB = eltSzB;
|