comparison src/core/ngx_times.h @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 8214eaef3530
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
18 ngx_int_t gmtoff; 18 ngx_int_t gmtoff;
19 } ngx_time_t; 19 } ngx_time_t;
20 20
21 21
22 void ngx_time_init(void); 22 void ngx_time_init(void);
23 void ngx_time_update(time_t sec, ngx_uint_t msec); 23 void ngx_time_update(void);
24 void ngx_time_sigsafe_update(void);
24 u_char *ngx_http_time(u_char *buf, time_t t); 25 u_char *ngx_http_time(u_char *buf, time_t t);
25 u_char *ngx_http_cookie_time(u_char *buf, time_t t); 26 u_char *ngx_http_cookie_time(u_char *buf, time_t t);
26 void ngx_gmtime(time_t t, ngx_tm_t *tp); 27 void ngx_gmtime(time_t t, ngx_tm_t *tp);
27 28
28 time_t ngx_next_time(time_t when); 29 time_t ngx_next_time(time_t when);
35 #define ngx_timeofday() (ngx_time_t *) ngx_cached_time 36 #define ngx_timeofday() (ngx_time_t *) ngx_cached_time
36 37
37 extern volatile ngx_str_t ngx_cached_err_log_time; 38 extern volatile ngx_str_t ngx_cached_err_log_time;
38 extern volatile ngx_str_t ngx_cached_http_time; 39 extern volatile ngx_str_t ngx_cached_http_time;
39 extern volatile ngx_str_t ngx_cached_http_log_time; 40 extern volatile ngx_str_t ngx_cached_http_log_time;
41 extern volatile ngx_str_t ngx_cached_http_log_iso8601;
40 42
41 /* 43 /*
42 * milliseconds elapsed since epoch and truncated to ngx_msec_t, 44 * milliseconds elapsed since epoch and truncated to ngx_msec_t,
43 * used in event timers 45 * used in event timers
44 */ 46 */