Mercurial > hg > nginx
diff src/os/win32/ngx_shmem.c @ 2945:87da6664fb49 stable-0.7
merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
r2909, r2910, r2922, r2923, r2924, r2925, r2929:
various win32 fixes:
*) use no-threads for Unix builds only
*) Win32 returns ERROR_PATH_NOT_FOUND instead of ERROR_FILE_NOT_FOUND
*) add trailing zero to a file name in ngx_win32_rename_file()
*) fix logging in ngx_win32_rename_file()
*) allow shared memory segments more than 4G
*) fix memory leak in successful case
*) log shared memory name in failure case
*) test that zone has the same addresses in different processes
*) add drive letter for Win32 root path
*) log GetExitCodeProcess()'s errno
*) test premature process termination
*) fix debug logging
*) exit if no workers could not be started
*) do not quit old workers if no new workers could not be started
*) a signaller process should stop configuration processing just after
it is able to get pid file, this allows to not open log files, etc.
*) win32 master process had aready closed listening sockets
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 15 Jun 2009 09:48:15 +0000 |
parents | d52cf82d0d77 |
children |
line wrap: on
line diff
--- a/src/os/win32/ngx_shmem.c +++ b/src/os/win32/ngx_shmem.c @@ -11,27 +11,36 @@ ngx_int_t ngx_shm_alloc(ngx_shm_t *shm) { - u_char *name; + u_char *name; + uint64_t size; name = ngx_alloc(shm->name.len + 2 + sizeof(NGX_INT32_LEN), shm->log); if (name == NULL) { return NGX_ERROR; } - ngx_sprintf(name, "%V_%s%Z", &shm->name, ngx_unique); + (void) ngx_sprintf(name, "%V_%s%Z", &shm->name, ngx_unique); ngx_set_errno(0); + size = shm->size; + shm->handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, - 0, shm->size, (char *) name); + (u_long) (size >> 32), + (u_long) (size & 0xffffffff), + (char *) name); if (shm->handle == NULL) { ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, "CreateFileMapping(%uz, %s) failed", - shm->size, shm->name.data); - goto failed; + shm->size, name); + ngx_free(name); + + return NGX_ERROR; } + ngx_free(name); + if (ngx_errno == ERROR_ALREADY_EXISTS) { shm->exists = 1; } @@ -43,17 +52,15 @@ ngx_shm_alloc(ngx_shm_t *shm) } ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, - "MapViewOfFile(%uz) failed", shm->size); + "MapViewOfFile(%uz) of file mapping \"%V\" failed", + shm->size, &shm->name); if (CloseHandle(shm->handle) == 0) { ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, - "CloseHandle() failed"); + "CloseHandle() of file mapping \"%V\" failed", + &shm->name); } -failed: - - ngx_free(name); - return NGX_ERROR; } @@ -63,11 +70,13 @@ ngx_shm_free(ngx_shm_t *shm) { if (UnmapViewOfFile(shm->addr) == 0) { ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, - "UnmapViewOfFile(%p) failed", shm->addr); + "UnmapViewOfFile(%p) of file mapping \"%V\" failed", + shm->addr, &shm->name); } if (CloseHandle(shm->handle) == 0) { ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, - "CloseHandle() failed"); + "CloseHandle() of file mapping \"%V\" failed", + &shm->name); } }