Merge branch 'atomic_counters'

This commit is contained in:
Nick Mathewson 2017-04-25 10:46:23 -04:00
commit 232c9e14a8
14 changed files with 109 additions and 10 deletions

View File

@ -352,3 +352,48 @@ alert_sockets_close(alert_sockets_t *socks)
socks->read_fd = socks->write_fd = -1;
}
/*
* XXXX We might be smart to move to compiler intrinsics or real atomic
* XXXX operations at some point. But not yet.
*
*/
/** Initialize a new atomic counter with the value 0 */
void
atomic_counter_init(atomic_counter_t *counter)
{
tor_mutex_init_nonrecursive(&counter->mutex);
counter->val = 0;
}
/** Clean up all resources held by an atomic counter. */
void
atomic_counter_destroy(atomic_counter_t *counter)
{
tor_mutex_uninit(&counter->mutex);
memset(counter, 0, sizeof(*counter));
}
/** Add a value to an atomic counter. */
void
atomic_counter_add(atomic_counter_t *counter, size_t add)
{
tor_mutex_acquire(&counter->mutex);
counter->val += add;
tor_mutex_release(&counter->mutex);
}
/** Subtract a value from an atomic counter. */
void
atomic_counter_sub(atomic_counter_t *counter, size_t sub)
{
// this relies on unsigned overflow, but that's fine.
atomic_counter_add(counter, -sub);
}
/** Return the current value of an atomic counter */
size_t
atomic_counter_get(atomic_counter_t *counter)
{
size_t val;
tor_mutex_acquire(&counter->mutex);
val = counter->val;
tor_mutex_release(&counter->mutex);
return val;
}

View File

@ -147,5 +147,19 @@ void *tor_threadlocal_get(tor_threadlocal_t *threadlocal);
*/
void tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value);
/**
* Atomic counter type; holds a size_t value.
*/
typedef struct atomic_counter_t {
tor_mutex_t mutex;
size_t val;
} atomic_counter_t;
void atomic_counter_init(atomic_counter_t *counter);
void atomic_counter_destroy(atomic_counter_t *counter);
void atomic_counter_add(atomic_counter_t *counter, size_t add);
void atomic_counter_sub(atomic_counter_t *counter, size_t sub);
size_t atomic_counter_get(atomic_counter_t *counter);
#endif

View File

@ -375,3 +375,11 @@ tor_compress_state_size(const tor_compress_state_t *state)
return 0;
}
/** Initialize all compression modules. */
void
tor_compress_init(void)
{
tor_zlib_init();
tor_lzma_init();
tor_zstd_init();
}

View File

@ -79,5 +79,7 @@ void tor_compress_free(tor_compress_state_t *state);
size_t tor_compress_state_size(const tor_compress_state_t *state);
void tor_compress_init(void);
#endif // TOR_COMPRESS_H.

View File

@ -23,7 +23,7 @@
#endif
/** Total number of bytes allocated for LZMA state. */
static size_t total_lzma_allocation = 0;
static atomic_counter_t total_lzma_allocation;
#ifdef HAVE_LZMA
/** Given <b>level</b> return the memory level. */
@ -465,6 +465,7 @@ tor_lzma_compress_new(int compress,
}
}
atomic_counter_add(&total_lzma_allocation, result->allocation);
return result;
err:
@ -579,7 +580,7 @@ tor_lzma_compress_free(tor_lzma_compress_state_t *state)
if (state == NULL)
return;
total_lzma_allocation -= state->allocation;
atomic_counter_sub(&total_lzma_allocation, state->allocation);
#ifdef HAVE_LZMA
lzma_end(&state->stream);
@ -600,6 +601,12 @@ tor_lzma_compress_state_size(const tor_lzma_compress_state_t *state)
size_t
tor_lzma_get_total_allocation(void)
{
return total_lzma_allocation;
return atomic_counter_get(&total_lzma_allocation);
}
/** Initialize the lzma module */
void
tor_lzma_init(void)
{
atomic_counter_init(&total_lzma_allocation);
}

View File

