Mercurial > hg > nginx-vendor-current
view src/os/unix/ngx_pthread_thread.c @ 92:45945fa8b8ba NGINX_0_2_0
nginx 0.2.0
*) The pid-file names used during online upgrade was changed and now is
not required a manual rename operation. The old master process adds
the ".oldbin" suffix to its pid-file and executes a new binary file.
The new master process creates usual pid-file without the ".newbin"
suffix. If the master process exits, then old master process renames
back its pid-file with the ".oldbin" suffix to the pid-file without
suffix.
*) Change: the "worker_connections" directive, new name of the
"connections" directive; now the directive specifies maximum number
of connections, but not maximum socket descriptor number.
*) Feature: SSL supports the session cache inside one worker process.
*) Feature: the "satisfy_any" directive.
*) Change: the ngx_http_access_module and ngx_http_auth_basic_module do
not run for subrequests.
*) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending"
directives.
*) Bugfix: if all backend using in load-balancing failed after one
error, then nginx did not try do connect to them during 60 seconds.
*) Bugfix: in IMAP/POP3 command argument parsing.
Thanks to Rob Mueller.
*) Bugfix: errors while using SSL in IMAP/POP3 proxy.
*) Bugfix: errors while using SSI and gzipping.
*) Bugfix: the "Expires" and "Cache-Control" header lines were omitted
from the 304 responses.
Thanks to Alexandr Kukushkin.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Fri, 23 Sep 2005 00:00:00 +0400 |
parents | 72eb30262aac |
children | 408f195b3482 |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> static ngx_uint_t nthreads; static ngx_uint_t max_threads; static pthread_attr_t thr_attr; ngx_err_t ngx_create_thread(ngx_tid_t *tid, void* (*func)(void *arg), void *arg, ngx_log_t *log) { int err; if (nthreads >= max_threads) { ngx_log_error(NGX_LOG_CRIT, log, 0, "no more than %ui threads can be created", max_threads); return NGX_ERROR; } err = pthread_create(tid, &thr_attr, func, arg); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, log, err, "pthread_create() failed"); return err; } ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "thread is created: " NGX_TID_T_FMT, *tid); nthreads++; return err; } ngx_int_t ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle) { int err; max_threads = n; err = pthread_attr_init(&thr_attr); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, cycle->log, err, "pthread_attr_init() failed"); return NGX_ERROR; } err = pthread_attr_setstacksize(&thr_attr, size); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, cycle->log, err, "pthread_attr_setstacksize() failed"); return NGX_ERROR; } ngx_threaded = 1; return NGX_OK; } ngx_mutex_t *ngx_mutex_init(ngx_log_t *log, ngx_uint_t flags) { int err; ngx_mutex_t *m; m = ngx_alloc(sizeof(ngx_mutex_t), log); if (m == NULL) { return NULL; } m->log = log; err = pthread_mutex_init(&m->mutex, NULL); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, m->log, err, "pthread_mutex_init() failed"); return NULL; } return m; } void ngx_mutex_destroy(ngx_mutex_t *m) { int err; err = pthread_mutex_destroy(&m->mutex); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, m->log, err, "pthread_mutex_destroy(%p) failed", m); } ngx_free(m); } ngx_int_t ngx_mutex_lock(ngx_mutex_t *m) { int err; if (!ngx_threaded) { return NGX_OK; } ngx_log_debug1(NGX_LOG_DEBUG_MUTEX, m->log, 0, "lock mutex %p", m); err = pthread_mutex_lock(&m->mutex); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, m->log, err, "pthread_mutex_lock(%p) failed", m); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_MUTEX, m->log, 0, "mutex %p is locked", m); return NGX_OK; } ngx_int_t ngx_mutex_trylock(ngx_mutex_t *m) { int err; if (!ngx_threaded) { return NGX_OK; } ngx_log_debug1(NGX_LOG_DEBUG_MUTEX, m->log, 0, "try lock mutex %p", m); err = pthread_mutex_trylock(&m->mutex); if (err == NGX_EBUSY) { return NGX_AGAIN; } if (err != 0) { ngx_log_error(NGX_LOG_ALERT, m->log, err, "pthread_mutex_trylock(%p) failed", m); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_MUTEX, m->log, 0, "mutex %p is locked", m); return NGX_OK; } ngx_int_t ngx_mutex_unlock(ngx_mutex_t *m) { int err; if (!ngx_threaded) { return NGX_OK; } ngx_log_debug1(NGX_LOG_DEBUG_MUTEX, m->log, 0, "unlock mutex %p", m); err = pthread_mutex_unlock(&m->mutex); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, m->log, err, "pthread_mutex_unlock(%p) failed", m); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_MUTEX, m->log, 0, "mutex %p is unlocked", m); return NGX_OK; } ngx_cond_t *ngx_cond_init(ngx_log_t *log) { int err; ngx_cond_t *cv; cv = ngx_alloc(sizeof(ngx_cond_t), log); if (cv == NULL) { return NULL; } cv->log = log; err = pthread_cond_init(&cv->cond, NULL); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, cv->log, err, "pthread_cond_init() failed"); return NULL; } return cv; } void ngx_cond_destroy(ngx_cond_t *cv) { int err; err = pthread_cond_destroy(&cv->cond); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, cv->log, err, "pthread_cond_destroy(%p) failed", cv); } ngx_free(cv); } ngx_int_t ngx_cond_wait(ngx_cond_t *cv, ngx_mutex_t *m) { int err; ngx_log_debug1(NGX_LOG_DEBUG_CORE, cv->log, 0, "cv %p wait", cv); err = pthread_cond_wait(&cv->cond, &m->mutex); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, cv->log, err, "pthread_cond_wait(%p) failed", cv); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_CORE, cv->log, 0, "cv %p is waked up", cv); ngx_log_debug1(NGX_LOG_DEBUG_MUTEX, m->log, 0, "mutex %p is locked", m); return NGX_OK; } ngx_int_t ngx_cond_signal(ngx_cond_t *cv) { int err; ngx_log_debug1(NGX_LOG_DEBUG_CORE, cv->log, 0, "cv %p to signal", cv); err = pthread_cond_signal(&cv->cond); if (err != 0) { ngx_log_error(NGX_LOG_ALERT, cv->log, err, "pthread_cond_signal(%p) failed", cv); return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_CORE, cv->log, 0, "cv %p is signaled", cv); return NGX_OK; }