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

optimized rbt.c and htb.c a bit

Browse Source
This commit is contained in:
hyung-hwan 2020-03-17 15:44:00 +00:00
parent cd4298499f
commit bc87c486da
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hawk/lib/htb.c
View File

@ -300,7 +300,7 @@ int hawk_htb_init (hawk_htb_t* htb, hawk_gem_t* gem, hawk_oow_t capa, int factor
htb->gem = gem; htb->gem = gem;
htb->bucket = hawk_gem_allocmem(gem, capa * HAWK_SIZEOF(pair_t*)); htb->bucket = hawk_gem_allocmem(gem, capa * HAWK_SIZEOF(pair_t*));
if (htb->bucket == HAWK_NULL) return -1; if (HAWK_UNLIKELY(!htb->bucket)) return -1;
/*for (i = 0; i < capa; i++) htb->bucket[i] = HAWK_NULL;*/ /*for (i = 0; i < capa; i++) htb->bucket[i] = HAWK_NULL;*/
HAWK_MEMSET (htb->bucket, 0, capa * HAWK_SIZEOF(pair_t*)); HAWK_MEMSET (htb->bucket, 0, capa * HAWK_SIZEOF(pair_t*));
@ -391,7 +391,7 @@ static HAWK_INLINE int reorganize (hawk_htb_t* htb)
} }
new_buck = (pair_t**)hawk_gem_allocmem(htb->gem, new_capa * HAWK_SIZEOF(pair_t*)); new_buck = (pair_t**)hawk_gem_allocmem(htb->gem, new_capa * HAWK_SIZEOF(pair_t*));
if (new_buck == HAWK_NULL) if (HAWK_UNLIKELY(!new_buck))
{ {
/* reorganization is disabled once it fails */ /* reorganization is disabled once it fails */
htb->threshold = 0; htb->threshold = 0;

10
hawk/lib/rbt.c
View File

@ -68,7 +68,7 @@ HAWK_INLINE hawk_rbt_pair_t* hawk_rbt_allocpair (
if (vcop == HAWK_RBT_COPIER_INLINE) as += VTOB(rbt,vlen); if (vcop == HAWK_RBT_COPIER_INLINE) as += VTOB(rbt,vlen);
pair = (hawk_rbt_pair_t*)hawk_gem_allocmem(rbt->gem, as); pair = (hawk_rbt_pair_t*)hawk_gem_allocmem(rbt->gem, as);
if (!pair) return HAWK_NULL; if (HAWK_UNLIKELY(!pair)) return HAWK_NULL;
pair->color = HAWK_RBT_RED; pair->color = HAWK_RBT_RED;
pair->parent = HAWK_NULL; pair->parent = HAWK_NULL;
@ -196,9 +196,9 @@ hawk_rbt_t* hawk_rbt_open (hawk_gem_t* gem, hawk_oow_t xtnsize, int kscale, int
hawk_rbt_t* rbt; hawk_rbt_t* rbt;
rbt = (hawk_rbt_t*)hawk_gem_allocmem(gem, HAWK_SIZEOF(hawk_rbt_t) + xtnsize); rbt = (hawk_rbt_t*)hawk_gem_allocmem(gem, HAWK_SIZEOF(hawk_rbt_t) + xtnsize);
if (!rbt) return HAWK_NULL; if (HAWK_UNLIKELY(!rbt)) return HAWK_NULL;
if (hawk_rbt_init(rbt, gem, kscale, vscale) <= -1) if (HAWK_UNLIKELY(hawk_rbt_init(rbt, gem, kscale, vscale) <= -1))
{ {
hawk_gem_freemem (gem, rbt); hawk_gem_freemem (gem, rbt);
return HAWK_NULL; return HAWK_NULL;
@ -443,7 +443,7 @@ static hawk_rbt_pair_t* change_pair_val (
{ {
/* need to reconstruct the pair */ /* need to reconstruct the pair */
hawk_rbt_pair_t* p = hawk_rbt_allocpair(rbt, KPTR(pair), KLEN(pair), vptr, vlen); hawk_rbt_pair_t* p = hawk_rbt_allocpair(rbt, KPTR(pair), KLEN(pair), vptr, vlen);
if (p == HAWK_NULL) return HAWK_NULL; if (HAWK_UNLIKELY(!p)) return HAWK_NULL;
p->color = pair->color; p->color = pair->color;
p->left = pair->left; p->left = pair->left;
@ -530,7 +530,7 @@ static hawk_rbt_pair_t* insert (hawk_rbt_t* rbt, void* kptr, hawk_oow_t klen, vo
} }
x_new = hawk_rbt_allocpair(rbt, kptr, klen, vptr, vlen); x_new = hawk_rbt_allocpair(rbt, kptr, klen, vptr, vlen);
if (x_new == HAWK_NULL) return HAWK_NULL; if (HAWK_UNLIKELY(!x_new)) return HAWK_NULL;
if (x_par == HAWK_NULL) if (x_par == HAWK_NULL)
{ {