Slab: style.

This commit is contained in:
Ruslan Ermilov 2017-07-04 18:32:28 +03:00
parent 7570718594
commit 75c3f8958b

View File

@ -181,8 +181,8 @@ void *
ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size) ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
{ {
size_t s; size_t s;
uintptr_t p, n, m, mask, *bitmap; uintptr_t p, m, mask, *bitmap;
ngx_uint_t i, slot, shift, map; ngx_uint_t i, n, slot, shift, map;
ngx_slab_page_t *page, *prev, *slots; ngx_slab_page_t *page, *prev, *slots;
if (size > ngx_slab_max_size) { if (size > ngx_slab_max_size) {
@ -226,7 +226,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
bitmap = (uintptr_t *) ngx_slab_page_addr(pool, page); bitmap = (uintptr_t *) ngx_slab_page_addr(pool, page);
map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8); map = (ngx_pagesize >> shift) / (8 * sizeof(uintptr_t));
for (n = 0; n < map; n++) { for (n = 0; n < map; n++) {
@ -239,7 +239,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
bitmap[n] |= m; bitmap[n] |= m;
i = (n * sizeof(uintptr_t) * 8 + i) << shift; i = (n * 8 * sizeof(uintptr_t) + i) << shift;
p = (uintptr_t) bitmap + i; p = (uintptr_t) bitmap + i;
@ -341,7 +341,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
/* "n" elements for bitmap, plus one requested */ /* "n" elements for bitmap, plus one requested */
bitmap[0] = ((uintptr_t) 2 << n) - 1; bitmap[0] = ((uintptr_t) 2 << n) - 1;
map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8); map = (ngx_pagesize >> shift) / (8 * sizeof(uintptr_t));
for (i = 1; i < map; i++) { for (i = 1; i < map; i++) {
bitmap[i] = 0; bitmap[i] = 0;
@ -369,7 +369,7 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *pool, size_t size)
slots[slot].next = page; slots[slot].next = page;
pool->stats[slot].total += sizeof(uintptr_t) * 8; pool->stats[slot].total += 8 * sizeof(uintptr_t);
p = ngx_slab_page_addr(pool, page); p = ngx_slab_page_addr(pool, page);
@ -480,8 +480,8 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
} }
n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift; n = ((uintptr_t) p & (ngx_pagesize - 1)) >> shift;
m = (uintptr_t) 1 << (n % (sizeof(uintptr_t) * 8)); m = (uintptr_t) 1 << (n % (8 * sizeof(uintptr_t)));
n /= sizeof(uintptr_t) * 8; n /= 8 * sizeof(uintptr_t);
bitmap = (uintptr_t *) bitmap = (uintptr_t *)
((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1)); ((uintptr_t) p & ~((uintptr_t) ngx_pagesize - 1));
@ -510,7 +510,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
goto done; goto done;
} }
map = (ngx_pagesize >> shift) / (sizeof(uintptr_t) * 8); map = (ngx_pagesize >> shift) / (8 * sizeof(uintptr_t));
for (i = 1; i < map; i++) { for (i = 1; i < map; i++) {
if (bitmap[i]) { if (bitmap[i]) {
@ -558,7 +558,7 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
ngx_slab_free_pages(pool, page, 1); ngx_slab_free_pages(pool, page, 1);
pool->stats[slot].total -= sizeof(uintptr_t) * 8; pool->stats[slot].total -= 8 * sizeof(uintptr_t);
goto done; goto done;
} }