Mercurial > hg > nginx

changeset 6110:16c51e80128c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed unused thread-local-storage code.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 26 Mar 2015 14:15:15 +0300
parents d588dda5ec31
children 537259db5af4
files src/core/ngx_cycle.c src/core/ngx_cycle.h src/os/win32/ngx_process_cycle.c src/os/win32/ngx_thread.c src/os/win32/ngx_thread.h
diffstat 5 files changed, 0 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -26,10 +26,6 @@ static ngx_event_t     ngx_cleaner_event
 ngx_uint_t             ngx_test_config;
 ngx_uint_t             ngx_quiet_mode;
 
-#if (NGX_OLD_THREADS)
-ngx_tls_key_t          ngx_core_tls_key;
-#endif
-
 
 /* STUB NAME */
 static ngx_connection_t  dumb;
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -112,15 +112,6 @@ typedef struct {
 } ngx_core_conf_t;
 
 
-#if (NGX_OLD_THREADS)
-
-typedef struct {
-     ngx_pool_t              *pool;   /* pcre's malloc() pool */
-} ngx_core_tls_t;
-
-#endif
-
-
 #define ngx_is_init_cycle(cycle)  (cycle->conf_ctx == NULL)
 
 
@@ -141,9 +132,6 @@ extern ngx_array_t            ngx_old_cy
 extern ngx_module_t           ngx_core_module;
 extern ngx_uint_t             ngx_test_config;
 extern ngx_uint_t             ngx_quiet_mode;
-#if (NGX_OLD_THREADS)
-extern ngx_tls_key_t          ngx_core_tls_key;
-#endif
 
 
 #endif /* _NGX_CYCLE_H_INCLUDED_ */
--- a/src/os/win32/ngx_process_cycle.c
+++ b/src/os/win32/ngx_process_cycle.c
@@ -253,7 +253,6 @@ ngx_master_process_cycle(ngx_cycle_t *cy
 static void
 ngx_process_init(ngx_cycle_t *cycle)
 {
-    ngx_err_t         err;
     ngx_core_conf_t  *ccf;
 
     ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
@@ -264,14 +263,6 @@ ngx_process_init(ngx_cycle_t *cycle)
         /* fatal */
         exit(2);
     }
-
-    err = ngx_thread_key_create(&ngx_core_tls_key);
-    if (err != 0) {
-        ngx_log_error(NGX_LOG_ALERT, cycle->log, err,
-                      ngx_thread_key_create_n " failed");
-        /* fatal */
-        exit(2);
-    }
 }
 
 
--- a/src/os/win32/ngx_thread.c
+++ b/src/os/win32/ngx_thread.c
@@ -43,27 +43,3 @@ ngx_init_threads(int n, size_t size, ngx
 
     return NGX_OK;
 }
-
-
-ngx_err_t
-ngx_thread_key_create(ngx_tls_key_t *key)
-{
-    *key = TlsAlloc();
-
-    if (*key == TLS_OUT_OF_INDEXES) {
-        return ngx_errno;
-    }
-
-    return 0;
-}
-
-
-ngx_err_t
-ngx_thread_set_tls(ngx_tls_key_t *key, void *data)
-{
-    if (TlsSetValue(*key, data) == 0) {
-        return ngx_errno;
-    }
-
-    return 0;
-}
--- a/src/os/win32/ngx_thread.h
+++ b/src/os/win32/ngx_thread.h
@@ -14,7 +14,6 @@
 
 
 typedef HANDLE  ngx_tid_t;
-typedef DWORD   ngx_tls_key_t;
 typedef DWORD   ngx_thread_value_t;
 
 
@@ -22,12 +21,6 @@ ngx_err_t ngx_create_thread(ngx_tid_t *t
     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);
 
-ngx_err_t ngx_thread_key_create(ngx_tls_key_t *key);
-#define ngx_thread_key_create_n     "TlsAlloc()"
-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_log_tid                 GetCurrentThreadId()
 #define NGX_TID_T_FMT               "%ud"