CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-06-30 05:43:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 6b827d13dd into 42f8df65b6

Browse source
This commit is contained in:
Magnus Holm 2026-06-25 21:24:20 +03:00 • committed by GitHub
commit 2e13fddc37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/ngx_times.c
View file

@ -9,7 +9,7 @@
#include <ngx_core.h>
static ngx_msec_t ngx_monotonic_time(time_t sec, ngx_uint_t msec);
static ngx_usec_t ngx_monotonic_time(time_t sec, ngx_uint_t usec);
/*
@ -27,6 +27,7 @@ static ngx_uint_t slot;
static ngx_atomic_t ngx_time_lock;
volatile ngx_msec_t ngx_current_msec;
volatile ngx_usec_t ngx_current_usec;
volatile ngx_time_t *ngx_cached_time;
volatile ngx_str_t ngx_cached_err_log_time;
volatile ngx_str_t ngx_cached_http_time;
@ -83,7 +84,8 @@ ngx_time_update(void)
u_char *p0, *p1, *p2, *p3, *p4;
ngx_tm_t tm, gmt;
time_t sec;
ngx_uint_t msec;
ngx_uint_t msec, usec;
ngx_usec_t current_usec;
ngx_time_t *tp;
struct timeval tv;
@ -94,9 +96,13 @@ ngx_time_update(void)
ngx_gettimeofday(&tv);
sec = tv.tv_sec;
msec = tv.tv_usec / 1000;
usec = tv.tv_usec;
msec = usec / 1000;
ngx_current_msec = ngx_monotonic_time(sec, msec);
current_usec = ngx_monotonic_time(sec, usec);
ngx_current_msec = (ngx_msec_t) (current_usec / 1000);
ngx_current_usec = current_usec;
tp = &cached_time[slot];
@ -192,8 +198,8 @@ ngx_time_update(void)
}
static ngx_msec_t
ngx_monotonic_time(time_t sec, ngx_uint_t msec)
static ngx_usec_t
ngx_monotonic_time(time_t sec, ngx_uint_t usec)
{
#if (NGX_HAVE_CLOCK_MONOTONIC)
struct timespec ts;
@ -201,11 +207,11 @@ ngx_monotonic_time(time_t sec, ngx_uint_t msec)
clock_gettime(CLOCK_MONOTONIC, &ts);
sec = ts.tv_sec;
msec = ts.tv_nsec / 1000000;
usec = ts.tv_nsec / 1000;
#endif
return (ngx_msec_t) sec * 1000 + msec;
return (ngx_usec_t) sec * 1000000 + usec;
}

3
src/core/ngx_times.h
View file

@ -48,5 +48,8 @@ extern volatile ngx_str_t ngx_cached_syslog_time;
*/
extern volatile ngx_msec_t ngx_current_msec;
/* microseconds elapsed since some unspecified point in the past */
extern volatile ngx_usec_t ngx_current_usec;
#endif /* _NGX_TIMES_H_INCLUDED_ */

1
src/os/unix/ngx_time.h
View file

@ -15,6 +15,7 @@
typedef ngx_rbtree_key_t ngx_msec_t;
typedef ngx_rbtree_key_int_t ngx_msec_int_t;
typedef uint64_t ngx_usec_t;
typedef struct tm ngx_tm_t;

1
src/os/win32/ngx_time.h
View file

@ -15,6 +15,7 @@
typedef ngx_rbtree_key_t ngx_msec_t;
typedef ngx_rbtree_key_int_t ngx_msec_int_t;
typedef uint64_t ngx_usec_t;
typedef SYSTEMTIME ngx_tm_t;
typedef FILETIME ngx_mtime_t;