osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Little optimizations. 

Move a few assignments around to avoid one extra subtraction. I suspect having
the two if statements next to each other is friendly to the compiler's optimizer
as well.

Shaves ~1.3% off my timing tests, bringing the new design *very* close to the
old one in raw allocation speed.

svn path=/trunk/; revision=50961
This commit is contained in:
Evan Huus 2013-07-28 00:00:37 +00:00
parent e7dfea82f3
commit b9870c0969
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/wmem/wmem_allocator_block.c
View File

@ -549,11 +549,7 @@ wmem_block_split_free_chunk(wmem_block_allocator_t *allocator,
/* otherwise, we have room to split it, though the remaining free chunk
* may still not be usefully large */
/* preserve a few values from chunk that we'll need to manipulate */
last = chunk->last;
available = chunk->len;
if (available < aligned_size +
if (chunk->len < aligned_size +
(sizeof(wmem_block_chunk_t) + sizeof(wmem_block_free_t))) {
/* If the available space is not enought to store the first part
* (header + size) AND the second part (header + free_header) then
@ -565,6 +561,10 @@ wmem_block_split_free_chunk(wmem_block_allocator_t *allocator,
wmem_block_unfree(allocator, chunk);
}
/* preserve a few values from chunk that we'll need to manipulate */
last = chunk->last;
available = chunk->len - aligned_size;
/* set new values for chunk */
chunk->len = (guint32) aligned_size;
chunk->last = FALSE;
@ -572,7 +572,6 @@ wmem_block_split_free_chunk(wmem_block_allocator_t *allocator,
/* with chunk's values set, we can use the standard macro to calculate
* the location and size of the new free chunk */
extra = WMEM_CHUNK_NEXT(chunk);
available -= chunk->len;
if (available >= sizeof(wmem_block_chunk_t) + sizeof(wmem_block_free_t)) {
/* If the new block has room for the free header (in which case the old