IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux/SPARC malloc() returns an address aligned to 8. This conflicts with

Browse Source 
our SPARC 16-byte alignment and some allocations may be done out of pool.
ngx_memalign(ngx_pagesize) fixes this issue.
This commit is contained in:
Igor Sysoev 2009-09-30 12:56:44 +00:00
parent 689064b91a
commit 687b0e99ea
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/nginx.c
View File

@ -280,6 +280,9 @@ main(int argc, char *const *argv)
init_cycle.log = log; init_cycle.log = log;
ngx_cycle = &init_cycle; ngx_cycle = &init_cycle;
/* dummy pagesize to create aligned pool */
ngx_pagesize = 1024;
init_cycle.pool = ngx_create_pool(1024, log); init_cycle.pool = ngx_create_pool(1024, log);
if (init_cycle.pool == NULL) { if (init_cycle.pool == NULL) {
return 1; return 1;

6
src/core/ngx_palloc.c
View File

@ -17,7 +17,7 @@ ngx_create_pool(size_t size, ngx_log_t *log)
{ {
ngx_pool_t *p; ngx_pool_t *p;
p = ngx_alloc(size, log); p = ngx_memalign(ngx_pagesize, size, log);
if (p == NULL) { if (p == NULL) {
return NULL; return NULL;
} }
@ -181,7 +181,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
psize = (size_t) (pool->d.end - (u_char *) pool); psize = (size_t) (pool->d.end - (u_char *) pool);
m = ngx_alloc(psize, pool->log); m = ngx_memalign(ngx_pagesize, psize, pool->log);
if (m == NULL) { if (m == NULL) {
return NULL; return NULL;
} }
@ -219,7 +219,7 @@ ngx_palloc_large(ngx_pool_t *pool, size_t size)
ngx_uint_t n; ngx_uint_t n;
ngx_pool_large_t *large; ngx_pool_large_t *large;
p = ngx_alloc(size, pool->log); p = ngx_memalign(ngx_pagesize, size, pool->log);
if (p == NULL) { if (p == NULL) {
return NULL; return NULL;
} }