diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-07-07 19:48:31 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-07 19:48:31 +0000 |
commit | 8e811c11b96bafca446404c6256d8edbb01900b0 (patch) | |
tree | d5d1c81259b76c997da6635192eb33b9dfc6048e /src/os/unix | |
parent | 2b97993c7a6525bf41c694414450943d39605757 (diff) | |
download | nginx-8e811c11b96bafca446404c6256d8edbb01900b0.tar.gz nginx-8e811c11b96bafca446404c6256d8edbb01900b0.zip |
nginx-0.0.7-2004-07-07-23:48:31 import
Diffstat (limited to 'src/os/unix')
-rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 | ||||
-rw-r--r-- | src/os/unix/ngx_thread.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 433c4f073..83b8da8c2 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -858,7 +858,7 @@ static void* ngx_worker_thread_cycle(void *data) return (void *) 1; } - ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, ngx_errno, + ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, "thread " TID_T_FMT " started", ngx_thread_self()); ngx_setthrtitle("worker thread"); diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h index eb5c33f85..b779de060 100644 --- a/src/os/unix/ngx_thread.h +++ b/src/os/unix/ngx_thread.h @@ -22,7 +22,11 @@ typedef pthread_t ngx_tid_t; #define ngx_thread_self() pthread_self() #define ngx_log_tid (int) ngx_thread_self() +#if defined(__FreeBSD__) && !defined(NGX_LINUXTHREADS) #define TID_T_FMT PTR_FMT +#else +#define TID_T_FMT "%d" +#endif typedef pthread_key_t ngx_tls_key_t; |