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

Merge remote-tracking branch 'public/format_doubles'

Browse Source 
Conflicts:
	src/or/geoip.c
This commit is contained in:
Nick Mathewson 2012-06-05 10:30:50 -04:00
commit b4bd4964eb
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug3894_fmt_doubles Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Format more doubles with %f, not %lf. Patch from grarpamp to make
Tor build correctly on older BSDs again. Fixes bug 3894; bugfix on
Tor 0.2.0.8-alpha.

2
src/or/dirserv.c
View File

@ -1995,7 +1995,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl)
log(LOG_INFO, LD_DIRSERV, log(LOG_INFO, LD_DIRSERV,
"Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. " "Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. "
"For Fast: %lu bytes/sec. " "For Fast: %lu bytes/sec. "
"For Guard: WFU %.03lf%%, time-known %lu sec, " "For Guard: WFU %.03f%%, time-known %lu sec, "
"and bandwidth %lu or %lu bytes/sec. We%s have enough stability data.", "and bandwidth %lu or %lu bytes/sec. We%s have enough stability data.",
(unsigned long)stable_uptime, (unsigned long)stable_uptime,
(unsigned long)stable_mtbf, (unsigned long)stable_mtbf,

4
src/or/geoip.c
View File

@ -1025,9 +1025,9 @@ geoip_format_dirreq_stats(time_t now)
#undef RESPONSE_GRANULARITY #undef RESPONSE_GRANULARITY
if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) { if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) {
tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2lf%%\n", tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2f%%\n",
v2_share*100); v2_share*100);
tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2lf%%\n", tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2f%%\n",
v3_share*100); v3_share*100);
} }

6
src/or/rephist.c
View File

@ -839,7 +839,7 @@ rep_hist_record_mtbf_data(time_t now, int missing_means_down)
format_iso_time(time_buf, hist->start_of_run); format_iso_time(time_buf, hist->start_of_run);
t = time_buf; t = time_buf;
} }
PRINTF((f, "+MTBF %lu %.5lf%s%s\n", PRINTF((f, "+MTBF %lu %.5f%s%s\n",
hist->weighted_run_length, hist->total_run_weights, hist->weighted_run_length, hist->total_run_weights,
t ? " S=" : "", t ? t : "")); t ? " S=" : "", t ? t : ""));
t = NULL; t = NULL;
@ -889,10 +889,10 @@ rep_hist_format_router_status(or_history_t *hist, time_t now)
tor_asprintf(&cp, tor_asprintf(&cp,
"%s%s%s" "%s%s%s"
"%s%s%s" "%s%s%s"
"wfu %0.3lf\n" "wfu %0.3f\n"
" weighted-time %lu\n" " weighted-time %lu\n"
" weighted-uptime %lu\n" " weighted-uptime %lu\n"
"mtbf %0.1lf\n" "mtbf %0.1f\n"
" weighted-run-length %lu\n" " weighted-run-length %lu\n"
" total-run-weights %f\n", " total-run-weights %f\n",
up?"uptime-started ":"", up?sor_buf:"", up?" UTC\n":"", up?"uptime-started ":"", up?sor_buf:"", up?" UTC\n":"",