nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision

Browse Source
This commit is contained in:
Andrea Shepard 2013-03-07 15:55:01 -08:00
parent 6e978ab829
commit b522434834
1 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/or/dirserv.c
View File

@ -2100,38 +2100,15 @@ dirserv_clear_measured_bw_cache(void)
void
dirserv_expire_measured_bw_cache(time_t now)
{
digestmap_iter_t *itr = NULL;
const char *k = NULL;
void *e_v = NULL;
mbw_cache_entry_t *e = NULL;
int rmv;
if (mbw_cache) {
/* Start iterating */
itr = digestmap_iter_init(mbw_cache);
while (!digestmap_iter_done(itr)) {
rmv = 0;
digestmap_iter_get(itr, &k, &e_v);
e = (mbw_cache_entry_t *)e_v;
if (e) {
/* Check for expiration and remove if so */
if (now > e->as_of + MAX_MEASUREMENT_AGE) {
tor_free(e);
rmv = 1;
}
} else {
/* Weird; remove it and complain */
log_warn(LD_BUG, "Saw NULL entry in measured bandwidth cache");
rmv = 1;
/* Iterate through the cache and check each entry */
DIGESTMAP_FOREACH_MODIFY(mbw_cache, k, mbw_cache_entry_t *, e) {
if (now > e->as_of + MAX_MEASUREMENT_AGE) {
tor_free(e);
MAP_DEL_CURRENT(k);
}
/* Advance, or remove and advance */
if (rmv) {
itr = digestmap_iter_next_rmv(mbw_cache, itr);
} else {
itr = digestmap_iter_next(mbw_cache, itr);
}
}
} DIGESTMAP_FOREACH_END;
/* Check if we cleared the whole thing and free if so */
if (digestmap_size(mbw_cache) == 0) {