mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove never used zero copy stuff

Browse Source
This commit is contained in:
Igor Sysoev 2008-12-17 20:47:18 +00:00
parent cf6c582b9a
commit ed9b6d8962
10 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ngx_buf.c
View File

@ -201,12 +201,6 @@ ngx_chain_update_chains(ngx_chain_t **free, ngx_chain_t **busy,
break; break;
} }
#if (NGX_HAVE_WRITE_ZEROCOPY)
if ((*busy)->buf->zerocopy_busy) {
break;
}
#endif
if ((*busy)->buf->tag != tag) { if ((*busy)->buf->tag != tag) {
*busy = (*busy)->next; *busy = (*busy)->next;
continue; continue;

2
src/core/ngx_buf.h
View File

@ -51,8 +51,6 @@ struct ngx_buf_s {
unsigned last_shadow:1; unsigned last_shadow:1;
unsigned temp_file:1; unsigned temp_file:1;
unsigned zerocopy_busy:1;
/* STUB */ int num; /* STUB */ int num;
}; };

1
src/core/ngx_palloc.h
View File

@ -14,7 +14,6 @@
/* /*
* NGX_MAX_ALLOC_FROM_POOL should be (ngx_pagesize - 1), i.e. 4095 on x86. * NGX_MAX_ALLOC_FROM_POOL should be (ngx_pagesize - 1), i.e. 4095 on x86.
* On FreeBSD 5.x it allows to use the zero copy sending.
* On Windows NT it decreases a number of locked pages in a kernel. * On Windows NT it decreases a number of locked pages in a kernel.
*/ */
#define NGX_MAX_ALLOC_FROM_POOL (ngx_pagesize - 1) #define NGX_MAX_ALLOC_FROM_POOL (ngx_pagesize - 1)

6
src/http/modules/ngx_http_charset_filter_module.c
View File

@ -541,12 +541,6 @@ ngx_http_charset_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
break; break;
} }
#if (NGX_HAVE_WRITE_ZEROCOPY)
if (b->zerocopy_busy) {
break;
}
#endif
ctx->busy = cl->next; ctx->busy = cl->next;
if (b->tag != (ngx_buf_tag_t) &ngx_http_charset_filter_module) { if (b->tag != (ngx_buf_tag_t) &ngx_http_charset_filter_module) {

6
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -935,12 +935,6 @@ ngx_http_ssi_output(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
break; break;
} }
#if (NGX_HAVE_WRITE_ZEROCOPY)
if (b->zerocopy_busy) {
break;
}
#endif
if (b->shadow) { if (b->shadow) {
b->shadow->pos = b->shadow->last; b->shadow->pos = b->shadow->last;
} }

6
src/http/modules/ngx_http_sub_filter_module.c
View File

@ -465,12 +465,6 @@ ngx_http_sub_output(ngx_http_request_t *r, ngx_http_sub_ctx_t *ctx)
break; break;
} }
#if (NGX_HAVE_WRITE_ZEROCOPY)
if (b->zerocopy_busy) {
break;
}
#endif
if (b->shadow) { if (b->shadow) {
b->shadow->pos = b->shadow->last; b->shadow->pos = b->shadow->last;
} }

1
src/os/unix/ngx_freebsd.h
View File

@ -14,7 +14,6 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
extern int ngx_freebsd_kern_osreldate; extern int ngx_freebsd_kern_osreldate;
extern int ngx_freebsd_hw_ncpu; extern int ngx_freebsd_hw_ncpu;
extern u_long ngx_freebsd_net_inet_tcp_sendspace; extern u_long ngx_freebsd_net_inet_tcp_sendspace;
extern int ngx_freebsd_kern_ipc_zero_copy_send;
extern ngx_uint_t ngx_freebsd_sendfile_nbytes_bug; extern ngx_uint_t ngx_freebsd_sendfile_nbytes_bug;
extern ngx_uint_t ngx_freebsd_use_tcp_nopush; extern ngx_uint_t ngx_freebsd_use_tcp_nopush;

7
src/os/unix/ngx_freebsd_init.c
View File

@ -19,9 +19,6 @@ u_long ngx_freebsd_net_inet_tcp_sendspace;
/* FreeBSD 4.9 */ /* FreeBSD 4.9 */
int ngx_freebsd_machdep_hlt_logical_cpus; int ngx_freebsd_machdep_hlt_logical_cpus;
/* FreeBSD 5.0 */
int ngx_freebsd_kern_ipc_zero_copy_send;
ngx_uint_t ngx_freebsd_sendfile_nbytes_bug; ngx_uint_t ngx_freebsd_sendfile_nbytes_bug;
ngx_uint_t ngx_freebsd_use_tcp_nopush; ngx_uint_t ngx_freebsd_use_tcp_nopush;
@ -68,10 +65,6 @@ sysctl_t sysctls[] = {
&ngx_freebsd_kern_ipc_somaxconn, &ngx_freebsd_kern_ipc_somaxconn,
sizeof(ngx_freebsd_kern_ipc_somaxconn), 0 }, sizeof(ngx_freebsd_kern_ipc_somaxconn), 0 },
{ "kern.ipc.zero_copy.send",
&ngx_freebsd_kern_ipc_zero_copy_send,
sizeof(ngx_freebsd_kern_ipc_zero_copy_send), 0 },
{ NULL, NULL, 0, 0 } { NULL, NULL, 0, 0 }
}; };

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

@ -13,7 +13,6 @@
#define NGX_IO_SENDFILE 1 #define NGX_IO_SENDFILE 1
#define NGX_IO_ZEROCOPY 2
typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size); typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size);

1
src/os/win32/ngx_os.h
View File

@ -13,7 +13,6 @@
#include <ngx_gui.h> #include <ngx_gui.h>
#define NGX_IO_SENDFILE 1 #define NGX_IO_SENDFILE 1
#define NGX_IO_ZEROCOPY 2
typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size); typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size);