From 34f579fb6d3c6582a685e65265f332fa8cf83fe8 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 29 Aug 2011 09:51:56 +0000 Subject: Merge of r3966, r3967, r3968, r3969, r3970, r3971: Cache loader improvements: The cache loader performs two tasks: inserting cache objects in inactivity list and evaluating total cache size. Reading just directory is enough for this purpose. Elimination of reading cache files saves at least one disk I/O operation per file. --- src/core/ngx_file.c | 1 + src/core/ngx_file.h | 1 + 2 files changed, 2 insertions(+) (limited to 'src/core') diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index ed6d8426c..7704c3e17 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -926,6 +926,7 @@ ngx_walk_tree(ngx_tree_ctx_t *ctx, ngx_str_t *tree) "tree file \"%s\"", file.data); ctx->size = ngx_de_size(&dir); + ctx->fs_size = ngx_de_fs_size(&dir); ctx->access = ngx_de_access(&dir); ctx->mtime = ngx_de_mtime(&dir); diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index 8b502539a..88035172d 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -104,6 +104,7 @@ typedef ngx_int_t (*ngx_tree_handler_pt) (ngx_tree_ctx_t *ctx, ngx_str_t *name); struct ngx_tree_ctx_s { off_t size; + off_t fs_size; ngx_uint_t access; time_t mtime; -- cgit