diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-09-28 08:34:51 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-09-28 08:34:51 +0000 |
commit | d90282d8ba69973d6612c405e52636085623ddcd (patch) | |
tree | 59e36e780b2f5b8f9348013d3037f8fc06ba0247 /src/os/unix | |
parent | 6d2a14aa906b1d576d5151b2410b59cfcab5edd4 (diff) | |
download | nginx-d90282d8ba69973d6612c405e52636085623ddcd.tar.gz nginx-d90282d8ba69973d6612c405e52636085623ddcd.zip |
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Diffstat (limited to 'src/os/unix')
55 files changed, 270 insertions, 118 deletions
diff --git a/src/os/unix/ngx_aio.h b/src/os/unix/ngx_aio.h index a10e0b0f3..66807efa0 100644 --- a/src/os/unix/ngx_aio.h +++ b/src/os/unix/ngx_aio.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_AIO_H_INCLUDED_ #define _NGX_AIO_H_INCLUDED_ diff --git a/src/os/unix/ngx_aio_read.c b/src/os/unix/ngx_aio_read.c index 6c0c40084..49602f994 100644 --- a/src/os/unix/ngx_aio_read.c +++ b/src/os/unix/ngx_aio_read.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_aio_read_chain.c b/src/os/unix/ngx_aio_read_chain.c index a2a12d23e..333c8e404 100644 --- a/src/os/unix/ngx_aio_read_chain.c +++ b/src/os/unix/ngx_aio_read_chain.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_aio_write.c b/src/os/unix/ngx_aio_write.c index 319af1261..e16189a93 100644 --- a/src/os/unix/ngx_aio_write.c +++ b/src/os/unix/ngx_aio_write.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_aio_write_chain.c b/src/os/unix/ngx_aio_write_chain.c index 2bfa59021..294dc1247 100644 --- a/src/os/unix/ngx_aio_write_chain.c +++ b/src/os/unix/ngx_aio_write_chain.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_alloc.c b/src/os/unix/ngx_alloc.c index bb3a299e1..d2e7205e6 100644 --- a/src/os/unix/ngx_alloc.c +++ b/src/os/unix/ngx_alloc.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_alloc.h b/src/os/unix/ngx_alloc.h index 650f8bef3..91016e598 100644 --- a/src/os/unix/ngx_alloc.h +++ b/src/os/unix/ngx_alloc.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_ALLOC_H_INCLUDED_ #define _NGX_ALLOC_H_INCLUDED_ @@ -16,7 +22,7 @@ void *ngx_calloc(size_t size, ngx_log_t *log); * Linux has memalign() or posix_memalign() * Solaris has memalign() * FreeBSD has not memalign() or posix_memalign() but its malloc() alignes - * allocations bigger than page size at page boundary. + * allocations bigger than page size at the page boundary. */ #if (HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN) diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h index c5197e56e..6d50985b7 100644 --- a/src/os/unix/ngx_atomic.h +++ b/src/os/unix/ngx_atomic.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_ATOMIC_H_INCLUDED_ #define _NGX_ATOMIC_H_INCLUDED_ diff --git a/src/os/unix/ngx_channel.c b/src/os/unix/ngx_channel.c index 694b1d83c..d2ca1ecbd 100644 --- a/src/os/unix/ngx_channel.c +++ b/src/os/unix/ngx_channel.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_channel.h> diff --git a/src/os/unix/ngx_channel.h b/src/os/unix/ngx_channel.h index 276825232..3cb1c55ec 100644 --- a/src/os/unix/ngx_channel.h +++ b/src/os/unix/ngx_channel.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_CHANNEL_H_INCLUDED_ #define _NGX_CHANNEL_H_INCLUDED_ diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c index 8bad5444a..be2a91aa2 100644 --- a/src/os/unix/ngx_daemon.c +++ b/src/os/unix/ngx_daemon.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_errno.c b/src/os/unix/ngx_errno.c index 3b12528f7..9b9c6a96d 100644 --- a/src/os/unix/ngx_errno.c +++ b/src/os/unix/ngx_errno.c @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h index f539a1225..bb86b4b2c 100644 --- a/src/os/unix/ngx_errno.h +++ b/src/os/unix/ngx_errno.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_ERRNO_H_INCLUDED_ #define _NGX_ERRNO_H_INCLUDED_ diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index 8b906f097..ae336ae5f 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index 1553144cf..cb50fcee7 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_FILES_H_INCLUDED_ #define _NGX_FILES_H_INCLUDED_ diff --git a/src/os/unix/ngx_freebsd.h b/src/os/unix/ngx_freebsd.h index cfafecf6d..a16b40728 100644 --- a/src/os/unix/ngx_freebsd.h +++ b/src/os/unix/ngx_freebsd.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_FREEBSD_H_INCLUDED_ #define _NGX_FREEBSD_H_INCLUDED_ diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h index d3c41e89b..80e70e1a6 100644 --- a/src/os/unix/ngx_freebsd_config.h +++ b/src/os/unix/ngx_freebsd_config.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_FREEBSD_CONFIG_H_INCLUDED_ #define _NGX_FREEBSD_CONFIG_H_INCLUDED_ diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c index 3084831cd..e59a593cf 100644 --- a/src/os/unix/ngx_freebsd_init.c +++ b/src/os/unix/ngx_freebsd_init.c @@ -1,22 +1,31 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> -/* FreeBSD 3.4 at least */ +/* FreeBSD 3.0 at least */ char ngx_freebsd_kern_ostype[20]; char ngx_freebsd_kern_osrelease[20]; int ngx_freebsd_kern_osreldate; int ngx_freebsd_hw_ncpu; -int ngx_freebsd_machdep_hlt_logical_cpus; int ngx_freebsd_net_inet_tcp_sendspace; -int ngx_freebsd_sendfile_nbytes_bug; -int ngx_freebsd_use_tcp_nopush; + +/* FreeBSD 4.9 */ +int ngx_freebsd_machdep_hlt_logical_cpus; /* FreeBSD 5.0 */ int ngx_freebsd_kern_ipc_zero_copy_send; +int ngx_freebsd_sendfile_nbytes_bug; +int ngx_freebsd_use_tcp_nopush; + + ngx_os_io_t ngx_os_io = { ngx_unix_recv, ngx_readv_chain, diff --git a/src/os/unix/ngx_freebsd_rfork_thread.c b/src/os/unix/ngx_freebsd_rfork_thread.c index 5f651c38b..361fc8fb4 100644 --- a/src/os/unix/ngx_freebsd_rfork_thread.c +++ b/src/os/unix/ngx_freebsd_rfork_thread.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/ + * Copyright (C) 2002-2004 Igor Sysoev */ diff --git a/src/os/unix/ngx_freebsd_rfork_thread.h b/src/os/unix/ngx_freebsd_rfork_thread.h index ce68a4efc..f5b880335 100644 --- a/src/os/unix/ngx_freebsd_rfork_thread.h +++ b/src/os/unix/ngx_freebsd_rfork_thread.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_FREEBSD_RFORK_THREAD_H_INCLUDED_ #define _NGX_FREEBSD_RFORK_THREAD_H_INCLUDED_ diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 5a8164f4f..81aec555c 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/ + * Copyright (C) 2002-2004 Igor Sysoev */ diff --git a/src/os/unix/ngx_linux.h b/src/os/unix/ngx_linux.h index b3e415571..ba1299184 100644 --- a/src/os/unix/ngx_linux.h +++ b/src/os/unix/ngx_linux.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_LINUX_H_INCLUDED_ #define _NGX_LINUX_H_INCLUDED_ diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h index 757a2943b..b18ec5d9d 100644 --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_LINUX_CONFIG_H_INCLUDED_ #define _NGX_LINUX_CONFIG_H_INCLUDED_ diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c index 7379c6a18..847c0134a 100644 --- a/src/os/unix/ngx_linux_init.c +++ b/src/os/unix/ngx_linux_init.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c index 3f8671266..e8f0cefef 100644 --- a/src/os/unix/ngx_linux_sendfile_chain.c +++ b/src/os/unix/ngx_linux_sendfile_chain.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/ + * Copyright (C) 2002-2004 Igor Sysoev */ diff --git a/src/os/unix/ngx_os.h b/src/os/unix/ngx_os.h index e4e94f2d8..8fd162de0 100644 --- a/src/os/unix/ngx_os.h +++ b/src/os/unix/ngx_os.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_OS_H_INCLUDED_ #define _NGX_OS_H_INCLUDED_ diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h index 53ee9e812..75be90aee 100644 --- a/src/os/unix/ngx_posix_config.h +++ b/src/os/unix/ngx_posix_config.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_POSIX_CONFIG_H_INCLUDED_ #define _NGX_POSIX_CONFIG_H_INCLUDED_ diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c index 7498ae609..6a64981a4 100644 --- a/src/os/unix/ngx_posix_init.c +++ b/src/os/unix/ngx_posix_init.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index cd6fd2f1e..ca6b88c3f 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h index 31549062c..6e00d447c 100644 --- a/src/os/unix/ngx_process.h +++ b/src/os/unix/ngx_process.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_PROCESS_H_INCLUDED_ #define _NGX_PROCESS_H_INCLUDED_ diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 941bc4287..5614bd2e0 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_process_cycle.h b/src/os/unix/ngx_process_cycle.h index 7c14d3a83..4900a34bc 100644 --- a/src/os/unix/ngx_process_cycle.h +++ b/src/os/unix/ngx_process_cycle.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_PROCESS_CYCLE_H_INCLUDED_ #define _NGX_PROCESS_CYCLE_H_INCLUDED_ diff --git a/src/os/unix/ngx_pthread_thread.c b/src/os/unix/ngx_pthread_thread.c index 621565621..22ef889d6 100644 --- a/src/os/unix/ngx_pthread_thread.c +++ b/src/os/unix/ngx_pthread_thread.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/ + * Copyright (C) 2002-2004 Igor Sysoev */ diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c index 9458872b7..b12198f32 100644 --- a/src/os/unix/ngx_readv_chain.c +++ b/src/os/unix/ngx_readv_chain.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c index d4d28d77d..60dd91d22 100644 --- a/src/os/unix/ngx_recv.c +++ b/src/os/unix/ngx_recv.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_send.c b/src/os/unix/ngx_send.c index 2bcbdf9d7..86160057f 100644 --- a/src/os/unix/ngx_send.c +++ b/src/os/unix/ngx_send.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_sendv.c b/src/os/unix/ngx_sendv.c deleted file mode 100644 index 810caaee9..000000000 --- a/src/os/unix/ngx_sendv.c +++ /dev/null @@ -1,28 +0,0 @@ - -#include <ngx_core.h> -#include <ngx_types.h> -#include <ngx_errno.h> -#include <ngx_connection.h> -#include <ngx_log.h> -#include <ngx_sendv.h> - -ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n) -{ - ssize_t rc; - ngx_err_t err; - - rc = writev(c->fd, iovec, n); - - if (rc == -1) { - err = ngx_socket_errno; - if (err == NGX_EAGAIN) { - ngx_log_error(NGX_LOG_INFO, c->log, err, "sendv() eagain"); - return NGX_AGAIN; - } - - ngx_log_error(NGX_LOG_ERR, c->log, err, "sendv() failed"); - return NGX_ERROR; - } - - return rc; -} diff --git a/src/os/unix/ngx_sendv.h b/src/os/unix/ngx_sendv.h deleted file mode 100644 index 0859a2500..000000000 --- a/src/os/unix/ngx_sendv.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _NGX_SENDV_H_INCLUDED_ -#define _NGX_SENDV_H_INCLUDED_ - - -#include <ngx_types.h> -#include <ngx_connection.h> - -typedef struct iovec ngx_iovec_t; -#define ngx_iov_base iov_base -#define ngx_iov_len iov_len - -ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n); - - -#endif /* _NGX_SENDV_H_INCLUDED_ */ diff --git a/src/os/unix/ngx_shared.c b/src/os/unix/ngx_shared.c index a19ca5315..0d2888df1 100644 --- a/src/os/unix/ngx_shared.c +++ b/src/os/unix/ngx_shared.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_shared.h b/src/os/unix/ngx_shared.h index ca077df42..40bf7bfa9 100644 --- a/src/os/unix/ngx_shared.h +++ b/src/os/unix/ngx_shared.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_SHARED_H_INCLUDED_ #define _NGX_SHARED_H_INCLUDED_ diff --git a/src/os/unix/ngx_socket.c b/src/os/unix/ngx_socket.c index da9ccbbd0..859a980a9 100644 --- a/src/os/unix/ngx_socket.c +++ b/src/os/unix/ngx_socket.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> @@ -6,7 +11,7 @@ /* * ioctl(FIONBIO) sets a blocking mode with the single syscall * while fcntl(F_SETFL, ~O_NONBLOCK) needs to learn before - * a previous state using fcntl(F_GETFL). + * the previous state using fcntl(F_GETFL). * * ioctl() and fcntl() are syscalls on at least FreeBSD 2.x, Linux 2.2 * and Solaris 7. diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h index 4e2eab441..8664fe67c 100644 --- a/src/os/unix/ngx_socket.h +++ b/src/os/unix/ngx_socket.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_SOCKET_H_INCLUDED_ #define _NGX_SOCKET_H_INCLUDED_ diff --git a/src/os/unix/ngx_solaris.h b/src/os/unix/ngx_solaris.h index d66c65733..7c076d6f2 100644 --- a/src/os/unix/ngx_solaris.h +++ b/src/os/unix/ngx_solaris.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_SOLARIS_H_INCLUDED_ #define _NGX_SOLARIS_H_INCLUDED_ diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h index 25ec28bc3..b8867465b 100644 --- a/src/os/unix/ngx_solaris_config.h +++ b/src/os/unix/ngx_solaris_config.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_SOLARIS_CONFIG_H_INCLUDED_ #define _NGX_SOLARIS_CONFIG_H_INCLUDED_ diff --git a/src/os/unix/ngx_solaris_init.c b/src/os/unix/ngx_solaris_init.c index 25fa14dcc..7186f1fd0 100644 --- a/src/os/unix/ngx_solaris_init.c +++ b/src/os/unix/ngx_solaris_init.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c index f6dca9c15..8b0d3d60b 100644 --- a/src/os/unix/ngx_solaris_sendfilev_chain.c +++ b/src/os/unix/ngx_solaris_sendfilev_chain.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/ + * Copyright (C) 2002-2004 Igor Sysoev */ diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h index 69d3c348d..f78a7c02c 100644 --- a/src/os/unix/ngx_thread.h +++ b/src/os/unix/ngx_thread.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_THREAD_H_INCLUDED_ #define _NGX_THREAD_H_INCLUDED_ diff --git a/src/os/unix/ngx_time.c b/src/os/unix/ngx_time.c index 8647e0e69..fd667b042 100644 --- a/src/os/unix/ngx_time.c +++ b/src/os/unix/ngx_time.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h index 7cf3d01af..43c2027de 100644 --- a/src/os/unix/ngx_time.h +++ b/src/os/unix/ngx_time.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_TIME_H_INCLUDED_ #define _NGX_TIME_H_INCLUDED_ diff --git a/src/os/unix/ngx_types.h b/src/os/unix/ngx_types.h index bdad25dd7..a7e21ace1 100644 --- a/src/os/unix/ngx_types.h +++ b/src/os/unix/ngx_types.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_TYPES_H_INCLUDED_ #define _NGX_TYPES_H_INCLUDED_ diff --git a/src/os/unix/ngx_unix_init.c b/src/os/unix/ngx_unix_init.c deleted file mode 100644 index ab33979ec..000000000 --- a/src/os/unix/ngx_unix_init.c +++ /dev/null @@ -1,34 +0,0 @@ - -#include <ngx_config.h> -#include <ngx_core.h> - - -#if 0 -/* STUB */ -ssize_t ngx_unix_recv(ngx_connection_t *c, char *buf, size_t size); -ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in); -int ngx_posix_init(ngx_log_t *log); -int ngx_posix_post_conf_init(ngx_log_t *log); -/* */ -#endif - - -ngx_os_io_t ngx_os_io = { - ngx_unix_recv, - ngx_readv_chain, - NULL, - ngx_writev_chain, - NGX_HAVE_ZEROCOPY -}; - - -int ngx_os_init(ngx_log_t *log) -{ - return ngx_posix_init(log); -} - - -int ngx_os_post_conf_init(ngx_log_t *log) -{ - return ngx_posix_post_conf_init(log); -} diff --git a/src/os/unix/ngx_user.h b/src/os/unix/ngx_user.h index 0aed208cc..54f6aaa7d 100644 --- a/src/os/unix/ngx_user.h +++ b/src/os/unix/ngx_user.h @@ -1,3 +1,9 @@ + +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #ifndef _NGX_USER_H_INCLUDED_ #define _NGX_USER_H_INCLUDED_ diff --git a/src/os/unix/ngx_writev_chain.c b/src/os/unix/ngx_writev_chain.c index afe49a947..c7b17c23d 100644 --- a/src/os/unix/ngx_writev_chain.c +++ b/src/os/unix/ngx_writev_chain.c @@ -1,4 +1,9 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> diff --git a/src/os/unix/ngx_x86_mutex.h b/src/os/unix/ngx_x86_mutex.h deleted file mode 100644 index a8ed2eee2..000000000 --- a/src/os/unix/ngx_x86_mutex.h +++ /dev/null @@ -1,30 +0,0 @@ - - -typedef struct { - int lock; -} ngx_mutex_t; - - -static inline int ngx_spin_lock(ngx_mutex_t *m, int count) -{ - int lock; - - __asm__ __volatile(" - -get_lock: - mov $1, %1 - xchg %1, %2 - cmp $0, %1 - jne spin_lock - -spin_lock: - cmp $0, %3 - je failed - - dec %3 - rep nop - cmp $0, %2 - jne spin_lock - - ": "=q" (lock), "m" (m->lock), "q" (count)); -} diff --git a/src/os/unix/rfork_thread.S b/src/os/unix/rfork_thread.S index 5abb9f831..af79ca2b0 100644 --- a/src/os/unix/rfork_thread.S +++ b/src/os/unix/rfork_thread.S @@ -1,4 +1,10 @@ +/* + * Copyright (C) 2002-2004 Igor Sysoev + */ + + + #include <sys/syscall.h> #include <machine/asm.h> |