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

Clean up rep_hist_buffer_stats_write().

Browse Source 
We later want to split this function into one function that generates
the buffer-stats string and one that writes it to disk.
This commit is contained in:
Karsten Loesing 2011-08-03 13:34:29 +02:00
parent 8f4e5fa2b5
commit 95ebd01e62
1 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/or/rephist.c
View File

@ -2434,24 +2434,25 @@ time_t
rep_hist_buffer_stats_write(time_t now) rep_hist_buffer_stats_write(time_t now)
{ {
char *statsdir = NULL, *filename = NULL; char *statsdir = NULL, *filename = NULL;
char written[ISO_TIME_LEN+1];
open_file_t *open_file = NULL; open_file_t *open_file = NULL;
FILE *out; FILE *out;
#define SHARES 10 #define SHARES 10
int processed_cells[SHARES], circs_in_share[SHARES], int processed_cells[SHARES], circs_in_share[SHARES],
number_of_circuits, i; number_of_circuits, i;
double queued_cells[SHARES], time_in_queue[SHARES]; double queued_cells[SHARES], time_in_queue[SHARES];
smartlist_t *str_build = NULL; char *buf = NULL;
char *str = NULL, *buf = NULL;
circuit_t *circ; circuit_t *circ;
smartlist_t *processed_cells_strings, *queued_cells_strings,
*time_in_queue_strings;
char *processed_cells_string, *queued_cells_string,
*time_in_queue_string;
char t[ISO_TIME_LEN+1];
if (!start_of_buffer_stats_interval) if (!start_of_buffer_stats_interval)
return 0; /* Not initialized. */ return 0; /* Not initialized. */
if (start_of_buffer_stats_interval + WRITE_STATS_INTERVAL > now) if (start_of_buffer_stats_interval + WRITE_STATS_INTERVAL > now)
goto done; /* Not ready to write */ goto done; /* Not ready to write */
str_build = smartlist_create();
/* 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);
@ -2484,7 +2485,42 @@ rep_hist_buffer_stats_write(time_t now)
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));
smartlist_clear(circuits_for_buffer_stats); smartlist_clear(circuits_for_buffer_stats);
/* write to file */
/* Write deciles to strings. */
processed_cells_strings = smartlist_create();
queued_cells_strings = smartlist_create();
time_in_queue_strings = smartlist_create();
for (i = 0; i < SHARES; i++) {
tor_asprintf(&buf,"%d", !circs_in_share[i] ? 0 :
processed_cells[i] / circs_in_share[i]);
smartlist_add(processed_cells_strings, buf);
}
for (i = 0; i < SHARES; i++) {
tor_asprintf(&buf, "%.2f", circs_in_share[i] == 0 ? 0.0 :
queued_cells[i] / (double) circs_in_share[i]);
smartlist_add(queued_cells_strings, buf);
}
for (i = 0; i < SHARES; i++) {
tor_asprintf(&buf, "%.0f", circs_in_share[i] == 0 ? 0.0 :
time_in_queue[i] / (double) circs_in_share[i]);
smartlist_add(time_in_queue_strings, buf);
}
/* Join all observations in single strings. */
processed_cells_string = smartlist_join_strings(processed_cells_strings,
",", 0, NULL);
queued_cells_string = smartlist_join_strings(queued_cells_strings,
",", 0, NULL);
time_in_queue_string = smartlist_join_strings(time_in_queue_strings,
",", 0, NULL);
SMARTLIST_FOREACH(processed_cells_strings, char *, cp, tor_free(cp));
SMARTLIST_FOREACH(queued_cells_strings, char *, cp, tor_free(cp));
SMARTLIST_FOREACH(time_in_queue_strings, char *, cp, tor_free(cp));
smartlist_free(processed_cells_strings);
smartlist_free(queued_cells_strings);
smartlist_free(time_in_queue_strings);
/* Write everything to disk. */
statsdir = get_datadir_fname("stats"); statsdir = get_datadir_fname("stats");
if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0)
goto done; goto done;
@ -2493,44 +2529,17 @@ rep_hist_buffer_stats_write(time_t now)
0600, &open_file); 0600, &open_file);
if (!out) if (!out)
goto done; goto done;
format_iso_time(written, now); format_iso_time(t, now);
if (fprintf(out, "cell-stats-end %s (%d s)\n", written, if (fprintf(out, "cell-stats-end %s (%d s)\n", t,
(unsigned) (now - start_of_buffer_stats_interval)) < 0) (unsigned) (now - start_of_buffer_stats_interval)) < 0)
goto done; goto done;
for (i = 0; i < SHARES; i++) { if (fprintf(out, "cell-processed-cells %s\n", processed_cells_string)
tor_asprintf(&buf,"%d", !circs_in_share[i] ? 0 : < 0)
processed_cells[i] / circs_in_share[i]);
smartlist_add(str_build, buf);
}
str = smartlist_join_strings(str_build, ",", 0, NULL);
if (fprintf(out, "cell-processed-cells %s\n", str) < 0)
goto done; goto done;
tor_free(str); if (fprintf(out, "cell-queued-cells %s\n", queued_cells_string) < 0)
SMARTLIST_FOREACH(str_build, char *, c, tor_free(c));
smartlist_clear(str_build);
for (i = 0; i < SHARES; i++) {
tor_asprintf(&buf, "%.2f", circs_in_share[i] == 0 ? 0.0 :
queued_cells[i] / (double) circs_in_share[i]);
smartlist_add(str_build, buf);
}
str = smartlist_join_strings(str_build, ",", 0, NULL);
if (fprintf(out, "cell-queued-cells %s\n", str) < 0)
goto done; goto done;
tor_free(str); if (fprintf(out, "cell-time-in-queue %s\n", time_in_queue_string) < 0)
SMARTLIST_FOREACH(str_build, char *, c, tor_free(c));
smartlist_clear(str_build);
for (i = 0; i < SHARES; i++) {
tor_asprintf(&buf, "%.0f", circs_in_share[i] == 0 ? 0.0 :
time_in_queue[i] / (double) circs_in_share[i]);
smartlist_add(str_build, buf);
}
str = smartlist_join_strings(str_build, ",", 0, NULL);
if (fprintf(out, "cell-time-in-queue %s\n", str) < 0)
goto done; goto done;
tor_free(str);
SMARTLIST_FOREACH(str_build, char *, c, tor_free(c));
smartlist_free(str_build);
str_build = NULL;
if (fprintf(out, "cell-circuits-per-decile %d\n", if (fprintf(out, "cell-circuits-per-decile %d\n",
(number_of_circuits + SHARES - 1) / SHARES) < 0) (number_of_circuits + SHARES - 1) / SHARES) < 0)
goto done; goto done;
@ -2542,11 +2551,9 @@ rep_hist_buffer_stats_write(time_t now)
abort_writing_to_file(open_file); abort_writing_to_file(open_file);
tor_free(filename); tor_free(filename);
tor_free(statsdir); tor_free(statsdir);
if (str_build) { tor_free(processed_cells_string);
SMARTLIST_FOREACH(str_build, char *, c, tor_free(c)); tor_free(queued_cells_string);
smartlist_free(str_build); tor_free(time_in_queue_string);
}
tor_free(str);
#undef SHARES #undef SHARES
return start_of_buffer_stats_interval + WRITE_STATS_INTERVAL; return start_of_buffer_stats_interval + WRITE_STATS_INTERVAL;
} }