diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-22 11:06:53 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-22 11:06:53 +0000 |
| commit | 5e593aa34ed51cb68670eca25506294165168b93 (patch) | |
| tree | 05b354b528ad7c1d0d72f1ce578b7432b154b4cc /src/core/ngx_slab.c | |
| parent | dc3bbea15cc342025f08c3553ac36e145779727d (diff) | |
| download | nginx-5e593aa34ed51cb68670eca25506294165168b93.tar.gz nginx-5e593aa34ed51cb68670eca25506294165168b93.zip | |
take MALLOC_OPTIONS=J into account in slab allocator
Diffstat (limited to 'src/core/ngx_slab.c')
| -rw-r--r-- | src/core/ngx_slab.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c index 9f63a91eb..b187026d8 100644 --- a/src/core/ngx_slab.c +++ b/src/core/ngx_slab.c @@ -58,9 +58,22 @@ #if (NGX_DEBUG_MALLOC) -#define ngx_slab_junk(p, size) ngx_memset(p, 0xD0, size) + +#define ngx_slab_junk(p, size) ngx_memset(p, 0xD0, size) + +#else + +#if (NGX_FREEBSD) + +#define ngx_slab_junk(p, size) \ + if (ngx_freebsd_debug_malloc) ngx_memset(p, 0xD0, size) + #else + #define ngx_slab_junk(p, size) + +#endif + #endif static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool, |