upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add checklock feature verbose_locking to trace locks and unlocks.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2024-04-22 13:42:35 +02:00
parent 0dbcb45d28
commit 5994fb3db5
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
22 April 2024: Wouter
- Add checklock feature verbose_locking to trace locks and unlocks.
15 April 2024: Wouter 15 April 2024: Wouter
- Fix #1048: Update ax_pkg_swig.m4 and ax_pthread.m4. - Fix #1048: Update ax_pkg_swig.m4 and ax_pthread.m4.
- Fix configure, autoconf for #1048. - Fix configure, autoconf for #1048.

24
testcode/checklocks.c
View file

@ -68,6 +68,17 @@ static struct thr_check* thread_infos[THRDEBUG_MAX_THREADS];
int check_locking_order = 1; int check_locking_order = 1;
/** the pid of this runset, reasonably unique. */ /** the pid of this runset, reasonably unique. */
static pid_t check_lock_pid; static pid_t check_lock_pid;
/**
* Should checklocks print a trace of the lock and unlock calls.
* It uses fprintf for that because the log function uses a lock and that
* would loop otherwise.
*/
static int verbose_locking = 0;
/**
* Assume lock 0 0 (create_thread, create_instance), is the log lock and
* do not print for that. Otherwise the output is full of log lock accesses.
*/
static int verbose_locking_not_loglock = 1;
/** print all possible debug info on the state of the system */ /** print all possible debug info on the state of the system */
static void total_debug_info(void); static void total_debug_info(void);
@ -508,6 +519,9 @@ checklock_rdlock(enum check_lock_type type, struct checked_lock* lock,
if(key_deleted) if(key_deleted)
return; return;
if(verbose_locking && !(verbose_locking_not_loglock &&
lock->create_thread == 0 && lock->create_instance == 0))
fprintf(stderr, "checklock_rdlock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
log_assert(type == check_lock_rwlock); log_assert(type == check_lock_rwlock);
checklock_lockit(type, lock, func, file, line, checklock_lockit(type, lock, func, file, line,
try_rd, timed_rd, &lock->u.rwlock, 0, 0); try_rd, timed_rd, &lock->u.rwlock, 0, 0);
@ -528,6 +542,9 @@ checklock_wrlock(enum check_lock_type type, struct checked_lock* lock,
if(key_deleted) if(key_deleted)
return; return;
log_assert(type == check_lock_rwlock); log_assert(type == check_lock_rwlock);
if(verbose_locking && !(verbose_locking_not_loglock &&
lock->create_thread == 0 && lock->create_instance == 0))
fprintf(stderr, "checklock_wrlock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
checklock_lockit(type, lock, func, file, line, checklock_lockit(type, lock, func, file, line,
try_wr, timed_wr, &lock->u.rwlock, 0, 1); try_wr, timed_wr, &lock->u.rwlock, 0, 1);
} }
@ -565,6 +582,9 @@ checklock_lock(enum check_lock_type type, struct checked_lock* lock,
if(key_deleted) if(key_deleted)
return; return;
log_assert(type != check_lock_rwlock); log_assert(type != check_lock_rwlock);
if(verbose_locking && !(verbose_locking_not_loglock &&
lock->create_thread == 0 && lock->create_instance == 0))
fprintf(stderr, "checklock_lock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
switch(type) { switch(type) {
case check_lock_mutex: case check_lock_mutex:
checklock_lockit(type, lock, func, file, line, checklock_lockit(type, lock, func, file, line,
@ -602,6 +622,10 @@ checklock_unlock(enum check_lock_type type, struct checked_lock* lock,
if(lock->hold_count <= 0) if(lock->hold_count <= 0)
lock_error(lock, func, file, line, "too many unlocks"); lock_error(lock, func, file, line, "too many unlocks");
if(verbose_locking && !(verbose_locking_not_loglock &&
lock->create_thread == 0 && lock->create_instance == 0))
fprintf(stderr, "checklock_unlock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
/* store this point as last touched by */ /* store this point as last touched by */
lock->holder = thr; lock->holder = thr;
lock->hold_count --; lock->hold_count --;