diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2015-04-27 18:25:42 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2015-04-27 18:25:42 +0300 |
commit | 2ec8cfcd7d34415a99c3f3db3024ae954c00d0dd (patch) | |
tree | b45488fb7b4cc984e984cbb41ba6b9198dcdc32c /src/os/win32/ngx_win32_init.c | |
parent | 153dbf38771abbbf5955cce0433cf2673dc3e7d9 (diff) | |
download | nginx-2ec8cfcd7d34415a99c3f3db3024ae954c00d0dd.tar.gz nginx-2ec8cfcd7d34415a99c3f3db3024ae954c00d0dd.zip |
Win32: shared memory base addresses and remapping.
Two mechanisms are implemented to make it possible to store pointers
in shared memory on Windows, in particular on Windows Vista and later
versions with ASLR:
- The ngx_shm_remap() function added to allow remapping of a shared memory
zone to the address originally used for it in the master process. While
important, it doesn't solve the problem by itself as in many cases it's
not possible to use the address because of conflicts with other
allocations.
- We now create mappings at the same address in all processes by starting
mappings at predefined addresses normally unused by newborn processes.
These two mechanisms combined allow to use shared memory on Windows
almost without problems, including reloads.
Based on the patch by Sergey Brester:
http://mailman.nginx.org/pipermail/nginx-devel/2015-April/006836.html
Diffstat (limited to 'src/os/win32/ngx_win32_init.c')
-rw-r--r-- | src/os/win32/ngx_win32_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c index 6fa1a57e5..9e77a789d 100644 --- a/src/os/win32/ngx_win32_init.c +++ b/src/os/win32/ngx_win32_init.c @@ -118,6 +118,7 @@ ngx_os_init(ngx_log_t *log) GetSystemInfo(&si); ngx_pagesize = si.dwPageSize; + ngx_allocation_granularity = si.dwAllocationGranularity; ngx_ncpu = si.dwNumberOfProcessors; ngx_cacheline_size = NGX_CPU_CACHE_LINE; |