nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make smartlists start small and grow as needed.

Browse Source 
svn:r1394
This commit is contained in:
Nick Mathewson 2004-03-30 19:25:43 +00:00
parent 32cc2e5909
commit abcf3d9341
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/util.c
View File

@ -117,12 +117,17 @@ void set_uint32(char *cp, uint32_t v)
* _add() adds an element, _remove() removes an element if it's there,
* _choose() returns a random element.
*/
#define SL_DEFAULT_CAPACITY 32
smartlist_t *smartlist_create(int max_elements) {
smartlist_t *sl = tor_malloc(sizeof(smartlist_t));
sl->list = tor_malloc(sizeof(void *) * max_elements);
sl->num_used = 0;
sl->max = max_elements;
if (max_elements <= SL_DEFAULT_CAPACITY)
sl->capacity = max_elements;
else
sl->capacity = SL_DEFAULT_CAPACITY;
sl->list = tor_malloc(sizeof(void *) * sl->capacity);
return sl;
}
@ -131,11 +136,22 @@ void smartlist_free(smartlist_t *sl) {
free(sl);
}
void smartlist_grow_capacity(smartlist_t *sl, int n) {
if (sl->capacity < n) {
sl->capacity = n;
sl->list = tor_realloc(sl->list, sizeof(void*)*sl->capacity);
}
}
/* add element to the list, but only if there's room */
void smartlist_add(smartlist_t *sl, void *element) {
if(sl->num_used < sl->max)
if (sl->num_used < sl->max) {
if (sl->num_used >= sl->capacity) {
sl->capacity *= 2;
sl->list = tor_realloc(sl->list, sizeof(void*)*sl->capacity);
}
sl->list[sl->num_used++] = element;
else
} else
log_fn(LOG_WARN,"We've already got %d elements, discarding.",sl->max);
}

2
src/common/util.h
View File

@ -62,10 +62,12 @@ typedef struct {
void **list;
int num_used;
int max;
int capacity;
} smartlist_t;
smartlist_t *smartlist_create(int max_elements);
void smartlist_free(smartlist_t *sl);
void smartlist_grow_capacity(smartlist_t *sl, int n);
void smartlist_add(smartlist_t *sl, void *element);
void smartlist_remove(smartlist_t *sl, void *element);
int smartlist_isin(smartlist_t *sl, void *element);