[tor-commits] [tor/master] Nick's Code review #3 part 2.

[nickm at torproject.org]

commit 406d59a9c93e46bcb5be0e0a5c087f4860522d56
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Dec 18 14:16:01 2012 -0800

    Nick's Code review #3 part 2.
---
 src/or/circuitbuild.c |   15 +++++++++++----
 src/or/entrynodes.c   |    6 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 58020f2..804782d 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1350,7 +1350,7 @@ pathbias_count_build_success(origin_circuit_t *circ)
         circ->path_state = PATH_STATE_BUILD_SUCCEEDED;
         guard->circ_successes++;
 
-        log_info(LD_CIRC, "Got success count %lf/%lf for guard %s=%s",
+        log_info(LD_CIRC, "Got success count %f/%f for guard %s=%s",
                  guard->circ_successes, guard->circ_attempts,
                  guard->nickname, hex_str(guard->identity, DIGEST_LEN));
       } else {
@@ -1368,7 +1368,7 @@ pathbias_count_build_success(origin_circuit_t *circ)
       }
 
       if (guard->circ_attempts < guard->circ_successes) {
-        log_notice(LD_BUG, "Unexpectedly high successes counts (%lf/%lf) "
+        log_notice(LD_BUG, "Unexpectedly high successes counts (%f/%f) "
                  "for guard %s=%s",
                  guard->circ_successes, guard->circ_attempts,
                  guard->nickname, hex_str(guard->identity, DIGEST_LEN));
@@ -1407,6 +1407,13 @@ pathbias_count_build_success(origin_circuit_t *circ)
 
 /**
  * Check if a circuit was used and/or closed successfully.
+ *
+ * If we attempted to use the circuit to carry a stream but failed
+ * for whatever reason, or if the circuit mysteriously died before
+ * we could attach any streams, record these two cases.
+ *
+ * If we *have* successfully used the circuit, or it appears to
+ * have been closed by us locally, count it as a success.
  */
 void
 pathbias_check_close(origin_circuit_t *ocirc, int reason)
@@ -1751,7 +1758,7 @@ entry_guard_inc_circ_attempt_count(entry_guard_t *guard)
     const int scale_factor = pathbias_get_scale_factor(options);
     const int mult_factor = pathbias_get_mult_factor(options);
     log_info(LD_CIRC,
-             "Scaling pathbias counts to (%lf/%lf)*(%d/%d) for guard %s=%s",
+             "Scaling pathbias counts to (%f/%f)*(%d/%d) for guard %s=%s",
              guard->circ_successes, guard->circ_attempts,
              mult_factor, scale_factor, guard->nickname,
              hex_str(guard->identity, DIGEST_LEN));
@@ -1771,7 +1778,7 @@ entry_guard_inc_circ_attempt_count(entry_guard_t *guard)
     guard->unusable_circuits /= scale_factor;
   }
   guard->circ_attempts++;
-  log_info(LD_CIRC, "Got success count %lf/%lf for guard %s=%s",
+  log_info(LD_CIRC, "Got success count %f/%f for guard %s=%s",
            guard->circ_successes, guard->circ_attempts, guard->nickname,
            hex_str(guard->identity, DIGEST_LEN));
   return 0;
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index fc7f6ed..7aa4d7a 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1060,7 +1060,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
       node->collapsed_circuits = collapsed;
       node->unusable_circuits = unusable;
 
-      log_info(LD_GENERAL, "Read %lf/%lf path bias for node %s",
+      log_info(LD_GENERAL, "Read %f/%f path bias for node %s",
                node->circ_successes, node->circ_attempts, node->nickname);
       /* Note: We rely on the < comparison here to allow us to set a 0
        * rate and disable the feature entirely. If refactoring, don't
@@ -1070,7 +1070,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
           pathbias_get_dropguards(options)) {
         node->path_bias_disabled = 1;
         log_info(LD_GENERAL,
-                 "Path bias is too high (%lf/%lf); disabling node %s",
+                 "Path bias is too high (%f/%f); disabling node %s",
                  node->circ_successes, node->circ_attempts, node->nickname);
       }
 
@@ -1200,7 +1200,7 @@ entry_guards_update_state(or_state_t *state)
         /* In the long run: circuit_success ~= successful_circuit_close +
          *                                     collapsed_circuits +
          *                                     unusable_circuits */
-        tor_asprintf(&line->value, "%lf %lf %lf %lf %lf %lf",
+        tor_asprintf(&line->value, "%f %f %f %f %f %f",
                      e->circ_attempts, e->circ_successes,
                      pathbias_get_closed_count(e), e->collapsed_circuits,
                      e->unusable_circuits, e->timeouts);