phpged/unit
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity

Remove unused nxt_vector_t API

Browse source 
This is unused, yet a community member just spent time finding and
fixing a bug in it only to be told it's unused.

Just get rid of the thing.

Link: <https://github.com/nginx/unit/pull/963>
Reviewed-by: Zhidao Hong <z.hong@f5.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This commit is contained in:
Andrew Clayton 2023-09-30 14:51:34 +01:00
parent 8ff606fbca
commit 4eb008bb17
4 changed files with 0 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
auto/sources
View file

@ -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 \

1
src/nxt_main.h
View file

@ -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>

156
src/nxt_vector.c
View file

@ -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--;
}

65
src/nxt_vector.h
View file

@ -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_ */