technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed style and building with NXT_DEBUG_MEMORY after 3578a7b7ace4.

Browse Source
This commit is contained in:
Valentin Bartenev
2017-07-12 20:57:18 +03:00
parent 288fa85431
commit 2be31e2ed6
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/nxt_mp.c
View File

@@ -361,15 +361,13 @@ nxt_mp_alloc(nxt_mp_t *mp, size_t size)
p = nxt_mp_alloc_small(mp, size); p = nxt_mp_alloc_small(mp, size);
} else { } else {
p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size);
}
#endif #else
p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size); p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size);
#if !(NXT_DEBUG_MEMORY)
}
#endif #endif
nxt_debug_alloc("mp %p alloc(%uz): %p", mp, size, p); nxt_debug_alloc("mp %p alloc(%uz): %p", mp, size, p);
@@ -397,7 +395,6 @@ void *
nxt_mp_align(nxt_mp_t *mp, size_t alignment, size_t size) nxt_mp_align(nxt_mp_t *mp, size_t alignment, size_t size)
{ {
void *p; void *p;
size_t aligned_size;
/* Alignment must be a power of 2. */ /* Alignment must be a power of 2. */
@@ -405,22 +402,21 @@ nxt_mp_align(nxt_mp_t *mp, size_t alignment, size_t size)
#if !(NXT_DEBUG_MEMORY) #if !(NXT_DEBUG_MEMORY)
size_t aligned_size;
aligned_size = nxt_max(size, alignment); aligned_size = nxt_max(size, alignment);
if (aligned_size <= mp->page_size && alignment <= mp->page_alignment) { if (aligned_size <= mp->page_size && alignment <= mp->page_alignment) {
p = nxt_mp_alloc_small(mp, aligned_size); p = nxt_mp_alloc_small(mp, aligned_size);
} else { } else {
p = nxt_mp_alloc_large(mp, alignment, size);
}
#endif #else
p = nxt_mp_alloc_large(mp, alignment, size); p = nxt_mp_alloc_large(mp, alignment, size);
#if !(NXT_DEBUG_MEMORY)
}
#endif #endif
} else { } else {
@@ -971,15 +967,13 @@ nxt_mp_nget(nxt_mp_t *mp, size_t size)
p = nxt_mp_get_small(mp, &mp->nget_pages, size); p = nxt_mp_get_small(mp, &mp->nget_pages, size);
} else { } else {
p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size);
}
#endif #else
p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size); p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size);
#if !(NXT_DEBUG_MEMORY)
}
#endif #endif
nxt_debug_alloc("mp %p nget(%uz): %p", mp, size, p); nxt_debug_alloc("mp %p nget(%uz): %p", mp, size, p);
@@ -1000,15 +994,13 @@ nxt_mp_get(nxt_mp_t *mp, size_t size)
p = nxt_mp_get_small(mp, &mp->get_pages, size); p = nxt_mp_get_small(mp, &mp->get_pages, size);
} else { } else {
p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size);
}
#endif #else
p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size); p = nxt_mp_alloc_large(mp, NXT_MAX_ALIGNMENT, size);
#if !(NXT_DEBUG_MEMORY)
}
#endif #endif
nxt_debug_alloc("mp %p get(%uz): %p", mp, size, p); nxt_debug_alloc("mp %p get(%uz): %p", mp, size, p);