summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--auto/sources1
-rw-r--r--src/nxt_main.h1
-rw-r--r--src/nxt_vector.c156
-rw-r--r--src/nxt_vector.h65
4 files changed, 0 insertions, 223 deletions
diff --git a/auto/sources b/auto/sources
index 6ee4d87b..f34d7fd7 100644
--- a/auto/sources
+++ b/auto/sources
@@ -41,7 +41,6 @@ NXT_LIB_SRCS=" \
src/nxt_murmur_hash.c \
src/nxt_lvlhsh.c \
src/nxt_array.c \
- src/nxt_vector.c \
src/nxt_list.c \
src/nxt_buf.c \
src/nxt_buf_pool.c \
diff --git a/src/nxt_main.h b/src/nxt_main.h
index aa96256e..7880e55f 100644
--- a/src/nxt_main.h
+++ b/src/nxt_main.h
@@ -104,7 +104,6 @@ typedef struct {
#include <nxt_hash.h>
#include <nxt_sort.h>
-#include <nxt_vector.h>
#include <nxt_list.h>
#include <nxt_service.h>
diff --git a/src/nxt_vector.c b/src/nxt_vector.c
deleted file mode 100644
index 4737248c..00000000
--- a/src/nxt_vector.c
+++ /dev/null
@@ -1,156 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) NGINX, Inc.
- */
-
-#include <nxt_main.h>
-
-
-nxt_vector_t *
-nxt_vector_create(nxt_uint_t items, size_t item_size,
- const nxt_mem_proto_t *proto, void *pool)
-{
- nxt_vector_t *vector;
-
- vector = proto->alloc(pool, sizeof(nxt_vector_t) + items * item_size);
-
- if (nxt_fast_path(vector != NULL)) {
- vector->start = nxt_pointer_to(vector, sizeof(nxt_vector_t));
- vector->items = 0;
- vector->item_size = item_size;
- vector->avalaible = items;
- vector->type = NXT_VECTOR_EMBEDDED;
- }
-
- return vector;
-}
-
-
-void *
-nxt_vector_init(nxt_vector_t *vector, nxt_uint_t items, size_t item_size,
- const nxt_mem_proto_t *proto, void *pool)
-{
- vector->start = proto->alloc(pool, items * item_size);
-
- if (nxt_fast_path(vector->start != NULL)) {
- vector->items = 0;
- vector->item_size = item_size;
- vector->avalaible = items;
- vector->type = NXT_VECTOR_INITED;
- }
-
- return vector->start;
-}
-
-
-void
-nxt_vector_destroy(nxt_vector_t *vector, const nxt_mem_proto_t *proto,
- void *pool)
-{
- switch (vector->type) {
-
- case NXT_VECTOR_INITED:
- proto->free(pool, vector->start);
-#if (NXT_DEBUG)
- vector->start = NULL;
- vector->items = 0;
- vector->avalaible = 0;
-#endif
- break;
-
- case NXT_VECTOR_DESCRETE:
- proto->free(pool, vector->start);
-
- /* Fall through. */
-
- case NXT_VECTOR_EMBEDDED:
- proto->free(pool, vector);
- break;
- }
-}
-
-
-void *
-nxt_vector_add(nxt_vector_t *vector, const nxt_mem_proto_t *proto, void *pool)
-{
- void *item, *start, *old;
- size_t size;
- uint32_t n;
-
- n = vector->avalaible;
-
- if (n == vector->items) {
-
- if (n < 16) {
- /* Allocate new vector twice as much as current. */
- n *= 2;
-
- } else {
- /* Allocate new vector half as much as current. */
- n += n / 2;
- }
-
- size = n * vector->item_size;
-
- start = proto->alloc(pool, size);
- if (nxt_slow_path(start == NULL)) {
- return NULL;
- }
-
- vector->avalaible = n;
- old = vector->start;
- vector->start = start;
-
- nxt_memcpy(start, old, size);
-
- if (vector->type == NXT_VECTOR_EMBEDDED) {
- vector->type = NXT_VECTOR_DESCRETE;
-
- } else {
- proto->free(pool, old);
- }
- }
-
- item = nxt_pointer_to(vector->start, vector->item_size * vector->items);
-
- vector->items++;
-
- return item;
-}
-
-
-void *
-nxt_vector_zero_add(nxt_vector_t *vector, const nxt_mem_proto_t *proto,
- void *pool)
-{
- void *item;
-
- item = nxt_vector_add(vector, proto, pool);
-
- if (nxt_fast_path(item != NULL)) {
- nxt_memzero(item, vector->item_size);
- }
-
- return item;
-}
-
-
-void
-nxt_vector_remove(nxt_vector_t *vector, void *item)
-{
- u_char *next, *last, *end;
- uint32_t item_size;
-
- item_size = vector->item_size;
- end = nxt_pointer_to(vector->start, item_size * vector->items);
- last = end - item_size;
-
- if (item != last) {
- next = nxt_pointer_to(item, item_size);
-
- nxt_memmove(item, next, end - next);
- }
-
- vector->items--;
-}
diff --git a/src/nxt_vector.h b/src/nxt_vector.h
deleted file mode 100644
index dcac53d4..00000000
--- a/src/nxt_vector.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) NGINX, Inc.
- */
-
-#ifndef _NXT_VECTOR_H_INCLUDED_
-#define _NXT_VECTOR_H_INCLUDED_
-
-
-typedef enum {
- NXT_VECTOR_INITED = 0,
- NXT_VECTOR_DESCRETE,
- NXT_VECTOR_EMBEDDED,
-} nxt_vector_type_t;
-
-
-typedef struct {
- void *start;
- /*
- * A vector can hold no more than 65536 items.
- * The item size is no more than 64K.
- */
- uint16_t items;
- uint16_t avalaible;
- uint16_t item_size;
- nxt_vector_type_t type:8;
-} nxt_vector_t;
-
-
-NXT_EXPORT nxt_vector_t *nxt_vector_create(nxt_uint_t items, size_t item_size,
- const nxt_mem_proto_t *proto, void *pool);
-NXT_EXPORT void *nxt_vector_init(nxt_vector_t *vector, nxt_uint_t items,
- size_t item_size, const nxt_mem_proto_t *proto, void *pool);
-NXT_EXPORT void nxt_vector_destroy(nxt_vector_t *vector,
- const nxt_mem_proto_t *proto, void *pool);
-NXT_EXPORT void *nxt_vector_add(nxt_vector_t *vector,
- const nxt_mem_proto_t *proto, void *pool);
-NXT_EXPORT void *nxt_vector_zero_add(nxt_vector_t *vector,
- const nxt_mem_proto_t *proto, void *pool);
-NXT_EXPORT void nxt_vector_remove(nxt_vector_t *vector, void *item);
-
-
-#define nxt_vector_last(vector) \
- nxt_pointer_to((vector)->start, \
- (vector)->item_size * ((vector)->items - 1))
-
-
-#define nxt_vector_reset(vector) \
- (vector)->items = 0;
-
-
-#define nxt_vector_is_empty(vector) \
- ((vector)->items == 0)
-
-
-nxt_inline void *
-nxt_vector_remove_last(nxt_vector_t *vector)
-{
- vector->items--;
- return nxt_pointer_to(vector->start, vector->item_size * vector->items);
-}
-
-
-#endif /* _NXT_VECTOR_H_INCLUDED_ */
generated by cgit (git 2.34.1) at 2024-11-16 18:27:39 +0000