diff options
Diffstat (limited to 'src/core/ngx_times.h')
-rw-r--r-- | src/core/ngx_times.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/core/ngx_times.h b/src/core/ngx_times.h index bbcb41348..6e7ab638c 100644 --- a/src/core/ngx_times.h +++ b/src/core/ngx_times.h @@ -12,40 +12,34 @@ #include <ngx_core.h> +typedef struct { + time_t sec; + ngx_uint_t msec; + ngx_int_t gmtoff; +} ngx_time_t; + + void ngx_time_init(void); -void ngx_time_update(time_t s); +void ngx_time_update(time_t sec, ngx_uint_t msec); u_char *ngx_http_time(u_char *buf, time_t t); u_char *ngx_http_cookie_time(u_char *buf, time_t t); void ngx_gmtime(time_t t, ngx_tm_t *tp); -#if (NGX_THREADS) -ngx_int_t ngx_time_mutex_init(ngx_log_t *log); -#endif - -#if (NGX_THREADS && (NGX_TIME_T_SIZE > NGX_SIG_ATOMIC_T_SIZE)) - -#define ngx_time() *ngx_cached_time -extern volatile time_t *ngx_cached_time; - -#else - -#define ngx_time() ngx_cached_time -extern volatile time_t ngx_cached_time; - -#endif +extern volatile ngx_time_t *ngx_cached_time; -extern ngx_thread_volatile ngx_str_t ngx_cached_err_log_time; -extern ngx_thread_volatile ngx_str_t ngx_cached_http_time; -extern ngx_thread_volatile ngx_str_t ngx_cached_http_log_time; +#define ngx_time() ngx_cached_time->sec +#define ngx_timeofday() (ngx_time_t *) ngx_cached_time -extern ngx_int_t ngx_gmtoff; +extern volatile ngx_str_t ngx_cached_err_log_time; +extern volatile ngx_str_t ngx_cached_http_time; +extern volatile ngx_str_t ngx_cached_http_log_time; /* * milliseconds elapsed since epoch and truncated to ngx_msec_t, * used in event timers */ -extern ngx_msec_t ngx_current_time; +extern volatile ngx_msec_t ngx_current_msec; #endif /* _NGX_TIMES_H_INCLUDED_ */ |