mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'check_log_mutex_uncherrypicked'

Browse source
This commit is contained in:
Nick Mathewson 2016-02-11 13:41:31 -05:00
commit fed8c5199a
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/assert_event_base Normal file
View file

@ -0,0 +1,5 @@
o Minor features (robustness):
- Exit immediately with an error message if the code attempts to
use libevent without having initialized it. This should resolve
some frequently-made mistakes in our unit tests. Closes ticket
18241.

1
src/common/compat_libevent.c
View file

@ -247,6 +247,7 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg)
MOCK_IMPL(struct event_base *, MOCK_IMPL(struct event_base *,
tor_libevent_get_base, (void)) tor_libevent_get_base, (void))
{ {
tor_assert(the_event_base != NULL);
return the_event_base; return the_event_base;
} }

13
src/common/log.c
View file

@ -149,10 +149,14 @@ static int pretty_fn_has_parens = 0;
/** Lock the log_mutex to prevent others from changing the logfile_t list */ /** Lock the log_mutex to prevent others from changing the logfile_t list */
#define LOCK_LOGS() STMT_BEGIN \ #define LOCK_LOGS() STMT_BEGIN \
tor_assert(log_mutex_initialized); \
tor_mutex_acquire(&log_mutex); \ tor_mutex_acquire(&log_mutex); \
STMT_END STMT_END
/** Unlock the log_mutex */ /** Unlock the log_mutex */
#define UNLOCK_LOGS() STMT_BEGIN tor_mutex_release(&log_mutex); STMT_END #define UNLOCK_LOGS() STMT_BEGIN \
tor_assert(log_mutex_initialized); \
tor_mutex_release(&log_mutex); \
STMT_END
/** What's the lowest log level anybody cares about? Checking this lets us /** What's the lowest log level anybody cares about? Checking this lets us
* bail out early from log_debug if we aren't debugging. */ * bail out early from log_debug if we aren't debugging. */
@ -482,9 +486,12 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname,
/* check that severity is sane. Overrunning the masks array leads to /* check that severity is sane. Overrunning the masks array leads to
* interesting and hard to diagnose effects */ * interesting and hard to diagnose effects */
assert(severity >= LOG_ERR && severity <= LOG_DEBUG); assert(severity >= LOG_ERR && severity <= LOG_DEBUG);
/* check that we've initialised the log mutex before we try to lock it */
assert(log_mutex_initialized);
LOCK_LOGS(); LOCK_LOGS();
if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages)) if ((! (domain & LD_NOCB)) && pending_cb_messages
&& smartlist_len(pending_cb_messages))
flush_pending_log_callbacks(); flush_pending_log_callbacks();
if (queue_startup_messages && if (queue_startup_messages &&
@ -939,7 +946,7 @@ flush_pending_log_callbacks(void)
smartlist_t *messages, *messages_tmp; smartlist_t *messages, *messages_tmp;
LOCK_LOGS(); LOCK_LOGS();
if (0 == smartlist_len(pending_cb_messages)) { if (!pending_cb_messages || 0 == smartlist_len(pending_cb_messages)) {
UNLOCK_LOGS(); UNLOCK_LOGS();
return; return;
} }

4
src/test/testing_common.c
View file

@ -228,6 +228,9 @@ main(int c, const char **v)
int loglevel = LOG_ERR; int loglevel = LOG_ERR;
int accel_crypto = 0; int accel_crypto = 0;
/* We must initialise logs before we call tor_assert() */
init_logging(1);
#ifdef USE_DMALLOC #ifdef USE_DMALLOC
{ {
int r = CRYPTO_set_mem_ex_functions(tor_malloc_, tor_realloc_, tor_free_); int r = CRYPTO_set_mem_ex_functions(tor_malloc_, tor_realloc_, tor_free_);
@ -244,7 +247,6 @@ main(int c, const char **v)
tor_libevent_initialize(&cfg); tor_libevent_initialize(&cfg);
control_initialize_event_queue(); control_initialize_event_queue();
init_logging(1);
configure_backtrace_handler(get_version()); configure_backtrace_handler(get_version());
for (i_out = i = 1; i < c; ++i) { for (i_out = i = 1; i < c; ++i) {