nginx-vendor-current: src/core/ngx_open_file

comparison src/core/ngx_open_file_cache.c @ 384:12defd37f578 NGINX_0_7_4

nginx 0.7.4 *) Feature: variables support in the "access_log" directive. *) Feature: the "open_log_file_cache" directive. *) Feature: the -g switch. *) Feature: the "Expect" request header line support. *) Bugfix: large SSI inclusions might be truncated.

author	Igor Sysoev <http://sysoev.ru>
date	Mon, 30 Jun 2008 00:00:00 +0400
parents	edf1cb6c328e
children	0b6053502c55

comparison

equal deleted inserted replaced

-:6ee3ada01457
+:12defd37f578
 ngx_pool_cleanup_t             *cln;
 ngx_cached_open_file_t         *file;
 ngx_pool_cleanup_file_t        *clnf;
 ngx_open_file_cache_cleanup_t  *ofcln;
+of->fd = NGX_INVALID_FILE;
 of->err = 0;
 if (cache == NULL) {
 cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t));
 }
 goto add_event;
 }
-if ((file->event && file->use_event)
+if (file->use_event
-|| (file->event == NULL && now - file->created < of->valid))
+|| (file->event == NULL
+&& (of->uniq == 0 || of->uniq == file->uniq)
+&& now - file->created < of->valid))
 {
 if (file->err == 0) {
 of->fd = file->fd;
 of->uniq = file->uniq;
 */
 of->test_dir = 1;
 }
+of->fd = file->fd;
+of->uniq = file->uniq;
 rc = ngx_open_and_stat_file(name->data, of, pool->log);
 if (rc != NGX_OK && (of->err == 0 || !of->errors)) {
 goto failed;
 }
 if (file->is_dir || file->err) {
 goto add_event;
 }
-if (of->uniq == file->uniq
+if (of->uniq == file->uniq) {
-&& of->mtime == file->mtime
-&& of->size == file->size)
-{
-if (ngx_close_file(of->fd) == NGX_FILE_ERROR) {
-ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
-ngx_close_file_n " \"%s\" failed",
-name->data);
-}
-of->fd = file->fd;
 file->count++;
 if (file->event) {
 file->use_event = 1;
-goto renew;
 }
-ngx_open_file_add_event(cache, file, of, pool->log);
 goto renew;
 }
 /* file was changed */
 cache->current++;
 file->uses = 1;
 file->count = 0;
-file->use_event = 0;
 file->event = NULL;
 add_event:
 ngx_open_file_add_event(cache, file, of, pool->log);
 ngx_open_and_stat_file(u_char *name, ngx_open_file_info_t *of, ngx_log_t *log)
 {
 ngx_fd_t         fd;
 ngx_file_info_t  fi;
-of->fd = NGX_INVALID_FILE;
+if (of->fd != NGX_INVALID_FILE) {
-if (of->test_dir) {
 if (ngx_file_info(name, &fi) == -1) {
-of->err = ngx_errno;
+goto failed;
+}
-return NGX_ERROR;
-}
+if (of->uniq == ngx_file_uniq(&fi)) {
+goto done;
-of->uniq = ngx_file_uniq(&fi);
+}
-of->mtime = ngx_file_mtime(&fi);
-of->size = ngx_file_size(&fi);
+} else if (of->test_dir) {
-of->is_dir = ngx_is_dir(&fi);
-of->is_file = ngx_is_file(&fi);
+if (ngx_file_info(name, &fi) == -1) {
-of->is_link = ngx_is_link(&fi);
+goto failed;
-of->is_exec = ngx_is_exec(&fi);
+}
 if (of->is_dir) {
-return NGX_OK;
+goto done;
 }
 }
-fd = ngx_open_file(name, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+if (!of->log) {
+fd = ngx_open_file(name, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+} else {
+fd = ngx_open_file(name, NGX_FILE_RDWR,
+NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND,
+NGX_FILE_DEFAULT_ACCESS);
+}
 if (fd == NGX_INVALID_FILE) {
-of->err = ngx_errno;
+goto failed;
-return NGX_ERROR;
 }
 if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) {
 ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
 ngx_fd_info_n " \"%s\" failed", name);
 if (ngx_close_file(fd) == NGX_FILE_ERROR) {
 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
 ngx_close_file_n " \"%s\" failed", name);
 }
+of->fd = NGX_INVALID_FILE;
 return NGX_ERROR;
 }
 if (ngx_is_dir(&fi)) {
 if (ngx_close_file(fd) == NGX_FILE_ERROR) {
 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
 ngx_close_file_n " \"%s\" failed", name);
 }
-fd = NGX_INVALID_FILE;
+of->fd = NGX_INVALID_FILE;
-}
+} else {
 of->fd = fd;
+}
+done:
 of->uniq = ngx_file_uniq(&fi);
 of->mtime = ngx_file_mtime(&fi);
 of->size = ngx_file_size(&fi);
 of->is_dir = ngx_is_dir(&fi);
 of->is_file = ngx_is_file(&fi);
 of->is_link = ngx_is_link(&fi);
 of->is_exec = ngx_is_exec(&fi);
 return NGX_OK;
+failed:
+of->fd = NGX_INVALID_FILE;
+of->err = ngx_errno;
+return NGX_ERROR;
 }
 /*
 * we ignore any possible event setting error and
 || file->uses < of->min_uses)
 {
 return;
 }
+file->use_event = 0;
 file->event = ngx_calloc(sizeof(ngx_event_t), log);
 if (file->event== NULL) {
 return;
 }
 file->event = NULL;
 return;
 }
 /*
-* we do not file->use_event here because there may be a race
+* we do not set file->use_event here because there may be a race
-* condition between opening file and adding event, so we rely
+* condition: a file may be deleted between opening the file and
-* upon event notification only after first file revalidation
+* adding event, so we rely upon event notification only after
+* one file revalidation on next file access
 */
 return;
 }
 fev->cache->current--;
 /* NGX_ONESHOT_EVENT was already deleted */
 file->event = NULL;
+file->use_event = 0;
 file->close = 1;
 ngx_close_cached_file(fev->cache, file, 0, ev->log);

Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_open_file_cache.c @ 384:12defd37f578 NGINX_0_7_4