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

Merge branch 'bug9658_refactor'

Browse Source
This commit is contained in:
Nick Mathewson 2014-03-27 23:00:28 -04:00
commit 9efd970dd9
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/cpuworker.c
View File

@ -686,7 +686,7 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker,
} }
if (connection_or_digest_is_known_relay(circ->p_chan->identity_digest)) if (connection_or_digest_is_known_relay(circ->p_chan->identity_digest))
rep_hist_note_circuit_handshake_completed(onionskin->handshake_type); rep_hist_note_circuit_handshake_assigned(onionskin->handshake_type);
should_time = should_time_request(onionskin->handshake_type); should_time = should_time_request(onionskin->handshake_type);
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));

16
src/or/rephist.c
View File

@ -2992,11 +2992,11 @@ rep_hist_conn_stats_write(time_t now)
} }
/** Internal statistics to track how many requests of each type of /** Internal statistics to track how many requests of each type of
* handshake we've received, and how many we've completed. Useful for * handshake we've received, and how many we've assigned to cpuworkers.
* seeing trends in cpu load. * Useful for seeing trends in cpu load.
* @{ */ * @{ */
static int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; static int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1] = {0};
static int onion_handshakes_completed[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; static int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1] = {0};
/**@}*/ /**@}*/
/** A new onionskin (using the <b>type</b> handshake) has arrived. */ /** A new onionskin (using the <b>type</b> handshake) has arrived. */
@ -3010,10 +3010,10 @@ rep_hist_note_circuit_handshake_requested(uint16_t type)
/** We've sent an onionskin (using the <b>type</b> handshake) to a /** We've sent an onionskin (using the <b>type</b> handshake) to a
* cpuworker. */ * cpuworker. */
void void
rep_hist_note_circuit_handshake_completed(uint16_t type) rep_hist_note_circuit_handshake_assigned(uint16_t type)
{ {
if (type <= MAX_ONION_HANDSHAKE_TYPE) if (type <= MAX_ONION_HANDSHAKE_TYPE)
onion_handshakes_completed[type]++; onion_handshakes_assigned[type]++;
} }
/** Log our onionskin statistics since the last time we were called. */ /** Log our onionskin statistics since the last time we were called. */
@ -3023,11 +3023,11 @@ rep_hist_log_circuit_handshake_stats(time_t now)
(void)now; (void)now;
log_notice(LD_HEARTBEAT, "Circuit handshake stats since last time: " log_notice(LD_HEARTBEAT, "Circuit handshake stats since last time: "
"%d/%d TAP, %d/%d NTor.", "%d/%d TAP, %d/%d NTor.",
onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_TAP],
onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP],
onion_handshakes_completed[ONION_HANDSHAKE_TYPE_NTOR], onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_NTOR],
onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR]); onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR]);
memset(onion_handshakes_completed, 0, sizeof(onion_handshakes_completed)); memset(onion_handshakes_assigned, 0, sizeof(onion_handshakes_assigned));
memset(onion_handshakes_requested, 0, sizeof(onion_handshakes_requested)); memset(onion_handshakes_requested, 0, sizeof(onion_handshakes_requested));
} }

2
src/or/rephist.h
View File

@ -97,7 +97,7 @@ time_t rep_hist_conn_stats_write(time_t now);
void rep_hist_conn_stats_term(void); void rep_hist_conn_stats_term(void);
void rep_hist_note_circuit_handshake_requested(uint16_t type); void rep_hist_note_circuit_handshake_requested(uint16_t type);
void rep_hist_note_circuit_handshake_completed(uint16_t type); void rep_hist_note_circuit_handshake_assigned(uint16_t type);
void rep_hist_log_circuit_handshake_stats(time_t now); void rep_hist_log_circuit_handshake_stats(time_t now);
void rep_hist_free_all(void); void rep_hist_free_all(void);