diff options
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_atomic.h | 13 | ||||
| -rw-r--r-- | src/os/win32/ngx_files.c | 30 | ||||
| -rw-r--r-- | src/os/win32/ngx_time.h | 47 |
3 files changed, 49 insertions, 41 deletions
diff --git a/src/os/win32/ngx_atomic.h b/src/os/win32/ngx_atomic.h index 01ef98e97..87de57dd1 100644 --- a/src/os/win32/ngx_atomic.h +++ b/src/os/win32/ngx_atomic.h @@ -14,14 +14,10 @@ #define NGX_HAVE_ATOMIC_OPS 1 -typedef int32_t ngx_atomic_int_t; -typedef uint32_t ngx_atomic_uint_t; +typedef int32_t ngx_atomic_int_t; +typedef uint32_t ngx_atomic_uint_t; typedef volatile ngx_atomic_uint_t ngx_atomic_t; -#define NGX_ATOMIC_T_LEN sizeof("-2147483648") - 1 - - -#define ngx_atomic_inc(p) InterlockedIncrement((long *) p) -#define ngx_atomic_dec(p) InterlockedDecrement((long *) p) +#define NGX_ATOMIC_T_LEN sizeof("-2147483648") - 1 #if defined( __WATCOMC__ ) || defined( __BORLANDC__ ) || ( _MSC_VER >= 1300 ) @@ -42,6 +38,9 @@ typedef volatile ngx_atomic_uint_t ngx_atomic_t; #endif +#define ngx_atomic_fetch_add(p, add) InterlockedExchangeAdd((long *) p, add) + + void ngx_spinlock(ngx_atomic_t *lock, ngx_uint_t spin); #define ngx_trylock(lock) (*(lock) == 0 && ngx_atomic_cmp_set(lock, 0, 1)) diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c index bea580b24..78b7f957d 100644 --- a/src/os/win32/ngx_files.c +++ b/src/os/win32/ngx_files.c @@ -8,7 +8,8 @@ #include <ngx_core.h> -ssize_t ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) +ssize_t +ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) { long high_offset; u_long n; @@ -72,7 +73,8 @@ ssize_t ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) } -ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) +ssize_t +ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) { long high_offset; u_long n; @@ -135,8 +137,9 @@ ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) } -ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, - off_t offset, ngx_pool_t *pool) +ssize_t +ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset, + ngx_pool_t *pool) { u_char *buf, *prev; size_t size; @@ -171,8 +174,8 @@ ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, } -ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, - ngx_pool_t *pool) +ngx_int_t +ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool) { u_char *name; ngx_int_t rc; @@ -233,7 +236,8 @@ ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, #if 0 -ngx_int_t ngx_file_info(char *file, ngx_file_info_t *sb) +ngx_int_t +ngx_file_info(char *file, ngx_file_info_t *sb) { WIN32_FILE_ATTRIBUTE_DATA fa; @@ -256,7 +260,8 @@ ngx_int_t ngx_file_info(char *file, ngx_file_info_t *sb) #endif -ngx_int_t ngx_file_info(u_char *file, ngx_file_info_t *sb) +ngx_int_t +ngx_file_info(u_char *file, ngx_file_info_t *sb) { /* Win95 */ @@ -270,7 +275,8 @@ ngx_int_t ngx_file_info(u_char *file, ngx_file_info_t *sb) } -ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir) +ngx_int_t +ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir) { ngx_cpystrn(name->data + name->len, NGX_DIR_MASK, NGX_DIR_MASK_LEN + 1); @@ -287,7 +293,8 @@ ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir) } -ngx_int_t ngx_read_dir(ngx_dir_t *dir) +ngx_int_t +ngx_read_dir(ngx_dir_t *dir) { if (dir->ready) { dir->ready = 0; @@ -316,7 +323,8 @@ ngx_de_link_info(u_char *name, ngx_dir_t *dir) } -ngx_int_t ngx_file_append_mode(ngx_fd_t fd) +ngx_int_t +ngx_file_append_mode(ngx_fd_t fd) { #if 0 if (LockFile(fd, 0, 0, 0xffffffff, 0xffffffff) == 0) { diff --git a/src/os/win32/ngx_time.h b/src/os/win32/ngx_time.h index 3ac40b43f..4c1498407 100644 --- a/src/os/win32/ngx_time.h +++ b/src/os/win32/ngx_time.h @@ -12,29 +12,30 @@ #include <ngx_core.h> -typedef ngx_rbtree_key_t ngx_msec_t; - -typedef SYSTEMTIME ngx_tm_t; -typedef FILETIME ngx_mtime_t; - -#define ngx_tm_sec wSecond -#define ngx_tm_min wMinute -#define ngx_tm_hour wHour -#define ngx_tm_mday wDay -#define ngx_tm_mon wMonth -#define ngx_tm_year wYear -#define ngx_tm_wday wDayOfWeek - -#define ngx_tm_sec_t u_short -#define ngx_tm_min_t u_short -#define ngx_tm_hour_t u_short -#define ngx_tm_mday_t u_short -#define ngx_tm_mon_t u_short -#define ngx_tm_year_t u_short -#define ngx_tm_wday_t u_short - - -#define ngx_msleep Sleep +typedef ngx_rbtree_key_t ngx_msec_t; +typedef ngx_rbtree_key_int_t ngx_msec_int_t; + +typedef SYSTEMTIME ngx_tm_t; +typedef FILETIME ngx_mtime_t; + +#define ngx_tm_sec wSecond +#define ngx_tm_min wMinute +#define ngx_tm_hour wHour +#define ngx_tm_mday wDay +#define ngx_tm_mon wMonth +#define ngx_tm_year wYear +#define ngx_tm_wday wDayOfWeek + +#define ngx_tm_sec_t u_short +#define ngx_tm_min_t u_short +#define ngx_tm_hour_t u_short +#define ngx_tm_mday_t u_short +#define ngx_tm_mon_t u_short +#define ngx_tm_year_t u_short +#define ngx_tm_wday_t u_short + + +#define ngx_msleep Sleep #define NGX_HAVE_GETTIMEZONE 1 |