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

- Fix lock type for memory purify log lock deletion.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2019-12-04 09:44:31 +01:00
parent 8f79119826
commit 216747bb17
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/unbound.c
View file

@ -787,7 +787,7 @@ main(int argc, char* argv[])
log_init(NULL, 0, NULL); /* close logfile */ log_init(NULL, 0, NULL); /* close logfile */
#ifndef unbound_testbound #ifndef unbound_testbound
if(log_get_lock()) { if(log_get_lock()) {
lock_quick_destroy((lock_quick_type*)log_get_lock()); lock_basic_destroy((lock_basic_type*)log_get_lock());
} }
#endif #endif
return 0; return 0;

3
doc/Changelog
View file

@ -1,3 +1,6 @@
4 December 2019: Wouter
- Fix lock type for memory purify log lock deletion.
3 December 2019: Wouter 3 December 2019: Wouter
- Merge pull request #124 from rmetrich: Changed log lock - Merge pull request #124 from rmetrich: Changed log lock
from 'quick' to 'basic' because this is an I/O lock. from 'quick' to 'basic' because this is an I/O lock.

4
testcode/testbound.c
View file

@ -358,7 +358,7 @@ main(int argc, char* argv[])
testbound_selftest(); testbound_selftest();
checklock_stop(); checklock_stop();
if(log_get_lock()) { if(log_get_lock()) {
lock_quick_destroy((lock_quick_type*)log_get_lock()); lock_basic_destroy((lock_basic_type*)log_get_lock());
} }
exit(0); exit(0);
case '1': case '1':
@ -464,7 +464,7 @@ main(int argc, char* argv[])
if(res == 0) { if(res == 0) {
log_info("Testbound Exit Success\n"); log_info("Testbound Exit Success\n");
if(log_get_lock()) { if(log_get_lock()) {
lock_quick_destroy((lock_quick_type*)log_get_lock()); lock_basic_destroy((lock_basic_type*)log_get_lock());
} }
#ifdef HAVE_PTHREAD #ifdef HAVE_PTHREAD
/* dlopen frees its thread state (dlopen of gost engine) */ /* dlopen frees its thread state (dlopen of gost engine) */

2
testcode/unitmain.c
View file

@ -905,7 +905,7 @@ main(int argc, char* argv[])
ecs_test(); ecs_test();
#endif /* CLIENT_SUBNET */ #endif /* CLIENT_SUBNET */
if(log_get_lock()) { if(log_get_lock()) {
lock_quick_destroy((lock_quick_type*)log_get_lock()); lock_basic_destroy((lock_basic_type*)log_get_lock());
} }
checklock_stop(); checklock_stop();
printf("%d checks ok.\n", testcount); printf("%d checks ok.\n", testcount);