upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove libdns init/shutdown functions

Browse source 
as libdns is no longer exported, it's not necessary to have
init and shutdown functions. the only purpose they served
was to create a private mctx and run dst_lib_init(), which
can be called directly instead.
This commit is contained in:
Evan Hunt 2021-09-15 01:40:31 -07:00
parent 372d065eff
commit cd8a081a4f
15 changed files with 22 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/delv/delv.c
View file

@ -47,7 +47,6 @@
#include <dns/fixedname.h>
#include <dns/keytable.h>
#include <dns/keyvalues.h>
#include <dns/lib.h>
#include <dns/log.h>
#include <dns/masterdump.h>
#include <dns/name.h>
@ -1735,13 +1734,15 @@ main(int argc, char *argv[]) {
argc--;
argv++;
result = dns_lib_init();
if (result != ISC_R_SUCCESS) {
fatal("dns_lib_init failed: %d", result);
}
isc_mem_create(&mctx);
dns_result_register();
result = dst_lib_init(mctx, NULL);
if (result != ISC_R_SUCCESS) {
fatal("dst_lib_init failed: %d", result);
}
CHECK(isc_appctx_create(mctx, &actx));
isc_managers_create(mctx, 1, 0, 0, &netmgr, &taskmgr, &timermgr, NULL);
@ -1856,7 +1857,7 @@ cleanup:
}
isc_mem_detach(&mctx);
dns_lib_shutdown();
dst_lib_destroy();
return (0);
}

1
bin/named/server.c
View file

@ -73,7 +73,6 @@
#include <dns/keymgr.h>
#include <dns/keytable.h>
#include <dns/keyvalues.h>
#include <dns/lib.h>
#include <dns/master.h>
#include <dns/masterdump.h>
#include <dns/nsec3.h>

1
bin/tests/system/dyndb/driver/driver.c
View file

@ -22,7 +22,6 @@
#include <dns/db.h>
#include <dns/dyndb.h>
#include <dns/lib.h>
#include <dns/types.h>
#include "db.h"

15
bin/tests/system/resolve.c
View file

@ -37,7 +37,6 @@
#include <dns/client.h>
#include <dns/fixedname.h>
#include <dns/keyvalues.h>
#include <dns/lib.h>
#include <dns/name.h>
#include <dns/rdata.h>
#include <dns/rdataset.h>
@ -391,17 +390,17 @@ main(int argc, char *argv[]) {
altserveraddr = cp + 1;
}
result = dns_lib_init();
if (result != ISC_R_SUCCESS) {
fprintf(stderr, "dns_lib_init failed: %u\n", result);
exit(1);
}
result = ctxs_init();
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
result = dst_lib_init(ctxs_mctx, NULL);
if (result != ISC_R_SUCCESS) {
fprintf(stderr, "dst_lib_init failed: %u\n", result);
exit(1);
}
clientopt = 0;
result = dns_client_create(ctxs_mctx, ctxs_actx, ctxs_taskmgr,
ctxs_netmgr, ctxs_timermgr, clientopt,
@ -495,7 +494,7 @@ cleanup:
}
ctxs_destroy();
dns_lib_shutdown();
dst_lib_destroy();
return (0);
}

2
lib/dns/Makefile.am
View file

@ -87,7 +87,6 @@ libdns_la_HEADERS = \
include/dns/keymgr.h \
include/dns/keytable.h \
include/dns/keyvalues.h \
include/dns/lib.h \
include/dns/librpz.h \
include/dns/lookup.h \
include/dns/log.h \
@ -190,7 +189,6 @@ libdns_la_SOURCES = \
keydata.c \
keymgr.c \
keytable.c \
lib.c \
log.c \
lookup.c \
master.c \

1
lib/dns/cache.c
View file

@ -28,7 +28,6 @@
#include <dns/db.h>
#include <dns/dbiterator.h>
#include <dns/events.h>
#include <dns/lib.h>
#include <dns/log.h>
#include <dns/masterdump.h>
#include <dns/rdata.h>

2
lib/dns/db.c
View file

