WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-28 04:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into auth-load-thread

Browse Source
This commit is contained in:
W.C.A. Wijngaards
2026-08-11 16:23:20 +02:00
parent 2adbbea365 8ee0bca833
commit fd8ebbb19c
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/Changelog
+6
View File
@@ -1,3 +1,9 @@
11 August 2026: Wouter
- Fix #1492 from zacek: Data race in log_init() on
key_created/log_lock when calling ub_ctx_create()
concurrently from multiple threads.
- Fix stat_values.tdir test to have less test failures.
7 August 2026: Wouter
- Fix #1489 from jplesnik: Replace removed Python 2 C API
macros for SWIG 4.5.0 compatibility.
testdata/stat_values.tdir/stat_values.test
Vendored
+6 -1
View File
@@ -107,7 +107,12 @@ check_expected_stats () {
# Check that the rest (unspecified) stats are all 0 (no surprises).
check_rest_stats () {
echo "> Checking rest stats"
grep -F -x -v -f $EXPECTED_STATS_FILE $FILTERED_STATS_FILE > $REST_STATS_FILE
grep -F -x -v -f $EXPECTED_STATS_FILE $FILTERED_STATS_FILE | \
grep -F -v -e "msg.cache.max_collisions" \
-e "rrset.cache.max_collisions" | \
> $REST_STATS_FILE
# It filtered out the 'max_collisions', since at random, a msg
# or rrset cache entry could have a cache hash collision. */
if test $DEBUG -ne 0; then
echo "Rest:"
cat $REST_STATS_FILE
util/log.c
+21
View File
@@ -72,6 +72,14 @@ static ub_thread_key_type logkey;
#ifndef THREADS_DISABLED
/** pthread mutex to protect FILE* */
static lock_basic_type log_lock;
#ifdef HAVE_PTHREAD
/* Guards the one-time initialization below. Without this, two threads
* calling log_init() for the first time concurrently (e.g. via
* ub_ctx_create() from a multi-threaded application) can both observe
* key_created==0 and both call lock_basic_init(&log_lock), a data race
* that reinitializes/corrupts an in-use mutex. */
static pthread_once_t log_lock_once = PTHREAD_ONCE_INIT;
#endif
#endif
/** the identity of this executable/process */
static const char* ident="unbound";
@@ -85,15 +93,28 @@ static int log_time_asc = 0;
/** print time in iso format */
static int log_time_iso = 0;
#if !defined(THREADS_DISABLED) && defined(HAVE_PTHREAD)
static void log_lock_init_once(void)
{
ub_thread_key_create(&logkey, NULL);
lock_basic_init(&log_lock);
key_created = 1;
}
#endif
void
log_init(const char* filename, int use_syslog, const char* chrootdir)
{
FILE *f;
#if !defined(THREADS_DISABLED) && defined(HAVE_PTHREAD)
(void)pthread_once(&log_lock_once, log_lock_init_once);
#else
if(!key_created) {
key_created = 1;
ub_thread_key_create(&logkey, NULL);
lock_basic_init(&log_lock);
}
#endif
lock_basic_lock(&log_lock);
if(logfile
#if defined(HAVE_SYSLOG_H) || defined(UB_ON_WINDOWS)