diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index ca36291881..68116749dd 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c index 25804892eb..9742590919 100644 --- a/bin/named/fuzz.c +++ b/bin/named/fuzz.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index b693bc3789..9f06b54553 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index 4978ab4ed1..3ccee9a520 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -15,7 +15,6 @@ libisc_la_HEADERS = \ include/isc/base64.h \ include/isc/buffer.h \ include/isc/commandline.h \ - include/isc/condition.h \ include/isc/counter.h \ include/isc/crypto.h \ include/isc/dir.h \ @@ -51,7 +50,6 @@ libisc_la_HEADERS = \ include/isc/mem.h \ include/isc/meminfo.h \ include/isc/mutex.h \ - include/isc/mutexblock.h \ include/isc/net.h \ include/isc/netaddr.h \ include/isc/netmgr.h \ @@ -122,7 +120,6 @@ libisc_la_SOURCES = \ base32.c \ base64.c \ commandline.c \ - condition.c \ counter.c \ crypto.c \ dir.c \ @@ -159,7 +156,6 @@ libisc_la_SOURCES = \ meminfo.c \ mutex.c \ mutex_p.h \ - mutexblock.c \ net.c \ netaddr.c \ netscope.c \ diff --git a/lib/isc/async.c b/lib/isc/async.c index 351b213a14..acb5585e09 100644 --- a/lib/isc/async.c +++ b/lib/isc/async.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/condition.c b/lib/isc/condition.c deleted file mode 100644 index 722a599491..0000000000 --- a/lib/isc/condition.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file */ - -#include - -#include -#include -#include -#include -#include - -isc_result_t -isc__condition_waituntil(pthread_cond_t *c, pthread_mutex_t *m, isc_time_t *t) { - int presult; - isc_result_t result; - struct timespec ts; - - REQUIRE(c != NULL && m != NULL && t != NULL); - - /* - * POSIX defines a timespec's tv_sec as time_t. - */ - result = isc_time_secondsastimet(t, &ts.tv_sec); - - /* - * If we have a range error ts.tv_sec is most probably a signed - * 32 bit value. Set ts.tv_sec to INT_MAX. This is a kludge. - */ - if (result == ISC_R_RANGE) { - ts.tv_sec = INT_MAX; - } else if (result != ISC_R_SUCCESS) { - return result; - } - - /*! - * POSIX defines a timespec's tv_nsec as long. isc_time_nanoseconds - * ensures its return value is < 1 billion, which will fit in a long. - */ - ts.tv_nsec = (long)isc_time_nanoseconds(t); - - do { - presult = pthread_cond_timedwait(c, m, &ts); - if (presult == 0) { - return ISC_R_SUCCESS; - } - if (presult == ETIMEDOUT) { - return ISC_R_TIMEDOUT; - } - } while (presult == EINTR); - - UNEXPECTED_SYSERROR(presult, "pthread_cond_timedwait()"); - return ISC_R_UNEXPECTED; -} diff --git a/lib/isc/helper.c b/lib/isc/helper.c index f5a83cc833..1644c244ef 100644 --- a/lib/isc/helper.c +++ b/lib/isc/helper.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/include/isc/condition.h b/lib/isc/include/isc/condition.h deleted file mode 100644 index 27f2b80c73..0000000000 --- a/lib/isc/include/isc/condition.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#pragma once - -/*! \file */ - -#include -#include - -#include -#include -#include -#include -#include -#include - -/* - * We use macros instead of static inline functions so that the exact code - * location can be reported when PTHREADS_RUNTIME_CHECK() fails or when mutrace - * reports lock contention. - */ - -#ifdef ISC_TRACK_PTHREADS_OBJECTS - -typedef pthread_cond_t *isc_condition_t; - -#define isc_condition_init(cp) \ - { \ - *cp = malloc(sizeof(**cp)); \ - isc__condition_init(*cp); \ - } -#define isc_condition_wait(cp, mp) isc__condition_wait(*cp, *mp) -#define isc_condition_waituntil(cp, mp, t) isc__condition_waituntil(*cp, *mp, t) -#define isc_condition_signal(cp) isc__condition_signal(*cp) -#define isc_condition_broadcast(cp) isc__condition_broadcast(*cp) -#define isc_condition_destroy(cp) \ - { \ - isc__condition_destroy(*cp); \ - free(*cp); \ - } - -#else /* ISC_TRACK_PTHREADS_OBJECTS */ - -typedef pthread_cond_t isc_condition_t; - -#define isc_condition_init(cond) isc__condition_init(cond) -#define isc_condition_wait(cp, mp) isc__condition_wait(cp, mp) -#define isc_condition_waituntil(cp, mp, t) isc__condition_waituntil(cp, mp, t) -#define isc_condition_signal(cp) isc__condition_signal(cp) -#define isc_condition_broadcast(cp) isc__condition_broadcast(cp) -#define isc_condition_destroy(cp) isc__condition_destroy(cp) - -#endif /* ISC_TRACK_PTHREADS_OBJECTS */ - -#define isc__condition_init(cond) \ - { \ - int _ret = pthread_cond_init(cond, NULL); \ - PTHREADS_RUNTIME_CHECK(pthread_cond_init, _ret); \ - } - -#define isc__condition_wait(cp, mp) \ - { \ - int _ret = pthread_cond_wait(cp, mp); \ - PTHREADS_RUNTIME_CHECK(pthread_cond_wait, _ret); \ - } - -#define isc__condition_signal(cp) \ - { \ - int _ret = pthread_cond_signal(cp); \ - PTHREADS_RUNTIME_CHECK(pthread_cond_signal, _ret); \ - } - -#define isc__condition_broadcast(cp) \ - { \ - int _ret = pthread_cond_broadcast(cp); \ - PTHREADS_RUNTIME_CHECK(pthread_cond_broadcast, _ret); \ - } - -#define isc__condition_destroy(cp) \ - { \ - int _ret = pthread_cond_destroy(cp); \ - PTHREADS_RUNTIME_CHECK(pthread_cond_destroy, _ret); \ - } - -isc_result_t -isc__condition_waituntil(pthread_cond_t *, pthread_mutex_t *, isc_time_t *); diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h deleted file mode 100644 index 7251efe0e5..0000000000 --- a/lib/isc/include/isc/mutexblock.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#pragma once - -/*! \file isc/mutexblock.h */ - -#include -#include - -void -isc_mutexblock_init(isc_mutex_t *block, unsigned int count); -/*%< - * Initialize a block of locks. If an error occurs all initialized locks - * will be destroyed, if possible. - * - * Requires: - * - *\li block != NULL - * - *\li count > 0 - * - */ - -void -isc_mutexblock_destroy(isc_mutex_t *block, unsigned int count); -/*%< - * Destroy a block of locks. - * - * Requires: - * - *\li block != NULL - * - *\li count > 0 - * - *\li Each lock in the block be initialized via isc_mutex_init() or - * the whole block was initialized via isc_mutex_initblock(). - * - */ diff --git a/lib/isc/job.c b/lib/isc/job.c index 78bbb03d09..d715861ca4 100644 --- a/lib/isc/job.c +++ b/lib/isc/job.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/loop.c b/lib/isc/loop.c index d04c4cc4ad..c1f2b540b5 100644 --- a/lib/isc/loop.c +++ b/lib/isc/loop.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c deleted file mode 100644 index 56a29858ce..0000000000 --- a/lib/isc/mutexblock.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file */ - -#include -#include - -void -isc_mutexblock_init(isc_mutex_t *block, unsigned int count) { - unsigned int i; - - for (i = 0; i < count; i++) { - isc_mutex_init(&block[i]); - } -} - -void -isc_mutexblock_destroy(isc_mutex_t *block, unsigned int count) { - unsigned int i; - - for (i = 0; i < count; i++) { - isc_mutex_destroy(&block[i]); - } -} diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index e6c6e82830..c42348fcce 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index b88f2d9fb7..55aaa011c0 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index 4f98b50862..76dd0c8a78 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/netmgr/tlsstream.c b/lib/isc/netmgr/tlsstream.c index 8d5fe1fd37..b928842e29 100644 --- a/lib/isc/netmgr/tlsstream.c +++ b/lib/isc/netmgr/tlsstream.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c index ae2fea4ae1..e8106c1b13 100644 --- a/lib/isc/netmgr/udp.c +++ b/lib/isc/netmgr/udp.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/timer.c b/lib/isc/timer.c index bfd3377f4c..504e49a166 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/tls.c b/lib/isc/tls.c index 0a646837bb..a52863e23a 100644 --- a/lib/isc/tls.c +++ b/lib/isc/tls.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/doh_test.c b/tests/isc/doh_test.c index 9ccc11f777..5b98989bef 100644 --- a/tests/isc/doh_test.c +++ b/tests/isc/doh_test.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/timer_test.c b/tests/isc/timer_test.c index 4a6ee8045c..0a5c8d01ac 100644 --- a/tests/isc/timer_test.c +++ b/tests/isc/timer_test.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include