Mercurial > hg > nginx

diff src/os/unix/ngx_shmem.c @ 605:5dac8c7fb71b release-0.3.24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.3.24-RELEASE import *) Workaround: for bug in FreeBSD kqueue. *) Bugfix: now a response generated by the "post_action" directive is not transferred to a client. *) Bugfix: the memory leaks were occurring if many log files were used. *) Bugfix: the first "proxy_redirect" directive was working inside one location. *) Bugfix: on 64-bit platforms segmentation fault may occurred on start if the many names were used in the "server_name" directives; the bug had appeared in 0.3.18.
author Igor Sysoev <igor@sysoev.ru>
date Wed, 01 Feb 2006 18:22:15 +0000
parents src/os/unix/ngx_shared.c@2ff194b74f1e
children 715d24327080
line wrap: on
line diff
copy from src/os/unix/ngx_shared.c
copy to src/os/unix/ngx_shmem.c
--- a/src/os/unix/ngx_shared.c
+++ b/src/os/unix/ngx_shmem.c
@@ -10,50 +10,69 @@
 
 #if (NGX_HAVE_MAP_ANON)
 
-void *ngx_create_shared_memory(size_t size, ngx_log_t *log)
+ngx_int_t
+ngx_shm_alloc(ngx_shm_t *shm)
 {
-    void  *p;
+    shm->addr = mmap(NULL, shm->size,
+                     PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0);
 
-    p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0);
-
-    if (p == MAP_FAILED) {
-        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                      "mmap(MAP_ANON|MAP_SHARED, %uz) failed", size);
-        return NULL;
+    if (shm->addr == MAP_FAILED) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "mmap(MAP_ANON|MAP_SHARED, %uz) failed", shm->size);
+        return NGX_ERROR;
     }
 
-    return p;
+    return NGX_OK;
+}
+
+
+void
+ngx_shm_free(ngx_shm_t *shm)
+{
+    if (munmap(shm->addr, shm->size) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "munmap(%p, %uz) failed", shm->addr, shm->size);
+    }
 }
 
 #elif (NGX_HAVE_MAP_DEVZERO)
 
-void *ngx_create_shared_memory(size_t size, ngx_log_t *log)
+ngx_int_t
+ngx_shm_alloc(ngx_shm_t *shm)
 {
-    void      *p;
-    ngx_fd_t   fd;
+    ngx_fd_t  fd;
 
     fd = open("/dev/zero", O_RDWR);
 
     if (fd == -1) {
-        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
                       "open(\"/dev/zero\") failed");
-        return NULL;
+        return NGX_ERROR;
     }
 
-    p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+    shm->addr = mmap(NULL, shm->size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
 
-    if (p == MAP_FAILED) {
-        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                      "mmap(/dev/zero, MAP_SHARED, %uz) failed", size);
-        p = NULL;
+    if (shm->addr == MAP_FAILED) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "mmap(/dev/zero, MAP_SHARED, %uz) failed", shm->size);
     }
 
     if (close(fd) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
                       "close(\"/dev/zero\") failed");
     }
 
-    return p;
+    return (shm->addr == MAP_FAILED) ? NGX_ERROR : NGX_OK;
+}
+
+
+void
+ngx_shm_free(ngx_shm_t *shm)
+{
+    if (munmap(shm->addr, shm->size) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "munmap(%p, %uz) failed", shm->addr, shm->size);
+    }
 }
 
 #elif (NGX_HAVE_SYSVSHM)
@@ -62,34 +81,43 @@ void *ngx_create_shared_memory(size_t si
 #include <sys/shm.h>
 
 
-void *ngx_create_shared_memory(size_t size, ngx_log_t *log)
+ngx_int_t
+ngx_shm_alloc(ngx_shm_t *shm)
 {
-    int    id;
-    void  *p;
+    int  id;
 
-    id = shmget(IPC_PRIVATE, size, (SHM_R|SHM_W|IPC_CREAT));
+    id = shmget(IPC_PRIVATE, shm->size, (SHM_R|SHM_W|IPC_CREAT));
 
     if (id == -1) {
-        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                      "shmget(%uz) failed", size);
-        return NULL;
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "shmget(%uz) failed", shm->size);
+        return NGX_ERROR;
     }
 
-    ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "shmget id: %d", id);
-
-    p = shmat(id, NULL, 0);
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, shm->log, 0, "shmget id: %d", id);
 
-    if (p == (void *) -1) {
-        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "shmat() failed");
-        p = NULL;
+    shm->addr = shmat(id, NULL, 0);
+
+    if (shm->addr == (void *) -1) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, "shmat() failed");
     }
 
     if (shmctl(id, IPC_RMID, NULL) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "shmctl(IPC_RMID) failed");
-        p = NULL;
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "shmctl(IPC_RMID) failed");
     }
 
-    return p;
+    return (shm->addr == (void *) -1) ? NGX_ERROR : NGX_OK;
+}
+
+
+void
+ngx_shm_free(ngx_shm_t *shm)
+{
+    if (shmdt(shm->addr) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "shmdt(%p) failed", shm->addr);
+    }
 }
 
 #endif