torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

r12458@catbus: nickm | 2007-04-19 15:52:23 -0400

Browse Source 
Fix a bug in displaying memory pool usage.  Also dump cell allocation, and track padded_cell_ts as they are allocated and freed, to make sure we are not leaking cells.


svn:r9992
This commit is contained in:
Nick Mathewson
2007-04-19 19:52:30 +00:00
parent 7392464b88
commit 6ee5bef092
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/mempool.c
+2 -2
View File
@@ -517,7 +517,7 @@ mp_pool_log_status(mp_pool_t *pool, int severity)
" bytes in %d partially full chunks",
U64_PRINTF_ARG(bu), U64_PRINTF_ARG(ba), n_used);
bytes_used += bu;
bytes_allocated += bu;
bytes_allocated += ba;
bu = ba = 0;
for (chunk = pool->full_chunks; chunk; chunk = chunk->next) {
++n_full;
@@ -528,7 +528,7 @@ mp_pool_log_status(mp_pool_t *pool, int severity)
" bytes in %d full chunks",
U64_PRINTF_ARG(bu), U64_PRINTF_ARG(ba), n_full);
bytes_used += bu;
bytes_allocated += bu;
bytes_allocated += ba;
log_fn(severity, LD_MM, "Total: "U64_FORMAT"/"U64_FORMAT" bytes allocated "
"for cell pools are full.",
src/or/relay.c
+18
View File
@@ -1478,6 +1478,9 @@ circuit_consider_sending_sendme(circuit_t *circ, crypt_path_t *layer_hint)
#define assert_active_circuits_ok_paranoid(conn)
#endif
/** DOCDOC */
static int total_cells_allocated = 0;
#ifdef ENABLE_CELL_POOL
static mp_pool_t *cell_pool = NULL;
/** Allocate structures to hold cells. */
@@ -1509,6 +1512,7 @@ clean_cell_pool(void)
static INLINE void
packed_cell_free(packed_cell_t *cell)
{
--total_cells_allocated;
mp_pool_release(cell);
}
@@ -1516,11 +1520,23 @@ packed_cell_free(packed_cell_t *cell)
static INLINE packed_cell_t *
packed_cell_alloc(void)
{
++total_cells_allocated;
return mp_pool_get(cell_pool);
}
void
dump_cell_pool_usage(int severity)
{
circuit_t *c;
int n_circs = 0;
int n_cells = 0;
for (c = _circuit_get_global_list(); c; c = c->next) {
n_cells += c->n_conn_cells.n;
if (!CIRCUIT_IS_ORIGIN(c))
n_cells += TO_OR_CIRCUIT(c)->p_conn_cells.n;
++n_circs;
}
log(severity, LD_MM, "%d cells allocated on %d circuits. %d cells leaked.",
n_cells, n_circs, total_cells_allocated - n_cells);
mp_pool_log_status(cell_pool, severity);
}
#else
@@ -1544,12 +1560,14 @@ clean_cell_pool(void)
static INLINE void
packed_cell_free(packed_cell_t *cell)
{
--total_cells_allocated;
tor_free(cell);
}
static INLINE packed_cell_t *
packed_cell_alloc(void)
{
++total_cells_allocated;
return tor_malloc(sizeof(packed_cell_t));
}
void