From 0ab91b901299ac41e3867ebec7e04e5082a4c8b4 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sun, 6 Jun 2004 19:49:18 +0000 Subject: nginx-0.0.3-2004-06-06-23:49:18 import --- src/core/ngx_alloc.c | 200 ---------------------------------------------- src/core/ngx_alloc.h | 54 ------------- src/core/ngx_config.h | 10 --- src/core/ngx_connection.c | 2 +- src/core/ngx_connection.h | 1 + src/core/ngx_core.h | 1 + src/core/ngx_palloc.c | 198 +++++++++++++++++++++++++++++++++++++++++++++ src/core/ngx_palloc.h | 51 ++++++++++++ 8 files changed, 252 insertions(+), 265 deletions(-) delete mode 100644 src/core/ngx_alloc.c delete mode 100644 src/core/ngx_alloc.h create mode 100644 src/core/ngx_palloc.c create mode 100644 src/core/ngx_palloc.h (limited to 'src/core') diff --git a/src/core/ngx_alloc.c b/src/core/ngx_alloc.c deleted file mode 100644 index de583fc09..000000000 --- a/src/core/ngx_alloc.c +++ /dev/null @@ -1,200 +0,0 @@ - -#include -#include - - -void *ngx_alloc(size_t size, ngx_log_t *log) -{ - void *p; - - if (!(p = malloc(size))) { - ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "malloc() " SIZE_T_FMT " bytes failed", size); - } - - ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, - "malloc: " PTR_FMT ":" SIZE_T_FMT, p, size); - - return p; -} - - -void *ngx_calloc(size_t size, ngx_log_t *log) -{ - void *p; - - p = ngx_alloc(size, log); - if (p) { - ngx_memzero(p, size); - } - - return p; -} - - -ngx_pool_t *ngx_create_pool(size_t size, ngx_log_t *log) -{ - ngx_pool_t *p; - - if (!(p = ngx_alloc(size, log))) { - return NULL; - } - - p->last = (char *) p + sizeof(ngx_pool_t); - p->end = (char *) p + size; - p->next = NULL; - p->large = NULL; - p->log = log; - - return p; -} - - -void ngx_destroy_pool(ngx_pool_t *pool) -{ - ngx_pool_t *p, *n; - ngx_pool_large_t *l; - - for (l = pool->large; l; l = l->next) { - - ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, - "free: " PTR_FMT, l->alloc); - - if (l->alloc) { - free(l->alloc); - } - } - -#if (NGX_DEBUG) - - /* - * we could allocate the pool->log from this pool - * so we can not use this log while the free()ing the pool - */ - - for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { - ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, - "free: " PTR_FMT, p); - - if (n == NULL) { - break; - } - } - -#endif - - for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { - free(p); - - if (n == NULL) { - break; - } - } -} - - -void *ngx_palloc(ngx_pool_t *pool, size_t size) -{ - char *m; - ngx_pool_t *p, *n; - ngx_pool_large_t *large, *last; - - if (size <= NGX_MAX_ALLOC_FROM_POOL) { - - for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { - m = ngx_align(p->last); - - if ((size_t) (p->end - m) >= size) { - p->last = m + size ; - - return m; - } - - if (n == NULL) { - break; - } - } - - /* alloc a new pool block */ - - if (!(n = ngx_create_pool((size_t) (p->end - (char *) p), p->log))) { - return NULL; - } - - p->next = n; - m = n->last; - n->last += size; - - return m; - } - - /* alloc a large block */ - - large = NULL; - last = NULL; - - if (pool->large) { - for (last = pool->large; /* void */; last = last->next) { - if (last->alloc == NULL) { - large = last; - last = NULL; - break; - } - - if (last->next == NULL) { - break; - } - } - } - - if (large == NULL) { - if (!(large = ngx_palloc(pool, sizeof(ngx_pool_large_t)))) { - return NULL; - } - - large->next = NULL; - } - - if (!(p = ngx_alloc(size, pool->log))) { - return NULL; - } - - if (pool->large == NULL) { - pool->large = large; - - } else if (last) { - last->next = large; - } - - large->alloc = p; - - return p; -} - - -void ngx_pfree(ngx_pool_t *pool, void *p) -{ - ngx_pool_large_t *l; - - for (l = pool->large; l; l = l->next) { - if (p == l->alloc) { - ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, - "free: " PTR_FMT, l->alloc); - free(l->alloc); - l->alloc = NULL; - } - } -} - - -void *ngx_pcalloc(ngx_pool_t *pool, size_t size) -{ - void *p; - - p = ngx_palloc(pool, size); - if (p) { - ngx_memzero(p, size); - } - - return p; -} diff --git a/src/core/ngx_alloc.h b/src/core/ngx_alloc.h deleted file mode 100644 index e64f84f4a..000000000 --- a/src/core/ngx_alloc.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef _NGX_ALLOC_H_INCLUDED_ -#define _NGX_ALLOC_H_INCLUDED_ - - -#include -#include - - -/* - * NGX_MAX_ALLOC_FROM_POOL should be (NGX_PAGE_SIZE - 1), i.e. 4095 on x86. - * On FreeBSD 5.x it allows to use zero copy send. - * On Windows NT it decreases a number of locked pages in a kernel. - */ -#define NGX_MAX_ALLOC_FROM_POOL 4095 - -#define NGX_DEFAULT_POOL_SIZE (16 * 1024) - -#define ngx_test_null(p, alloc, rc) if ((p = alloc) == NULL) { return rc; } - - -typedef struct ngx_pool_large_s ngx_pool_large_t; - -struct ngx_pool_large_s { - ngx_pool_large_t *next; - void *alloc; -}; - - -typedef struct ngx_pool_s ngx_pool_t; - -struct ngx_pool_s { - char *last; - char *end; - ngx_pool_t *next; - ngx_pool_large_t *large; - ngx_log_t *log; -}; - - -void *ngx_alloc(size_t size, ngx_log_t *log); -void *ngx_calloc(size_t size, ngx_log_t *log); - -ngx_pool_t *ngx_create_pool(size_t size, ngx_log_t *log); -void ngx_destroy_pool(ngx_pool_t *pool); - -void *ngx_palloc(ngx_pool_t *pool, size_t size); -void *ngx_pcalloc(ngx_pool_t *pool, size_t size); -void ngx_pfree(ngx_pool_t *pool, void *p); - - -#define ngx_free free - - -#endif /* _NGX_ALLOC_H_INCLUDED_ */ diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index 448e63ab6..02983151a 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -40,19 +40,9 @@ /* STUB: autoconf */ typedef int ngx_int_t; typedef u_int ngx_uint_t; - - typedef int ngx_flag_t; -#ifndef NGX_SERVER_ROOT -#define NGX_SERVER_ROOT "./" -#if 0 -#define NGX_SERVER_ROOT "/usr/local/nginx/" -#endif -#endif - - #if !(WIN32) #define ngx_signal_helper(n) SIG##n diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 6382ec10c..d5de07675 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -228,7 +228,7 @@ void ngx_close_listening_sockets(ngx_cycle_t *cycle) fd /= 4; #endif - if (ngx_event_flags & NGX_USE_SIGIO_EVENT) { + if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { if (cycle->connections[fd].read->active) { ngx_del_conn(&cycle->connections[fd], NGX_CLOSE_EVENT); } diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index ecd3c8bc4..8dbc4e49f 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -103,6 +103,7 @@ struct ngx_connection_s { unsigned pipeline:1; unsigned unexpected_eof:1; + unsigned timedout:1; signed tcp_nopush:2; #if (HAVE_IOCP) unsigned accept_context_updated:1; diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h index ccb357bfe..1e194e719 100644 --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -26,6 +26,7 @@ typedef struct ngx_connection_s ngx_connection_t; #include #include #include +#include #include #include #include diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c new file mode 100644 index 000000000..65e2eed66 --- /dev/null +++ b/src/core/ngx_palloc.c @@ -0,0 +1,198 @@ + +#include +#include + + +ngx_pool_t *ngx_create_pool(size_t size, ngx_log_t *log) +{ + ngx_pool_t *p; + + if (!(p = ngx_alloc(size, log))) { + return NULL; + } + + p->last = (char *) p + sizeof(ngx_pool_t); + p->end = (char *) p + size; + p->next = NULL; + p->large = NULL; + p->log = log; + + return p; +} + + +void ngx_destroy_pool(ngx_pool_t *pool) +{ + ngx_pool_t *p, *n; + ngx_pool_large_t *l; + + for (l = pool->large; l; l = l->next) { + + ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, + "free: " PTR_FMT, l->alloc); + + if (l->alloc) { + free(l->alloc); + } + } + +#if (NGX_DEBUG) + + /* + * we could allocate the pool->log from this pool + * so we can not use this log while the free()ing the pool + */ + + for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { + ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, + "free: " PTR_FMT, p); + + if (n == NULL) { + break; + } + } + +#endif + + for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { + free(p); + + if (n == NULL) { + break; + } + } +} + + +void *ngx_palloc(ngx_pool_t *pool, size_t size) +{ + char *m; + ngx_pool_t *p, *n; + ngx_pool_large_t *large, *last; + + if (size <= (size_t) NGX_MAX_ALLOC_FROM_POOL) { + + for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { + m = ngx_align(p->last); + + if ((size_t) (p->end - m) >= size) { + p->last = m + size ; + + return m; + } + + if (n == NULL) { + break; + } + } + + /* alloc a new pool block */ + + if (!(n = ngx_create_pool((size_t) (p->end - (char *) p), p->log))) { + return NULL; + } + + p->next = n; + m = n->last; + n->last += size; + + return m; + } + + /* alloc a large block */ + + large = NULL; + last = NULL; + + if (pool->large) { + for (last = pool->large; /* void */; last = last->next) { + if (last->alloc == NULL) { + large = last; + last = NULL; + break; + } + + if (last->next == NULL) { + break; + } + } + } + + if (large == NULL) { + if (!(large = ngx_palloc(pool, sizeof(ngx_pool_large_t)))) { + return NULL; + } + + large->next = NULL; + } + + if (!(p = ngx_memalign(ngx_pagesize, size, pool->log))) { + return NULL; + } + + if (pool->large == NULL) { + pool->large = large; + + } else if (last) { + last->next = large; + } + + large->alloc = p; + + return p; +} + + +void ngx_pfree(ngx_pool_t *pool, void *p) +{ + ngx_pool_large_t *l; + + for (l = pool->large; l; l = l->next) { + if (p == l->alloc) { + ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, + "free: " PTR_FMT, l->alloc); + free(l->alloc); + l->alloc = NULL; + } + } +} + + +void *ngx_pcalloc(ngx_pool_t *pool, size_t size) +{ + void *p; + + p = ngx_palloc(pool, size); + if (p) { + ngx_memzero(p, size); + } + + return p; +} + +#if 0 + +static void *ngx_get_cached_block(size_t size) +{ + void *p; + ngx_cached_block_slot_t *slot; + + if (ngx_cycle->cache == NULL) { + return NULL; + } + + slot = &ngx_cycle->cache[(size + ngx_pagesize - 1) / ngx_pagesize]; + + slot->tries++; + + if (slot->number) { + p = slot->block; + slot->block = slot->block->next; + slot->number--; + return p; + } + + return NULL; +} + +#endif diff --git a/src/core/ngx_palloc.h b/src/core/ngx_palloc.h new file mode 100644 index 000000000..7774d356c --- /dev/null +++ b/src/core/ngx_palloc.h @@ -0,0 +1,51 @@ +#ifndef _NGX_PALLOC_H_INCLUDED_ +#define _NGX_PALLOC_H_INCLUDED_ + + +#include +#include + + +/* + * NGX_MAX_ALLOC_FROM_POOL should be (ngx_page_size - 1), i.e. 4095 on x86. + * On FreeBSD 5.x it allows to use zero copy send. + * On Windows NT it decreases a number of locked pages in a kernel. + */ +#define NGX_MAX_ALLOC_FROM_POOL (ngx_pagesize - 1) + +#define NGX_DEFAULT_POOL_SIZE (16 * 1024) + +#define ngx_test_null(p, alloc, rc) if ((p = alloc) == NULL) { return rc; } + + +typedef struct ngx_pool_large_s ngx_pool_large_t; + +struct ngx_pool_large_s { + ngx_pool_large_t *next; + void *alloc; +}; + + +typedef struct ngx_pool_s ngx_pool_t; + +struct ngx_pool_s { + char *last; + char *end; + ngx_pool_t *next; + ngx_pool_large_t *large; + ngx_log_t *log; +}; + + +void *ngx_alloc(size_t size, ngx_log_t *log); +void *ngx_calloc(size_t size, ngx_log_t *log); + +ngx_pool_t *ngx_create_pool(size_t size, ngx_log_t *log); +void ngx_destroy_pool(ngx_pool_t *pool); + +void *ngx_palloc(ngx_pool_t *pool, size_t size); +void *ngx_pcalloc(ngx_pool_t *pool, size_t size); +void ngx_pfree(ngx_pool_t *pool, void *p); + + +#endif /* _NGX_PALLOC_H_INCLUDED_ */ -- cgit