diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2009-08-14 14:52:39 +0200 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2009-08-17 13:30:09 +0200 |
| commit | d97e95cb6242b94002854055a08c3190e731139b (patch) | |
| tree | 743a9a187b83981a1b583be332c78e35c7ab3715 /src/or/or.h | |
| parent | ab7729f4724efbfac33c069f488e74c8ccc058f1 (diff) | |
| download | tor-d97e95cb6242b94002854055a08c3190e731139b.tar.gz tor-d97e95cb6242b94002854055a08c3190e731139b.zip | |
Remove ./configure option for cell statistics.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/or/or.h b/src/or/or.h index 5fed1ccf4d..ff2e65c036 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -20,9 +20,6 @@ #ifndef INSTRUMENT_DOWNLOADS #define INSTRUMENT_DOWNLOADS 1 #endif -#ifndef ENABLE_BUFFER_STATS -#define ENABLE_BUFFER_STATS 1 -#endif #endif #ifdef MS_WINDOWS @@ -838,9 +835,7 @@ typedef struct var_cell_t { typedef struct packed_cell_t { struct packed_cell_t *next; /**< Next cell queued on this circuit. */ char body[CELL_NETWORK_SIZE]; /**< Cell as packed for network. */ -#ifdef ENABLE_BUFFER_STATS struct timeval packed_timeval; /**< When was this cell packed? */ -#endif } packed_cell_t; /** A queue of cells on a circuit, waiting to be added to the @@ -849,6 +844,7 @@ typedef struct cell_queue_t { packed_cell_t *head; /**< The first cell, or NULL if the queue is empty. */ packed_cell_t *tail; /**< The last cell, or NULL if the queue is empty. */ int n; /**< The number of cells in the queue. */ + smartlist_t *insertion_times; } cell_queue_t; /** Beginning of a RELAY cell payload. */ @@ -2086,7 +2082,6 @@ typedef struct or_circuit_t { /** True iff this circuit was made with a CREATE_FAST cell. */ unsigned int is_first_hop : 1; -#ifdef ENABLE_BUFFER_STATS /** Number of cells that were removed from circuit queue; reset every * time when writing buffer stats to disk. */ uint32_t processed_cells; @@ -2095,7 +2090,6 @@ typedef struct or_circuit_t { * exit-ward queues of this circuit; reset every time when writing * buffer stats to disk. */ uint64_t total_cell_waiting_time; -#endif } or_circuit_t; /** Convert a circuit subtype to a circuit_t.*/ @@ -4121,11 +4115,9 @@ void hs_usage_note_fetch_successful(const char *service_id, time_t now); void hs_usage_write_statistics_to_file(time_t now); void hs_usage_free_all(void); -#ifdef ENABLE_BUFFER_STATS #define DUMP_BUFFER_STATS_INTERVAL (24*60*60) void add_circ_to_buffer_stats(circuit_t *circ, time_t end_of_interval); void dump_buffer_stats(void); -#endif /********************************* rendclient.c ***************************/ |