hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhanced resizing of qse_lda_t and qse_str_t

Browse Source
This commit is contained in:
hyung-hwan
2010-10-22 07:29:12 +00:00
parent a5f99ece99
commit 299852beaa
11 changed files with 317 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
qse/lib/cmn/lda.c
View File

@ -1,5 +1,5 @@
/*
* $Id: lda.c 354 2010-09-03 12:50:08Z hyunghwan.chung $
* $Id: lda.c 360 2010-10-21 13:29:12Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@ -347,12 +347,14 @@ size_t qse_lda_insert (lda_t* lda, size_t pos, void* dptr, size_t dlen)
* doesn't modify lda on any errors */
if (pos >= lda->capa || lda->size >= lda->capa)
{
size_t capa;
size_t capa, mincapa;
/* get the minimum capacity needed */
mincapa = (pos >= lda->size)? (pos + 1): (lda->size + 1);
if (lda->sizer)
{
capa = (pos >= lda->size)? (pos + 1): (lda->size + 1);
capa = lda->sizer (lda, capa);
capa = lda->sizer (lda, mincapa);
}
else
{
@ -368,13 +370,21 @@ size_t qse_lda_insert (lda_t* lda, size_t pos, void* dptr, size_t dlen)
}
}
if (qse_lda_setcapa(lda,capa) == QSE_NULL)
do
{
if (lda->freeer)
lda->freeer (lda, DPTR(node), DLEN(node));
QSE_MMGR_FREE (lda->mmgr, node);
return QSE_LDA_NIL;
}
if (qse_lda_setcapa(lda,capa) != QSE_NULL) break;
if (capa <= mincapa)
{
if (lda->freeer)
lda->freeer (lda, DPTR(node), DLEN(node));
QSE_MMGR_FREE (lda->mmgr, node);
return QSE_LDA_NIL;
}
capa--; /* let it retry after lowering the capacity */
}
while (1);
}
if (pos >= lda->capa || lda->size >= lda->capa)

20
qse/lib/cmn/str_dyn.c
View File

@ -1,5 +1,5 @@
/*
* $Id: str_dyn.c 348 2010-08-26 06:26:28Z hyunghwan.chung $
* $Id: str_dyn.c 360 2010-10-21 13:29:12Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@ -256,12 +256,16 @@ qse_size_t qse_str_ncat (qse_str_t* str, const qse_char_t* s, qse_size_t len)
{
if (len > str->capa - str->len)
{
qse_size_t ncapa;
qse_size_t ncapa, mincapa;
/* let the minimum capacity be as large as
* to fit in the new substring */
mincapa = str->len + len;
if (str->sizer == QSE_NULL)
{
/* increase the capacity by the length to add */
ncapa = str->len + len;
ncapa = mincapa;
/* if the new capacity is less than the double,
* just double it */
if (ncapa < str->capa * 2) ncapa = str->capa * 2;
@ -270,15 +274,19 @@ qse_size_t qse_str_ncat (qse_str_t* str, const qse_char_t* s, qse_size_t len)
{
/* let the user determine the new capacity.
* pass the minimum capacity required as a hint */
ncapa = str->sizer (str, str->len + len);
ncapa = str->sizer (str, mincapa);
/* if no change in capacity, return current length */
if (ncapa == str->capa) return str->len;
}
if (qse_str_setcapa (str, ncapa) == (qse_size_t)-1)
/* change the capacity */
do
{
return (qse_size_t)-1;
if (qse_str_setcapa (str, ncapa) != (qse_size_t)-1) break;
if (ncapa <= mincapa) return (qse_size_t)-1;
ncapa--;
}
while (1);
}
if (len > str->capa - str->len)

40
qse/lib/cmn/xma.c
View File

@ -705,24 +705,39 @@ void qse_xma_free (qse_xma_t* xma, void* b)
void qse_xma_dump (qse_xma_t* xma, qse_xma_dumper_t dumper, void* target)
{
qse_xma_blk_t* tmp;
unsigned long long fsum, asum;
qse_ulong_t fsum, asum;
#ifdef QSE_XMA_ENABLE_STAT
unsigned long long isum;
qse_ulong_t isum;
#endif
dumper (target, QSE_T("<XMA DUMP>\n"));
#ifdef QSE_XMA_ENABLE_STAT
dumper (target, QSE_T("== statistics ==\n"));
#if QSE_SIZEOF_LONG >= QSE_SIZEOF_LONG_LONG
dumper (target, QSE_T("total = %lu\n"), (unsigned long)xma->stat.total);
dumper (target, QSE_T("alloc = %lu\n"), (unsigned long)xma->stat.alloc);
dumper (target, QSE_T("avail = %lu\n"), (unsigned long)xma->stat.avail);
#else
dumper (target, QSE_T("total = %llu\n"), (unsigned long long)xma->stat.total);
dumper (target, QSE_T("alloc = %llu\n"), (unsigned long long)xma->stat.alloc);
dumper (target, QSE_T("avail = %llu\n"), (unsigned long long)xma->stat.avail);
#endif
#endif
dumper (target, QSE_T("== blocks ==\n"));
dumper (target, QSE_T(" size avail address\n"));
for (tmp = xma->head, fsum = 0, asum = 0; tmp; tmp = tmp->b.next)
{
dumper (target, QSE_T(" %-18llu %-5d %p\n"), (unsigned long long)tmp->size, tmp->avail, tmp);
#if QSE_SIZEOF_LONG >= QSE_SIZEOF_LONG_LONG
dumper (target, QSE_T(" %-18lu %-5d %p\n"),
(unsigned long)tmp->size, tmp->avail, tmp
);
#else
dumper (target, QSE_T(" %-18llu %-5d %p\n"),
(unsigned long long)tmp->size, tmp->avail, tmp
);
#endif
if (tmp->avail) fsum += tmp->size;
else asum += tmp->size;
}
@ -732,11 +747,22 @@ void qse_xma_dump (qse_xma_t* xma, qse_xma_dumper_t dumper, void* target)
#endif
dumper (target, QSE_T("---------------------------------------\n"));
dumper (target, QSE_T("Allocated blocks: %18llu bytes\n"), asum);
dumper (target, QSE_T("Available blocks: %18llu bytes\n"), fsum);
#if QSE_SIZEOF_LONG >= QSE_SIZEOF_LONG_LONG
dumper (target, QSE_T("Allocated blocks: %18lu bytes\n"), (unsigned long)asum);
dumper (target, QSE_T("Available blocks: %18lu bytes\n"), (unsigned long)fsum);
#else
dumper (target, QSE_T("Allocated blocks: %18llu bytes\n"), (unsigned long long)asum);
dumper (target, QSE_T("Available blocks: %18llu bytes\n"), (unsigned long long)fsum);
#endif
#ifdef QSE_XMA_ENABLE_STAT
dumper (target, QSE_T("Internal use : %18llu bytes\n"), isum);
dumper (target, QSE_T("Total : %18llu bytes\n"), asum + fsum + isum);
#if QSE_SIZEOF_LONG >= QSE_SIZEOF_LONG_LONG
dumper (target, QSE_T("Internal use : %18lu bytes\n"), (unsigned long)isum);
dumper (target, QSE_T("Total : %18lu bytes\n"), (unsigned long)(asum + fsum + isum));
#else
dumper (target, QSE_T("Internal use : %18llu bytes\n"), (unsigned long long)isum);
dumper (target, QSE_T("Total : %18llu bytes\n"), (unsigned long long)(asum + fsum + isum));
#endif
#endif
QSE_ASSERT (asum == xma->stat.alloc);