mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-04 22:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

*) move small declarations in appropriate places and delete the surplus

Browse Source 
header files
*) delete insignificant comments
This commit is contained in:
Igor Sysoev 2009-08-25 09:09:13 +00:00
parent 8e7e69e351
commit b71610eb09
10 changed files with 14 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/event/modules/ngx_aio_module.c
View File

@ -7,11 +7,9 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_aio.h>
#if (NGX_HAVE_KQUEUE)
#include <ngx_kqueue_module.h>
#endif
extern ngx_event_module_t ngx_kqueue_module_ctx;
static ngx_int_t ngx_aio_init(ngx_cycle_t *cycle, ngx_msec_t timer);

4
src/event/modules/ngx_epoll_module.c
View File

@ -43,10 +43,6 @@ struct epoll_event {
epoll_data_t data;
};
int epoll_create(int size);
int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event);
int epoll_wait(int epfd, struct epoll_event *events, int nevents, int timeout);
int epoll_create(int size)
{
return -1;

1
src/event/modules/ngx_kqueue_module.c
View File

@ -7,7 +7,6 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_kqueue_module.h>
typedef struct {

16
src/event/modules/ngx_kqueue_module.h
View File

@ -1,16 +0,0 @@
/*
* Copyright (C) Igor Sysoev
*/
#ifndef _NGX_KQUEUE_MODULE_H_INCLUDED_
#define _NGX_KQUEUE_MODULE_H_INCLUDED_
extern int ngx_kqueue;
extern ngx_module_t ngx_kqueue_module;
extern ngx_event_module_t ngx_kqueue_module_ctx;
#endif /* _NGX_KQUEUE_MODULE_H_INCLUDED_ */

21
src/os/unix/ngx_aio.h
View File

@ -1,21 +0,0 @@
/*
* Copyright (C) Igor Sysoev
*/
#ifndef _NGX_AIO_H_INCLUDED_
#define _NGX_AIO_H_INCLUDED_
#include <ngx_core.h>
ssize_t ngx_aio_read(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl);
ssize_t ngx_aio_write(ngx_connection_t *c, u_char *buf, size_t size);
ngx_chain_t *ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
#endif /* _NGX_AIO_H_INCLUDED_ */

14
src/os/unix/ngx_aio_read.c
View File

@ -7,20 +7,10 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_aio.h>
#if (NGX_HAVE_KQUEUE)
#include <ngx_kqueue_module.h>
#endif
/*
* the ready data requires 3 syscalls:
* aio_write(), aio_error(), aio_return()
* the non-ready data requires 4 (kqueue) or 5 syscalls:
* aio_write(), aio_error(), notifiction, aio_error(), aio_return()
* timeout, aio_cancel(), aio_error()
*/
extern int ngx_kqueue;
ssize_t
ngx_aio_read(ngx_connection_t *c, u_char *buf, size_t size)

1
src/os/unix/ngx_aio_read_chain.c
View File

@ -7,7 +7,6 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_aio.h>
ssize_t

14
src/os/unix/ngx_aio_write.c
View File

@ -7,20 +7,10 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_aio.h>
#if (NGX_HAVE_KQUEUE)
#include <ngx_kqueue_module.h>
#endif
/*
* the ready data requires 3 syscalls:
* aio_write(), aio_error(), aio_return()
* the non-ready data requires 4 (kqueue) or 5 syscalls:
* aio_write(), aio_error(), notifiction, aio_error(), aio_return()
* timeout, aio_cancel(), aio_error()
*/
extern int ngx_kqueue;
ssize_t
ngx_aio_write(ngx_connection_t *c, u_char *buf, size_t size)

1
src/os/unix/ngx_aio_write_chain.c
View File

@ -7,7 +7,6 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_aio.h>
ngx_chain_t *

8
src/os/unix/ngx_os.h
View File

@ -47,6 +47,14 @@ ssize_t ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size);
ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
#if (NGX_HAVE_AIO)
ssize_t ngx_aio_read(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl);
ssize_t ngx_aio_write(ngx_connection_t *c, u_char *buf, size_t size);
ngx_chain_t *ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
#endif
extern ngx_os_io_t ngx_os_io;
extern ngx_int_t ngx_ncpu;