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

Merge remote-tracking branch 'asn/heartbeat'

Browse Source
This commit is contained in:
Nick Mathewson 2011-04-19 12:08:28 -04:00
commit 750b5119c0
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/main.c
View File

@ -1925,15 +1925,6 @@ get_uptime(void)
return stats_n_seconds_working; return stats_n_seconds_working;
} }
/** Fills <b>n_read_in</b> with total bytes read and <b>n_written_out</b>
with total bytes written */
void
get_traffic_stats(uint64_t *n_read_in, uint64_t *n_written_out)
{
*n_read_in = stats_n_bytes_read;
*n_written_out = stats_n_bytes_written;
}
extern uint64_t rephist_total_alloc; extern uint64_t rephist_total_alloc;
extern uint32_t rephist_total_num; extern uint32_t rephist_total_num;

1
src/or/main.h
View File

@ -52,7 +52,6 @@ void ip_address_changed(int at_interface);
void dns_servers_relaunch_checks(void); void dns_servers_relaunch_checks(void);
long get_uptime(void); long get_uptime(void);
void get_traffic_stats(uint64_t *in, uint64_t *out);
void control_signal_act(int the_signal); void control_signal_act(int the_signal);
void handle_signals(int is_parent); void handle_signals(int is_parent);

6
src/or/status.c
View File

@ -78,7 +78,6 @@ bytes_to_usage(uint64_t bytes)
int int
log_heartbeat(time_t now) log_heartbeat(time_t now)
{ {
uint64_t in,out;
char *bw_sent = NULL; char *bw_sent = NULL;
char *bw_rcvd = NULL; char *bw_rcvd = NULL;
char *uptime = NULL; char *uptime = NULL;
@ -99,10 +98,9 @@ log_heartbeat(time_t now)
"in the cached consensus."); "in the cached consensus.");
} }
get_traffic_stats(&in, &out);
uptime = secs_to_uptime(get_uptime()); uptime = secs_to_uptime(get_uptime());
bw_sent = bytes_to_usage(out); bw_rcvd = bytes_to_usage(get_bytes_read());
bw_rcvd = bytes_to_usage(in); bw_sent = bytes_to_usage(get_bytes_written());
log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d " log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d "
"circuits open. I've pushed %s and received %s.", "circuits open. I've pushed %s and received %s.",