code refine
parent
beb0c77ebb
commit
2f76b8c4b1
|
|
@ -420,7 +420,7 @@ static int fast_mblock_prealloc(struct fast_mblock_man *mblock)
|
||||||
|
|
||||||
pTrunkStart = pNew + sizeof(struct fast_mblock_malloc);
|
pTrunkStart = pNew + sizeof(struct fast_mblock_malloc);
|
||||||
pLast = pNew + (mblock->info.trunk_size - block_size);
|
pLast = pNew + (mblock->info.trunk_size - block_size);
|
||||||
for (p=pTrunkStart; p<pLast; p += block_size)
|
for (p=pTrunkStart; p<=pLast; p += block_size)
|
||||||
{
|
{
|
||||||
pNode = (struct fast_mblock_node *)p;
|
pNode = (struct fast_mblock_node *)p;
|
||||||
|
|
||||||
|
|
@ -436,16 +436,6 @@ static int fast_mblock_prealloc(struct fast_mblock_man *mblock)
|
||||||
pNode->next = (struct fast_mblock_node *)(p + block_size);
|
pNode->next = (struct fast_mblock_node *)(p + block_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mblock->alloc_init_func != NULL)
|
|
||||||
{
|
|
||||||
if ((result=mblock->alloc_init_func(((struct fast_mblock_node *)
|
|
||||||
pLast)->data)) != 0)
|
|
||||||
{
|
|
||||||
free(pNew);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
((struct fast_mblock_node *)pLast)->offset = (int)(pLast - pNew);
|
|
||||||
((struct fast_mblock_node *)pLast)->next = NULL;
|
((struct fast_mblock_node *)pLast)->next = NULL;
|
||||||
mblock->free_chain_head = (struct fast_mblock_node *)pTrunkStart;
|
mblock->free_chain_head = (struct fast_mblock_node *)pTrunkStart;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -281,7 +281,7 @@ int skiplist_set_find_all(SkiplistSet *sl, void *data, SkiplistSetIterator *iter
|
||||||
return ENOENT;
|
return ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
iterator->current = previous->links[level_index];
|
iterator->current = previous->links[level_index];
|
||||||
iterator->tail = iterator->current->links[0];
|
iterator->tail = iterator->current->links[0];
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue