commit 67cd336d88f8a920ea5921936785a1c1553062fb
author Igor Sysoev <igor@sysoev.ru> Mon Nov 20 08:51:45 2006 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Nov 20 08:51:45 2006 +0000
tree f76934379e98e22854638a4ddc44b022deefd265
parent cae66582d5e6137d3b53552fcb84520a042841ca

slab allocator in shared memory

src/core/ngx_shmtx.h

diff --git a/src/core/ngx_shmtx.h b/src/core/ngx_shmtx.h
index fdd62e1..1361125 100644
--- a/src/core/ngx_shmtx.h
+++ b/src/core/ngx_shmtx.h
@@ -18,13 +18,11 @@
 #else
     ngx_fd_t       fd;
     u_char        *name;
-    ngx_log_t     *log;
 #endif
 } ngx_shmtx_t;
 
 
-ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, void *addr, u_char *name,
-    ngx_log_t *log);
+ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, void *addr, u_char *name);
 
 
 #if (NGX_HAVE_ATOMIC_OPS)
@@ -63,9 +61,7 @@
         return 0;
     }
 
-    ngx_log_error(NGX_LOG_ALERT, mtx->log, err, ngx_trylock_fd_n " failed");
-
-    ngx_abort();
+    ngx_log_abort(err, ngx_trylock_fd_n " failed");
 }
 
 
@@ -80,9 +76,7 @@
         return;
     }
 
-    ngx_log_error(NGX_LOG_ALERT, mtx->log, err, ngx_lock_fd_n " failed");
-
-    ngx_abort();
+    ngx_log_abort(err, ngx_lock_fd_n " failed");
 }
 
 
@@ -97,9 +91,7 @@
         return;
     }
 
-    ngx_log_error(NGX_LOG_ALERT, mtx->log, err, ngx_unlock_fd_n " failed");
-
-    ngx_abort();
+    ngx_log_abort(err, ngx_unlock_fd_n " failed");
 }