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

Merge branch 'bug23512-v4-029-fixes'

Browse Source
This commit is contained in:
Nick Mathewson 2018-09-20 14:41:44 -04:00
commit 813019cc57
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature/stats/rephist.c
View File

@ -74,6 +74,7 @@
* (The "rephist" name originally stood for "reputation and history". ) * (The "rephist" name originally stood for "reputation and history". )
**/ **/
#define REPHIST_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
@ -106,11 +107,6 @@
static void bw_arrays_init(void); static void bw_arrays_init(void);
static void predicted_ports_alloc(void); static void predicted_ports_alloc(void);
typedef struct bw_array_t bw_array_t;
STATIC uint64_t find_largest_max(bw_array_t *b);
STATIC void commit_max(bw_array_t *b);
STATIC void advance_obs(bw_array_t *b);
/** Total number of bytes currently allocated in fields used by rephist.c. */ /** Total number of bytes currently allocated in fields used by rephist.c. */
uint64_t rephist_total_alloc=0; uint64_t rephist_total_alloc=0;
/** Number of or_history_t objects currently allocated. */ /** Number of or_history_t objects currently allocated. */

9
src/feature/stats/rephist.h
View File

@ -109,8 +109,14 @@ extern uint32_t rephist_total_num;
#ifdef TOR_UNIT_TESTS #ifdef TOR_UNIT_TESTS
extern int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1]; extern int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1];
extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1]; extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1];
extern struct bw_array_t *write_array;
#endif
#ifdef REPHIST_PRIVATE
typedef struct bw_array_t bw_array_t; typedef struct bw_array_t bw_array_t;
extern bw_array_t *write_array; STATIC uint64_t find_largest_max(bw_array_t *b);
STATIC void commit_max(bw_array_t *b);
STATIC void advance_obs(bw_array_t *b);
#endif #endif
/** /**
@ -139,4 +145,3 @@ void rep_hist_prep_published_padding_counts(time_t now);
void rep_hist_padding_count_timers(uint64_t num_timers); void rep_hist_padding_count_timers(uint64_t num_timers);
#endif /* !defined(TOR_REPHIST_H) */ #endif /* !defined(TOR_REPHIST_H) */

10
src/test/test_relay.c
View File

@ -1,14 +1,17 @@
/* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* Copyright (c) 2014-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "core/or/or.h"
#define CIRCUITBUILD_PRIVATE #define CIRCUITBUILD_PRIVATE
#define RELAY_PRIVATE
#define REPHIST_PRIVATE
#include "core/or/or.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/channeltls.h" #include "core/or/channeltls.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#define RELAY_PRIVATE
#include "core/or/relay.h" #include "core/or/relay.h"
#include "feature/stats/rephist.h"
#include "lib/container/order.h"
/* For init/free stuff */ /* For init/free stuff */
#include "core/or/scheduler.h" #include "core/or/scheduler.h"
@ -22,9 +25,6 @@
static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan); static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan);
static void test_relay_append_cell_to_circuit_queue(void *arg); static void test_relay_append_cell_to_circuit_queue(void *arg);
uint64_t find_largest_max(bw_array_t *b);
void commit_max(bw_array_t *b);
void advance_obs(bw_array_t *b);
static or_circuit_t * static or_circuit_t *
new_fake_orcirc(channel_t *nchan, channel_t *pchan) new_fake_orcirc(channel_t *nchan, channel_t *pchan)