Removed stub implementation of win32 mutexes.

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 9152af3f70a3a6fa3eb387148927f311b772cc1c..9f8fbc3631182c8e06743e85434d0ba3b9a7afdf 100644 (file)
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -835,8 +835,6 @@ ngx_get_connection(ngx_socket_t s, ngx_log_t *log)
         return NULL;
     }
 
-    /* ngx_mutex_lock */
-
     c = ngx_cycle->free_connections;
 
     if (c == NULL) {
@@ -849,16 +847,12 @@ ngx_get_connection(ngx_socket_t s, ngx_log_t *log)
                       "%ui worker_connections are not enough",
                       ngx_cycle->connection_n);
 
-        /* ngx_mutex_unlock */
-
         return NULL;
     }
 
     ngx_cycle->free_connections = c->data;
     ngx_cycle->free_connection_n--;
 
-    /* ngx_mutex_unlock */
-
     if (ngx_cycle->files) {
         ngx_cycle->files[s] = c;
     }
@@ -896,14 +890,10 @@ ngx_get_connection(ngx_socket_t s, ngx_log_t *log)
 void
 ngx_free_connection(ngx_connection_t *c)
 {
-    /* ngx_mutex_lock */
-
     c->data = ngx_cycle->free_connections;
     ngx_cycle->free_connections = c;
     ngx_cycle->free_connection_n++;
 
-    /* ngx_mutex_unlock */
-
     if (ngx_cycle->files) {
         ngx_cycle->files[c->fd] = NULL;
     }

diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h
index 9db82a63c0de704d9bb498eef9213e0c6fe56a21..3bbba0b3728ddcebe18bdc36ed1799c3c0cbf062 100644 (file)
--- a/src/http/ngx_http_upstream_round_robin.h
+++ b/src/http/ngx_http_upstream_round_robin.h
@@ -44,8 +44,6 @@ typedef struct ngx_http_upstream_rr_peers_s  ngx_http_upstream_rr_peers_t;
 struct ngx_http_upstream_rr_peers_s {
     ngx_uint_t                      number;
 
- /* ngx_mutex_t                    *mutex; */
-
     ngx_uint_t                      total_weight;
 
     unsigned                        single:1;

diff --git a/src/os/win32/ngx_thread.c b/src/os/win32/ngx_thread.c
index 1bdd6d2156054d59145abeac65bf6ad89c4bd460..3255e015500c7e6eb5170fcc211b1832636bb792 100644 (file)
--- a/src/os/win32/ngx_thread.c
+++ b/src/os/win32/ngx_thread.c
@@ -67,44 +67,3 @@ ngx_thread_set_tls(ngx_tls_key_t *key, void *data)
 
     return 0;
 }
-
-
-ngx_mutex_t *
-ngx_mutex_init(ngx_log_t *log, ngx_uint_t flags)
-{
-    ngx_mutex_t  *m;
-
-    m = ngx_alloc(sizeof(ngx_mutex_t), log);
-    if (m == NULL) {
-        return NULL;
-    }
-
-    m->log = log;
-
-    /* STUB */
-
-    return m;
-}
-
-
-/* STUB */
-
-void
-ngx_mutex_lock(ngx_mutex_t *m) {
-    return;
-}
-
-
-
-ngx_int_t
-ngx_mutex_trylock(ngx_mutex_t *m) {
-    return NGX_OK;
-}
-
-
-void
-ngx_mutex_unlock(ngx_mutex_t *m) {
-    return;
-}
-
-/**/

diff --git a/src/os/win32/ngx_thread.h b/src/os/win32/ngx_thread.h
index c23c809ffad617e3e2ca3e83bed2a1b19cc52eb7..e1d0a7eae986064395281dc712c5b688e3ab93e8 100644 (file)
--- a/src/os/win32/ngx_thread.h
+++ b/src/os/win32/ngx_thread.h
@@ -18,12 +18,6 @@ typedef DWORD   ngx_tls_key_t;
 typedef DWORD   ngx_thread_value_t;
 
 
-typedef struct {
-    HANDLE      mutex;
-    ngx_log_t   *log;
-} ngx_mutex_t;
-
-
 ngx_err_t ngx_create_thread(ngx_tid_t *tid,
     ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log);
 ngx_int_t ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle);
@@ -34,25 +28,10 @@ ngx_err_t ngx_thread_set_tls(ngx_tls_key_t *key, void *data);
 #define ngx_thread_set_tls_n         "TlsSetValue()"
 #define ngx_thread_get_tls           TlsGetValue
 
-
-#define ngx_thread_volatile  volatile
-
 #define ngx_log_tid                 GetCurrentThreadId()
 #define NGX_TID_T_FMT               "%ud"
 
 
-ngx_mutex_t *ngx_mutex_init(ngx_log_t *log, ngx_uint_t flags);
-
-void ngx_mutex_lock(ngx_mutex_t *m);
-ngx_int_t ngx_mutex_trylock(ngx_mutex_t *m);
-void ngx_mutex_unlock(ngx_mutex_t *m);
-
-
-/* STUB */
-#define NGX_MUTEX_LIGHT             0
-/**/
-
-
 extern ngx_int_t  ngx_threads_n;