move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory

2 files changed, 8 insertions, 11 deletions

diff --git a/src/os/win32/ngx_shmem.c b/src/os/win32/ngx_shmem.c
index 5c8fb6223..62e8585d0 100644
--- a/src/os/win32/ngx_shmem.c
+++ b/src/os/win32/ngx_shmem.c
@@ -8,20 +8,16 @@
 #include <ngx_core.h>
 
 
-/*
- * TODO:
- *     maping name or inheritable handle
- */
-
 ngx_int_t
 ngx_shm_alloc(ngx_shm_t *shm)
 {
     shm->handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
-                                    0, shm->size, NULL);
+                                    0, shm->size, (char *) shm->name.data);
 
     if (shm->handle == NULL) {
         ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
-                      "CreateFileMapping(%uz) failed", shm->size);
+                      "CreateFileMapping(%uz, %s) failed",
+                      shm->size, shm->name.data);
         return NGX_ERROR;
     }
 
diff --git a/src/os/win32/ngx_shmem.h b/src/os/win32/ngx_shmem.h
index d1fe8f83f..7bd6d6265 100644
--- a/src/os/win32/ngx_shmem.h
+++ b/src/os/win32/ngx_shmem.h
@@ -13,10 +13,11 @@
 
 
 typedef struct {
-    u_char      *addr;
-    size_t       size;
-    HANDLE       handle;
-    ngx_log_t   *log;
+    u_char     *addr;
+    size_t      size;
+    ngx_str_t   name;
+    HANDLE      handle;
+    ngx_log_t  *log;
 } ngx_shm_t;