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

Start converting circuitlist to smartlist.

Browse Source
This commit is contained in:
Nick Mathewson 2014-08-15 15:42:14 -04:00
parent be231b0db1
commit db2af2abb0
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/circuitlist.c
View File

@ -38,8 +38,7 @@
/********* START VARIABLES **********/ /********* START VARIABLES **********/
/** A global list of all circuits at this hop. */ /** A global list of all circuits at this hop. */
struct global_circuitlist_s global_circuitlist = static smartlist_t *global_circuitlist = NULL;
TOR_LIST_HEAD_INITIALIZER(global_circuitlist);
/** A list of all the circuits in CIRCUIT_STATE_CHAN_WAIT. */ /** A list of all the circuits in CIRCUIT_STATE_CHAN_WAIT. */
static smartlist_t *circuits_pending_chans = NULL; static smartlist_t *circuits_pending_chans = NULL;
@ -458,10 +457,12 @@ circuit_close_all_marked(void)
} }
/** Return the head of the global linked list of circuits. */ /** Return the head of the global linked list of circuits. */
MOCK_IMPL(struct global_circuitlist_s *, MOCK_IMPL(smartlist_t *,
circuit_get_global_list,(void)) circuit_get_global_list,(void))
{ {
return &global_circuitlist; if (NULL == global_circuitlist)
global_circuitlist = smartlist_new();
return global_circuitlist;
} }
/** Function to make circ-\>state human-readable */ /** Function to make circ-\>state human-readable */

4
src/or/circuitlist.h
View File

@ -14,9 +14,7 @@
#include "testsupport.h" #include "testsupport.h"
TOR_LIST_HEAD(global_circuitlist_s, circuit_t); MOCK_DECL(smartlist_t *, circuit_get_global_list, (void));
MOCK_DECL(struct global_circuitlist_s*, circuit_get_global_list, (void));
const char *circuit_state_to_string(int state); const char *circuit_state_to_string(int state);
const char *circuit_purpose_to_controller_string(uint8_t purpose); const char *circuit_purpose_to_controller_string(uint8_t purpose);
const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose); const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose);

4
src/or/or.h
View File

@ -2864,8 +2864,8 @@ typedef struct circuit_t {
/** Unique ID for measuring tunneled network status requests. */ /** Unique ID for measuring tunneled network status requests. */
uint64_t dirreq_id; uint64_t dirreq_id;
/** Next circuit in linked list of all circuits (global_circuitlist). */ /** Index in smartlist of all circuits (global_circuitlist). */
TOR_LIST_ENTRY(circuit_t) head; int global_circuitlist_idx;
/** Next circuit in the doubly-linked ring of circuits waiting to add /** Next circuit in the doubly-linked ring of circuits waiting to add
* cells to n_conn. NULL if we have no cells pending, or if we're not * cells to n_conn. NULL if we have no cells pending, or if we're not