diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-04-22 10:06:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-04-22 10:06:43 +0000 |
| commit | ef1f33b0db5a69afeb4272668089ed5f760aea68 (patch) | |
| tree | 5d654c5adb83ebb96f990ff3ae85930fc354fc8c /src/os | |
| parent | 64efecc2b5e6824422703a4fd5106c70d4704ef0 (diff) | |
| download | nginx-ef1f33b0db5a69afeb4272668089ed5f760aea68.tar.gz nginx-ef1f33b0db5a69afeb4272668089ed5f760aea68.tar.bz2 | |
Use more precise stat.st_blocks to account cache size on Unix
instead of file length rounded to a file system block size.
There is no similar way on Windows, so rounding to a cache->bsize is kept.
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/unix/ngx_files.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_files.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index b7bfff100..037c9a165 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -157,6 +157,7 @@ ngx_int_t ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s); #define ngx_is_exec(sb) (((sb)->st_mode & S_IXUSR) == S_IXUSR) #define ngx_file_access(sb) ((sb)->st_mode & 0777) #define ngx_file_size(sb) (sb)->st_size +#define ngx_file_fs_size(sb) ((sb)->st_blocks * 512) #define ngx_file_mtime(sb) (sb)->st_mtime #define ngx_file_uniq(sb) (sb)->st_ino diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h index fe776057d..06f399dcc 100644 --- a/src/os/win32/ngx_files.h +++ b/src/os/win32/ngx_files.h @@ -154,6 +154,7 @@ ngx_int_t ngx_file_info(u_char *filename, ngx_file_info_t *fi); #define ngx_file_size(fi) \ (((off_t) (fi)->nFileSizeHigh << 32) | (fi)->nFileSizeLow) +#define ngx_file_fs_size(fi) ngx_file_size(fi) #define ngx_file_uniq(fi) (*(ngx_file_uniq_t *) &(fi)->nFileIndexHigh) |