@ -47,5 +47,7 @@ size_t tor_lzma_compress_state_size(const tor_lzma_compress_state_t *state);
size_t tor_lzma_get_total_allocation(void);
void tor_lzma_init(void);
#endif // TOR_COMPRESS_LZMA_H.

View File

@ -48,7 +48,7 @@ static size_t tor_zlib_state_size_precalc(int inflate,
int windowbits, int memlevel);
/** Total number of bytes allocated for zlib state */
static size_t total_zlib_allocation = 0;
static atomic_counter_t total_zlib_allocation;
/** Given <b>level</b> return the memory level. */
static int
@ -437,7 +437,7 @@ tor_zlib_compress_new(int compress_,
}
out->allocation = tor_zlib_state_size_precalc(!compress_, bits, memlevel);
total_zlib_allocation += out->allocation;
atomic_counter_add(&total_zlib_allocation, out->allocation);
return out;
@ -519,7 +519,7 @@ tor_zlib_compress_free(tor_zlib_compress_state_t *state)
if (state == NULL)
return;
total_zlib_allocation -= state->allocation;
atomic_counter_sub(&total_zlib_allocation, state->allocation);
if (state->compress)
deflateEnd(&state->stream);
@ -541,6 +541,12 @@ tor_zlib_compress_state_size(const tor_zlib_compress_state_t *state)
size_t
tor_zlib_get_total_allocation(void)
{
return total_zlib_allocation;
return atomic_counter_get(&total_zlib_allocation);
}
/** Set up global state for the zlib module */
void
tor_zlib_init(void)
{
atomic_counter_init(&total_zlib_allocation);
}

View File

@ -47,5 +47,7 @@ size_t tor_zlib_compress_state_size(const tor_zlib_compress_state_t *state);
size_t tor_zlib_get_total_allocation(void);
void tor_zlib_init(void);
#endif // TOR_COMPRESS_ZLIB_H.

View File

@ -24,7 +24,7 @@
#endif
/** Total number of bytes allocated for Zstandard state. */
static size_t total_zstd_allocation = 0;
static atomic_counter_t total_zstd_allocation;
#ifdef HAVE_ZSTD
/** Given <b>level</b> return the memory level. */
@ -446,6 +446,7 @@ tor_zstd_compress_new(int compress,
}
}
atomic_counter_add(&total_zstd_allocation, result->allocation);
return result;
err:
@ -578,7 +579,7 @@ tor_zstd_compress_free(tor_zstd_compress_state_t *state)
if (state == NULL)
return;
total_zstd_allocation -= state->allocation;
atomic_counter_sub(&total_zstd_allocation, state->allocation);
#ifdef HAVE_ZSTD
if (state->compress) {
@ -604,6 +605,12 @@ tor_zstd_compress_state_size(const tor_zstd_compress_state_t *state)
size_t
tor_zstd_get_total_allocation(void)
{
return total_zstd_allocation;
return atomic_counter_get(&total_zstd_allocation);
}
/** Initialize the zstd module */
void
tor_zstd_init(void)
{
atomic_counter_init(&total_zstd_allocation);
}

View File

@ -47,5 +47,7 @@ size_t tor_zstd_compress_state_size(const tor_zstd_compress_state_t *state);
size_t tor_zstd_get_total_allocation(void);
void tor_zstd_init(void);
#endif // TOR_COMPRESS_ZSTD_H.

View File

@ -3616,6 +3616,7 @@ tor_main(int argc, char *argv[])
update_approx_time(time(NULL));
tor_threads_init();
tor_compress_init();
init_logging(0);
monotime_init();
#ifdef USE_DMALLOC

View File

@ -674,6 +674,7 @@ main(int argc, const char **argv)
or_options_t *options;
tor_threads_init();
tor_compress_init();
if (argc == 4 && !strcmp(argv[1], "diff")) {
init_logging(1);

View File

@ -96,6 +96,7 @@ static void
global_init(void)
{
tor_threads_init();
tor_compress_init();
{
struct sipkey sipkey = { 1337, 7331 };
siphash_set_global_key(&sipkey);

View File

@ -245,6 +245,7 @@ main(int c, const char **v)
update_approx_time(time(NULL));
options = options_new();
tor_threads_init();
tor_compress_init();
network_init();