@ -58,6 +58,8 @@ struct dns_dbimplementation {
#include "rbtdb.h"
unsigned int dns_pps = 0U;
static ISC_LIST(dns_dbimplementation_t) implementations;
static isc_rwlock_t implock;
static isc_once_t once = ISC_ONCE_INIT;

5
lib/dns/include/dns/db.h
View file

@ -64,6 +64,11 @@
ISC_LANG_BEGINDECLS
/*%
* Tuning: external query load in packets per seconds.
*/
extern unsigned int dns_pps;
/*****
***** Types
*****/

43
lib/dns/include/dns/lib.h
View file

@ -1,43 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* 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.
*/
#ifndef DNS_LIB_H
#define DNS_LIB_H 1
/*! \file dns/lib.h */
#include <isc/lang.h>
#include <isc/types.h>
ISC_LANG_BEGINDECLS
/*%
* Tuning: external query load in packets per seconds.
*/
extern unsigned int dns_pps;
isc_result_t
dns_lib_init(void);
/*%<
* A set of initialization procedures used in the DNS library. This function
* is provided for an application that is not aware of the underlying ISC or
* DNS libraries much.
*/
void
dns_lib_shutdown(void);
/*%<
* Free temporary resources allocated in dns_lib_init().
*/
ISC_LANG_ENDDECLS
#endif /* DNS_LIB_H */

104
lib/dns/lib.c
View file

@ -1,104 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* 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 <stdbool.h>
#include <stddef.h>
#include <isc/hash.h>
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/once.h>
#include <isc/refcount.h>
#include <isc/util.h>
#include <dns/db.h>
#include <dns/lib.h>
#include <dns/result.h>
#include <dst/dst.h>
/***
*** Globals
***/
unsigned int dns_pps = 0U;
/***
*** Functions
***/
static isc_once_t init_once = ISC_ONCE_INIT;
static isc_mem_t *dns_g_mctx = NULL;
static bool initialize_done = false;
static isc_refcount_t references;
static void
initialize(void) {
isc_result_t result;
REQUIRE(!initialize_done);
isc_refcount_init(&references, 0);
isc_mem_create(&dns_g_mctx);
dns_result_register();
result = dst_lib_init(dns_g_mctx, NULL);
if (result != ISC_R_SUCCESS) {
goto cleanup_mctx;
}
initialize_done = true;
return;
cleanup_mctx:
if (dns_g_mctx != NULL) {
isc_mem_detach(&dns_g_mctx);
}
}
isc_result_t
dns_lib_init(void) {
isc_result_t result;
/*
* Since this routine is expected to be used by a normal application,
* it should be better to return an error, instead of an emergency
* abort, on any failure.
*/
result = isc_once_do(&init_once, initialize);
if (result != ISC_R_SUCCESS) {
return (result);
}
if (!initialize_done) {
return (ISC_R_FAILURE);
}
isc_refcount_increment0(&references);
return (ISC_R_SUCCESS);
}
void
dns_lib_shutdown(void) {
if (isc_refcount_decrement(&references) == 1) {
dst_lib_destroy();
isc_refcount_destroy(&references);
if (dns_g_mctx != NULL) {
isc_mem_detach(&dns_g_mctx);
}
}
}

1
lib/dns/masterdump.c
View file

@ -34,7 +34,6 @@
#include <dns/dbiterator.h>
#include <dns/events.h>
#include <dns/fixedname.h>
#include <dns/lib.h>
#include <dns/log.h>
#include <dns/master.h>
#include <dns/masterdump.h>

1
lib/dns/rbtdb.c
View file

@ -45,7 +45,6 @@
#include <dns/dbiterator.h>
#include <dns/events.h>
#include <dns/fixedname.h>
#include <dns/lib.h>
#include <dns/log.h>
#include <dns/masterdump.h>
#include <dns/nsec.h>

1
lib/dns/result.c
View file

@ -14,7 +14,6 @@
#include <isc/once.h>
#include <isc/util.h>
#include <dns/lib.h>
#include <dns/result.h>
static const char *text[DNS_R_NRESULTS] = {

1
lib/dns/tests/result_test.c
View file

@ -23,7 +23,6 @@
#include <isc/result.h>
#include <isc/util.h>
#include <dns/lib.h>
#include <dns/result.h>
#include <dst/result.h>

2
util/copyrights
View file

@ -1193,7 +1193,6 @@
./lib/dns/include/dns/keymgr.h C 2019,2020,2021
./lib/dns/include/dns/keytable.h C 2000,2001,2004,2005,2007,2009,2010,2014,2015,2016,2017,2018,2019,2020,2021
./lib/dns/include/dns/keyvalues.h C 1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2012,2016,2017,2018,2019,2020,2021
./lib/dns/include/dns/lib.h C 1999,2000,2001,2004,2005,2006,2007,2009,2016,2017,2018,2019,2020,2021
./lib/dns/include/dns/librpz.h C 2017,2018,2019,2020,2021
./lib/dns/include/dns/log.h C 1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
./lib/dns/include/dns/lookup.h C 2000,2001,2004,2005,2006,2007,2009,2016,2018,2019,2020,2021
@ -1259,7 +1258,6 @@
./lib/dns/keydata.c C 2009,2014,2016,2018,2019,2020,2021
./lib/dns/keymgr.c C 2019,2020,2021
./lib/dns/keytable.c C 2000,2001,2004,2005,2007,2009,2010,2013,2014,2015,2016,2017,2018,2019,2020,2021
./lib/dns/lib.c C 1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016,2017,2018,2019,2020,2021
./lib/dns/log.c C 1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
./lib/dns/lookup.c C 2000,2001,2003,2004,2005,2007,2013,2016,2018,2019,2020,2021
./lib/dns/master.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021