mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

attach to memory context

Browse Source
This commit is contained in:
Bob Halley
2000-04-12 01:35:59 +00:00
parent 64b1a68e10
commit a0f9edd9a4
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/dns/rbtdb.c
View File

@@ -313,6 +313,7 @@ static void
free_rbtdb(dns_rbtdb_t *rbtdb) { free_rbtdb(dns_rbtdb_t *rbtdb) {
unsigned int i; unsigned int i;
isc_ondestroy_t ondest; isc_ondestroy_t ondest;
isc_mem_t *mctx;
REQUIRE(EMPTY(rbtdb->open_versions)); REQUIRE(EMPTY(rbtdb->open_versions));
REQUIRE(rbtdb->future_version == NULL); REQUIRE(rbtdb->future_version == NULL);
@@ -333,7 +334,9 @@ free_rbtdb(dns_rbtdb_t *rbtdb) {
rbtdb->common.magic = 0; rbtdb->common.magic = 0;
rbtdb->common.impmagic = 0; rbtdb->common.impmagic = 0;
ondest = rbtdb->common.ondest; ondest = rbtdb->common.ondest;
isc_mem_put(rbtdb->common.mctx, rbtdb, sizeof *rbtdb); mctx = rbtdb->common.mctx;
isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
isc_mem_detach(&mctx);
isc_ondestroy_notify(&ondest, rbtdb); isc_ondestroy_notify(&ondest, rbtdb);
} }
@@ -3816,11 +3819,11 @@ dns_rbtdb_create
} else } else
rbtdb->common.methods = &zone_methods; rbtdb->common.methods = &zone_methods;
rbtdb->common.rdclass = rdclass; rbtdb->common.rdclass = rdclass;
rbtdb->common.mctx = mctx; rbtdb->common.mctx = NULL;
result = isc_mutex_init(&rbtdb->lock); result = isc_mutex_init(&rbtdb->lock);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
isc_mem_put(rbtdb->common.mctx, rbtdb, sizeof *rbtdb); isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s", "isc_mutex_init() failed: %s",
isc_result_totext(result)); isc_result_totext(result));
@@ -3830,7 +3833,7 @@ dns_rbtdb_create
result = isc_rwlock_init(&rbtdb->tree_lock, 0, 0); result = isc_rwlock_init(&rbtdb->tree_lock, 0, 0);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
isc_mutex_destroy(&rbtdb->lock); isc_mutex_destroy(&rbtdb->lock);
isc_mem_put(rbtdb->common.mctx, rbtdb, sizeof *rbtdb); isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_rwlock_init() failed: %s", "isc_rwlock_init() failed: %s",
isc_result_totext(result)); isc_result_totext(result));
@@ -3856,7 +3859,7 @@ dns_rbtdb_create
sizeof (rbtdb_nodelock_t)); sizeof (rbtdb_nodelock_t));
isc_rwlock_destroy(&rbtdb->tree_lock); isc_rwlock_destroy(&rbtdb->tree_lock);
isc_mutex_destroy(&rbtdb->lock); isc_mutex_destroy(&rbtdb->lock);
isc_mem_put(rbtdb->common.mctx, rbtdb, sizeof *rbtdb); isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s", "isc_mutex_init() failed: %s",
isc_result_totext(result)); isc_result_totext(result));
@@ -3866,6 +3869,13 @@ dns_rbtdb_create
rbtdb->node_locks[i].exiting = ISC_FALSE; rbtdb->node_locks[i].exiting = ISC_FALSE;
} }
/*
* Attach to the mctx. The database will persist so long as there
* are references to it, and attaching to the mctx ensures that our
* mctx won't disappear out from under us.
*/
isc_mem_attach(mctx, &rbtdb->common.mctx);
/* /*
* Make a copy of the origin name. * Make a copy of the origin name.
*/ */