diff options
author | Nick Mathewson <nickm@torproject.org> | 2006-09-17 20:12:10 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2006-09-17 20:12:10 +0000 |
commit | 65974f82fa17bb19186df00e6cf311e96baa9c51 (patch) | |
tree | b0a63545d2f6b6f38ba9ac3a3d99c5ea598a59fa /src/or | |
parent | 547624dcff8796699d05ccb5d936936ac2c2b8bd (diff) | |
download | tor-65974f82fa17bb19186df00e6cf311e96baa9c51.tar tor-65974f82fa17bb19186df00e6cf311e96baa9c51.tar.gz |
r8839@Kushana: nickm | 2006-09-17 16:11:59 -0400
Add some client performance XXXXs; try to move some common case tests higher on their decision trees.
svn:r8410
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/main.c | 2 | ||||
-rw-r--r-- | src/or/routerlist.c | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/or/main.c b/src/or/main.c index c09abefd8..984563f2e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -749,6 +749,8 @@ run_scheduled_events(time_t now) } if (time_to_try_getting_descriptors < now) { + /* XXXX Maybe we should do this every 10sec when not enough info, + * and every 60sec when we have enough info -NM */ update_router_descriptor_downloads(now); time_to_try_getting_descriptors = now + DESCRIPTOR_RETRY_INTERVAL; } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 088f74696..4bc26b13a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1672,6 +1672,8 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, */ for (i = 0; i < smartlist_len(routerlist->routers); ++i) { routerinfo_t *old_router = smartlist_get(routerlist->routers, i); + /* XXXX This might be a slow point; can't we just look up in one of the + * digestmaps? -NM */ if (!crypto_pk_cmp_keys(router->identity_pkey,old_router->identity_pkey)) { if (router->cache_info.published_on <= old_router->cache_info.published_on) { @@ -3434,18 +3436,18 @@ initiate_descriptor_downloads(routerstatus_t *source, /** Return 0 if this routerstatus is obsolete, too new, isn't * running, or otherwise not a descriptor that we would make any * use of even if we had it. Else return 1. */ -static int +static INLINE int client_would_use_router(routerstatus_t *rs, time_t now, or_options_t *options) { - if (rs->published_on + ROUTER_MAX_AGE < now) { - /* This one is too old to consider. */ - return 0; - } if (!rs->is_running && !options->FetchUselessDescriptors) { /* If we had this router descriptor, we wouldn't even bother using it. * But, if we want to have a complete list, fetch it anyway. */ return 0; } + if (rs->published_on + ROUTER_MAX_AGE < now) { + /* This one is too old to consider. */ + return 0; + } if (rs->published_on + ESTIMATED_PROPAGATION_TIME > now) { /* Most caches probably don't have this descriptor yet. */ return 0; @@ -3477,15 +3479,15 @@ router_list_client_downloadable(void) SMARTLIST_FOREACH(routerstatus_list, local_routerstatus_t *, rs, { routerinfo_t *ri; - if (!client_would_use_router(&rs->status, now, options)) { + if (router_get_by_descriptor_digest(rs->status.descriptor_digest)) { + /* We have the 'best' descriptor for this router. */ + ++n_uptodate; + } else if (!client_would_use_router(&rs->status, now, options)) { /* We wouldn't want this descriptor even if we got it. */ ++n_wouldnt_use; } else if (digestmap_get(downloading, rs->status.descriptor_digest)) { /* We're downloading this one now. */ ++n_in_progress; - } else if (router_get_by_descriptor_digest(rs->status.descriptor_digest)) { - /* We have the 'best' descriptor for this router. */ - ++n_uptodate; } else if ((ri = router_get_by_digest(rs->status.identity_digest)) && ri->cache_info.published_on > rs->status.published_on) { /* Oddly, we have a descriptor more recent than the 'best' one, but it |