mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Create cell-stats history even if we didn't see a single circuit.

Browse source 
So far, if we didn't see a single circuit, we refrained from
generating a cell-stats string and logged a warning.  Nobody will
notice the warning, and people will wonder why there's no cell-stats
string in the extra-info descriptor.  The better behavior is to
generate a cell-stats string with all zeros.
This commit is contained in:
Karsten Loesing 2011-08-03 13:33:48 +02:00
parent a6a127c833
commit 8f4e5fa2b5
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/or/rephist.c
View file

@ -2455,32 +2455,31 @@ rep_hist_buffer_stats_write(time_t now)
/* add current circuits to stats */ /* add current circuits to stats */
for (circ = _circuit_get_global_list(); circ; circ = circ->next) for (circ = _circuit_get_global_list(); circ; circ = circ->next)
rep_hist_buffer_stats_add_circ(circ, now); rep_hist_buffer_stats_add_circ(circ, now);
/* calculate deciles */
/* Calculate deciles if we saw at least one circuit. */
memset(processed_cells, 0, SHARES * sizeof(int)); memset(processed_cells, 0, SHARES * sizeof(int));
memset(circs_in_share, 0, SHARES * sizeof(int)); memset(circs_in_share, 0, SHARES * sizeof(int));
memset(queued_cells, 0, SHARES * sizeof(double)); memset(queued_cells, 0, SHARES * sizeof(double));
memset(time_in_queue, 0, SHARES * sizeof(double)); memset(time_in_queue, 0, SHARES * sizeof(double));
if (!circuits_for_buffer_stats) if (!circuits_for_buffer_stats)
circuits_for_buffer_stats = smartlist_create(); circuits_for_buffer_stats = smartlist_create();
smartlist_sort(circuits_for_buffer_stats,
_buffer_stats_compare_entries);
number_of_circuits = smartlist_len(circuits_for_buffer_stats); number_of_circuits = smartlist_len(circuits_for_buffer_stats);
if (number_of_circuits < 1) { if (number_of_circuits > 0) {
log_info(LD_HIST, "Attempt to write cell statistics to disk failed. " smartlist_sort(circuits_for_buffer_stats,
"We haven't seen a single circuit to report about."); _buffer_stats_compare_entries);
goto done; i = 0;
SMARTLIST_FOREACH_BEGIN(circuits_for_buffer_stats,
circ_buffer_stats_t *, stat)
{
int share = i++ * SHARES / number_of_circuits;
processed_cells[share] += stat->processed_cells;
queued_cells[share] += stat->mean_num_cells_in_queue;
time_in_queue[share] += stat->mean_time_cells_in_queue;
circs_in_share[share]++;
}
SMARTLIST_FOREACH_END(stat);
} }
i = 0;
SMARTLIST_FOREACH_BEGIN(circuits_for_buffer_stats,
circ_buffer_stats_t *, stat)
{
int share = i++ * SHARES / number_of_circuits;
processed_cells[share] += stat->processed_cells;
queued_cells[share] += stat->mean_num_cells_in_queue;
time_in_queue[share] += stat->mean_time_cells_in_queue;
circs_in_share[share]++;
}
SMARTLIST_FOREACH_END(stat);
/* clear buffer stats history */ /* clear buffer stats history */
SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *,
stat, tor_free(stat)); stat, tor_free(stat));