Only use locks when really necessary

bin/check/check-tool.c

@@ -129,7 +129,7 @@ add(char *key, int value) {
 	isc_symvalue_t symvalue;
 
 	if (sym_mctx == NULL) {
-		result = isc_mem_create(0, 0, &sym_mctx);
+		result = isc_mem_create(&sym_mctx);
 		if (result != ISC_R_SUCCESS)
 			return;
 	}

bin/check/named-checkconf.c

@@ -583,7 +583,7 @@ main(int argc, char **argv) {
 	}
 	isc_commandline_reset = true;
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	while ((c = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != EOF) {
 		switch (c) {

bin/check/named-checkzone.c

@@ -519,7 +519,7 @@ main(int argc, char **argv) {
 	InitSockets();
 #endif
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	if (!quiet)
 		RUNTIME_CHECK(setup_logging(mctx, errout, &lctx)
 			      == ISC_R_SUCCESS);

bin/confgen/ddns-confgen.c

@@ -209,7 +209,7 @@ main(int argc, char **argv) {
 	/* Use canonical algorithm name */
 	algname = alg_totext(alg);
 
-	DO("create memory context", isc_mem_create(0, 0, &mctx));
+	DO("create memory context", isc_mem_create(&mctx));
 
 	if (keyname == NULL) {
 		const char *suffix = NULL;

bin/confgen/rndc-confgen.c

@@ -211,7 +211,7 @@ main(int argc, char **argv) {
 		keysize = alg_bits(alg);
 	algname = alg_totext(alg);
 
-	DO("create memory context", isc_mem_create(0, 0, &mctx));
+	DO("create memory context", isc_mem_create(&mctx));
 	isc_buffer_init(&key_txtbuffer, &key_txtsecret, sizeof(key_txtsecret));
 
 	generate_key(mctx, alg, keysize, &key_txtbuffer);

bin/delv/delv.c

@@ -1586,7 +1586,7 @@ main(int argc, char *argv[]) {
 	if (result != ISC_R_SUCCESS)
 		fatal("dns_lib_init failed: %d", result);
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		fatal("failed to create mctx");
 

bin/dig/dighost.c

@@ -1324,7 +1324,7 @@ setup_libs(void) {
 	if (!have_ipv6 && !have_ipv4)
 		fatal("can't find either v4 or v6 networking");
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	check_result(result, "isc_mem_create");
 	isc_mem_setname(mctx, "dig", NULL);
 

bin/dnssec/dnssec-cds.c

@@ -1144,7 +1144,7 @@ main(int argc, char *argv[]) {
 	int ch;
 	char *endp;
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS) {
 		fatal("out of memory");
 	}

bin/dnssec/dnssec-dsfromkey.c

@@ -368,7 +368,7 @@ main(int argc, char **argv) {
 	if (argc == 1)
 		usage();
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		fatal("out of memory");
 

bin/dnssec/dnssec-importkey.c

@@ -307,7 +307,7 @@ main(int argc, char **argv) {
 	if (argc == 1)
 		usage();
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		fatal("out of memory");
 

bin/dnssec/dnssec-keyfromlabel.c

@@ -166,7 +166,7 @@ main(int argc, char **argv) {
 	if (argc == 1)
 		usage();
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 #if USE_PKCS11
 	pk11_result_register();

bin/dnssec/dnssec-keygen.c

@@ -265,7 +265,7 @@ main(int argc, char **argv) {
 	}
 	isc_commandline_reset = true;
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	isc_stdtime_get(&now);
 

bin/dnssec/dnssec-revoke.c

@@ -91,7 +91,7 @@ main(int argc, char **argv) {
 	if (argc == 1)
 		usage();
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		fatal("Out of memory");
 

bin/dnssec/dnssec-settime.c

@@ -170,7 +170,7 @@ main(int argc, char **argv) {
 	if (argc == 1)
 		usage();
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		fatal("Out of memory");
 

bin/dnssec/dnssec-signzone.c

@@ -3278,7 +3278,7 @@ main(int argc, char *argv[]) {
 
 	check_result(isc_app_start(), "isc_app_start");
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		fatal("out of memory");
 

bin/dnssec/dnssec-verify.c

@@ -201,7 +201,7 @@ main(int argc, char *argv[]) {
 	isc_commandline_reset = true;
 	check_result(isc_app_start(), "isc_app_start");
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		fatal("out of memory");
 

bin/named/main.c

@@ -1391,7 +1391,7 @@ main(int argc, char *argv[]) {
 						named_g_chrootdir);
 	}
 
-	result = isc_mem_create(0, 0, &named_g_mctx);
+	result = isc_mem_create(&named_g_mctx);
 	if (result != ISC_R_SUCCESS)
 		named_main_earlyfatal("isc_mem_create() failed: %s",
 				   isc_result_totext(result));

bin/named/server.c

@@ -4236,9 +4236,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 			 * cache, for the main cache memory and the heap
 			 * memory.
 			 */
-			CHECK(isc_mem_create(0, 0, &cmctx));
+			CHECK(isc_mem_create(&cmctx));
 			isc_mem_setname(cmctx, "cache", NULL);
-			CHECK(isc_mem_create(0, 0, &hmctx));
+			CHECK(isc_mem_create(&hmctx));
 			isc_mem_setname(hmctx, "cache_heap", NULL);
 			CHECK(dns_cache_create(cmctx, hmctx, named_g_taskmgr,
 					       named_g_timermgr, view->rdclass,

bin/named/unix/dlz_dlopen_driver.c

@@ -226,7 +226,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
 		return (ISC_R_FAILURE);
 	}
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 

bin/named/win32/dlz_dlopen_driver.c

@@ -227,7 +227,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
 		return (ISC_R_FAILURE);
 	}
 
-	isc_mem_create(0, 0, &mctx);
+	isc_mem_create(&mctx);
 
 	cd = isc_mem_get(mctx, sizeof(*cd));
 	if (cd == NULL) {

bin/nsupdate/nsupdate.c

@@ -3254,7 +3254,7 @@ main(int argc, char **argv) {
 
 	pre_parse_args(argc, argv);
 
-	result = isc_mem_create(0, 0, &gmctx);
+	result = isc_mem_create(&gmctx);
 	check_result(result, "isc_mem_create");
 
 	parse_args(argc, argv);

bin/pkcs11/pkcs11-tokens.c

@@ -67,7 +67,7 @@ main(int argc, char *argv[]) {
 		exit(1);
 	}
 
-	if (isc_mem_create(0, 0, &mctx) != ISC_R_SUCCESS) {
+	if (isc_mem_create(&mctx) != ISC_R_SUCCESS) {
 		fprintf(stderr, "isc_mem_create() failed\n");
 		exit(1);
 	}

bin/rndc/rndc.c

@@ -932,7 +932,7 @@ main(int argc, char **argv) {
 
 	serial = isc_random32();
 
-	DO("create memory context", isc_mem_create(0, 0, &rndc_mctx));
+	DO("create memory context", isc_mem_create(&rndc_mctx));
 	DO("create socket manager", isc_socketmgr_create(rndc_mctx, &socketmgr));
 	DO("create task manager", isc_taskmgr_create(rndc_mctx, 1, 0, &taskmgr));
 	DO("create task", isc_task_create(taskmgr, 0, &task));

bin/tests/cfg_test.c

@@ -70,7 +70,7 @@ main(int argc, char **argv) {
 	char *filename = NULL;
 	unsigned int zonetype = 0;
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	result = isc_log_create(mctx, &lctx, &lcfg);
 	check_result(result, "isc_log_create()");

bin/tests/makejournal.c

@@ -97,7 +97,7 @@ main(int argc, char **argv) {
 	journal = argv[4];
 
 	isc_mem_debugging |= ISC_MEM_DEBUGRECORD;
-	CHECK(isc_mem_create(0, 0, &mctx));
+	CHECK(isc_mem_create(&mctx));
 
 	CHECK(dst_lib_init(mctx, NULL));
 	dst_active = true;

bin/tests/optional/adb_test.c

@@ -297,7 +297,7 @@ main(int argc, char **argv) {
 	/*
 	 * EVERYTHING needs a memory context.
 	 */
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	cmp = NULL;
 	RUNTIME_CHECK(isc_mempool_create(mctx, sizeof(client_t), &cmp)

bin/tests/optional/byaddr_test.c

@@ -89,7 +89,7 @@ main(int argc, char *argv[]) {
 	dns_result_register();
 
 	mctx = NULL;
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	while ((ch = isc_commandline_parse(argc, argv, "nvw:")) != -1) {
 		switch (ch) {

bin/tests/optional/byname_test.c

@@ -203,7 +203,7 @@ main(int argc, char *argv[]) {
 	dns_result_register();
 
 	mctx = NULL;
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	while ((ch = isc_commandline_parse(argc, argv, "d:vw:")) != -1) {
 		switch (ch) {

bin/tests/optional/db_test.c

@@ -359,7 +359,6 @@ main(int argc, char *argv[]) {
 	dbinfo *dbi;
 	dns_dbversion_t *version;
 	const dns_name_t *origin;
-	size_t memory_quota = 0;
 	dns_trust_t trust = 0;
 	unsigned int addopts;
 	isc_log_t *lctx = NULL;
@@ -367,12 +366,12 @@ main(int argc, char *argv[]) {
 
 	dns_result_register();
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(dns_dbtable_create(mctx, dns_rdataclass_in, &dbtable) ==
 		      ISC_R_SUCCESS);
 
 	snprintf(dbtype, sizeof(dbtype), "rbt");
-	while ((ch = isc_commandline_parse(argc, argv, "c:d:t:z:P:Q:glpqvT"))
+	while ((ch = isc_commandline_parse(argc, argv, "c:d:t:z:P:glpqvT"))
 	       != -1) {
 		switch (ch) {
 		case 'c':
@@ -411,10 +410,6 @@ main(int argc, char *argv[]) {
 		case 'P':
 			pause_every = atoi(isc_commandline_argument);
 			break;
-		case 'Q':
-			memory_quota = atoi(isc_commandline_argument);
-			isc_mem_setquota(mctx, memory_quota);
-			break;
 		case 't':
 			type = atoi(isc_commandline_argument);
 			break;

bin/tests/optional/dst_test.c

@@ -232,7 +232,7 @@ main(void) {
 	dns_name_t *name;
 	isc_result_t result;
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		return (1);
 

bin/tests/optional/gsstest.c

@@ -447,7 +447,7 @@ main(int argc, char *argv[]) {
 	dns_result_register();
 
 	mctx = NULL;
-	RUNCHECK(isc_mem_create(0, 0, &mctx));
+	RUNCHECK(isc_mem_create(&mctx));
 
 	RUNCHECK(isc_log_create(mctx, &lctx, &lcfg));
 	isc_log_setcontext(lctx);

bin/tests/optional/inter_test.c

@@ -31,7 +31,7 @@ main(int argc, char **argv) {
 	UNUSED(argc);
 	UNUSED(argv);
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	result = isc_interfaceiter_create(mctx, &iter);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;

bin/tests/optional/lex_test.c

@@ -91,7 +91,7 @@ main(int argc, char *argv[]) {
 		}
 	}
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_lex_create(mctx, 256, &lex) == ISC_R_SUCCESS);
 
 	if (masterfile) {

bin/tests/optional/log_test.c

@@ -108,7 +108,7 @@ main(int argc, char **argv) {
 	lctx = NULL;
 	lcfg = NULL;
 
-	CHECK(isc_mem_create(0, 0, &mctx));
+	CHECK(isc_mem_create(&mctx));
 	CHECK(isc_log_create(mctx, &lctx, &lcfg));
 
 	CHECK(isc_log_settag(lcfg, progname));

bin/tests/optional/master_test.c

@@ -59,7 +59,7 @@ main(int argc, char *argv[]) {
 
 	UNUSED(argc);
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	if (argv[1]) {
 		isc_buffer_init(&source, argv[1], strlen(argv[1]));

bin/tests/optional/mempool_test.c

@@ -33,7 +33,7 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_mutex_init(&lock) == ISC_R_SUCCESS);
 
 	mctx = NULL;
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	mp1 = NULL;
 	RUNTIME_CHECK(isc_mempool_create(mctx, 24, &mp1) == ISC_R_SUCCESS);

bin/tests/optional/nsecify.c

@@ -192,7 +192,7 @@ main(int argc, char *argv[]) {
 
 	dns_result_register();
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	check_result(result, "isc_mem_create()");
 
 	argc--;

bin/tests/optional/ratelimiter_test.c

@@ -103,7 +103,7 @@ main(int argc, char *argv[]) {
 	isc_app_start();
 	isc_interval_set(&linterval, 1, 0);
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, 3, 0, &taskmgr) ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_timermgr_create(mctx, &timermgr) ==

bin/tests/optional/rbt_test.c

@@ -283,7 +283,7 @@ main(int argc, char **argv) {
 	 */
 	isc_mem_debugging = ISC_MEM_DEBUGRECORD;
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS) {
 		printf("isc_mem_create: %s: exiting\n",
 		       dns_result_totext(result));

bin/tests/optional/shutdown_test.c

@@ -180,9 +180,9 @@ main(int argc, char *argv[]) {
 	printf("%u workers\n", workers);
 
 	mctx = NULL;
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	mctx2 = NULL;
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx2) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx2) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &task_manager) ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_timermgr_create(mctx, &timer_manager) ==

bin/tests/optional/sig0_test.c

@@ -209,7 +209,7 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_mutex_init(&lock) == ISC_R_SUCCESS);
 
 	mctx = NULL;
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	while ((ch = isc_commandline_parse(argc, argv, "vp:")) != -1) {
 		switch (ch) {

bin/tests/optional/sock_test.c

@@ -291,7 +291,7 @@ main(int argc, char *argv[]) {
 	 * EVERYTHING needs a memory context.
 	 */
 	mctx = NULL;
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	/*
 	 * The task manager is independent (other than memory context)

bin/tests/optional/sym_test.c

@@ -61,7 +61,7 @@ main(int argc, char *argv[]) {
 		}
 	}
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_symtab_create(mctx, 691, undefine_action, NULL,
 					case_sensitive, &st) == ISC_R_SUCCESS);
 

bin/tests/optional/task_test.c

@@ -79,7 +79,7 @@ main(int argc, char *argv[]) {
 		workers = 2;
 	printf("%u workers\n", workers);
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &manager) ==
 		      ISC_R_SUCCESS);

bin/tests/optional/timer_test.c

@@ -109,7 +109,7 @@ main(int argc, char *argv[]) {
 		workers = 2;
 	printf("%u workers\n", workers);
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx1) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx1) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_taskmgr_create(mctx1, workers, 0, &manager) ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_timermgr_create(mctx1, &timgr) == ISC_R_SUCCESS);

bin/tests/optional/zone_test.c

@@ -283,7 +283,7 @@ main(int argc, char **argv) {
 		usage();
 
 	RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, 2, 0, &taskmgr) ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_timermgr_create(mctx, &timermgr) == ISC_R_SUCCESS);

bin/tests/system/pipelined/pipequeries.c

@@ -270,7 +270,7 @@ main(int argc, char *argv[]) {
 	isc_sockaddr_fromin(&dstaddr, &inaddr, port);
 
 	mctx = NULL;
-	RUNCHECK(isc_mem_create(0, 0, &mctx));
+	RUNCHECK(isc_mem_create(&mctx));
 
 	lctx = NULL;
 	lcfg = NULL;

bin/tests/system/rsabigexponent/bigkey.c

@@ -104,7 +104,7 @@ main(int argc, char **argv) {
 
 	dns_result_register();
 
-	CHECK(isc_mem_create(0, 0, &mctx), "isc_mem_create()");
+	CHECK(isc_mem_create(&mctx), "isc_mem_create()");
 	CHECK(dst_lib_init(mctx, NULL), "dst_lib_init()");
 	CHECK(isc_log_create(mctx, &log_, &logconfig), "isc_log_create()");
 	isc_log_setcontext(log_);

bin/tests/system/tkey/keycreate.c

@@ -230,7 +230,7 @@ main(int argc, char *argv[]) {
 
 	mctx = NULL;
 	isc_mem_debugging = ISC_MEM_DEBUGRECORD;
-	RUNCHECK(isc_mem_create(0, 0, &mctx));
+	RUNCHECK(isc_mem_create(&mctx));
 
 	log = NULL;
 	logconfig = NULL;

bin/tests/system/tkey/keydelete.c

@@ -169,7 +169,7 @@ main(int argc, char **argv) {
 	dns_result_register();
 
 	mctx = NULL;
-	RUNCHECK(isc_mem_create(0, 0, &mctx));
+	RUNCHECK(isc_mem_create(&mctx));
 
 	log = NULL;
 	logconfig = NULL;

bin/tests/wire_test.c

@@ -138,7 +138,7 @@ main(int argc, char *argv[]) {
 	}
 	isc_commandline_reset = true;
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) {
 		switch (ch) {

bin/tools/dnstap-read.c

@@ -340,7 +340,7 @@ main(int argc, char *argv[]) {
 	if (argc < 1)
 		fatal("no file specified");
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	dns_result_register();
 

bin/tools/mdig.c

@@ -1935,7 +1935,7 @@ main(int argc, char *argv[]) {
 	preparse_args(argc, argv);
 
 	mctx = NULL;
-	RUNCHECK(isc_mem_create(0, 0, &mctx));
+	RUNCHECK(isc_mem_create(&mctx));
 
 	lctx = NULL;
 	lcfg = NULL;

bin/tools/named-journalprint.c

@@ -68,7 +68,7 @@ main(int argc, char **argv) {
 
 	file = argv[1];
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(setup_logging(mctx, stderr, &lctx) == ISC_R_SUCCESS);
 
 	result = dns_journal_print(mctx, file, stdout);

bin/tools/named-rrchecker.c

@@ -148,7 +148,7 @@ main(int argc, char *argv[]) {
 	if (doexit)
 		exit(0);
 
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_lex_create(mctx, 256, &lex) == ISC_R_SUCCESS);
 
 	/*

contrib/dlz/bin/dlzbdb/dlzbdb.c

@@ -670,7 +670,7 @@ open_lexer(void) {
 		return ISC_R_SUCCESS;
 
 	/* allocate memory for lexer, and verify it was allocated */
-	result = isc_mem_create(0, 0, &lex_mctx);
+	result = isc_mem_create(&lex_mctx);
 	if (result != ISC_R_SUCCESS) {
 		fprintf(stderr, "unexpected error creating lexer\n");
 		return result;

contrib/sdb/bdb/zone2bdb.c

@@ -127,7 +127,7 @@ main(int argc, char *argv[])
 
 	if (argc != 4) usage(*argv);
 
-	REQUIRE(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	REQUIRE(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 
 	n = strlen(argv[1]);
 	isc_buffer_init(&b, argv[1], n);

contrib/sdb/pgsql/zonetodb.c

@@ -152,7 +152,7 @@ main(int argc, char **argv) {
 	dns_result_register();
 
 	mctx = NULL;
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	check_result(result, "isc_mem_create");
 
 	isc_buffer_init(&b, porigin, strlen(porigin));

contrib/sdb/sqlite/zone2sqlite.c

@@ -163,7 +163,7 @@ main(int argc, char *argv[])
     
     dns_result_register();
     
-    result = isc_mem_create(0, 0, &mctx);
+    result = isc_mem_create(&mctx);
     check_result(result, "isc_mem_create");
     
     isc_buffer_init(&b, porigin, strlen(porigin));

fuzz/fuzz.h

@@ -30,7 +30,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 static isc_mem_t *mctx = NULL;
 
 static void __attribute__((constructor)) init(void) {
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mem_create(&mctx) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(dst_lib_init(mctx, NULL) == ISC_R_SUCCESS);
 }
 

lib/dns/client.c

@@ -370,7 +370,7 @@ dns_client_create(dns_client_t **clientp, unsigned int options) {
 	unsigned int logdebuglevel = 0;
 #endif
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 	result = isc_appctx_create(mctx, &actx);

lib/dns/dnstap.c

@@ -167,7 +167,7 @@ dt_init(void) {
 		int ret;
 
 		if (dt_mctx == NULL)
-			result = isc_mem_create(0, 0, &dt_mctx);
+			result = isc_mem_create(&dt_mctx);
 		if (result != ISC_R_SUCCESS)
 			goto unlock;
 		isc_mem_setname(dt_mctx, "dt", NULL);

lib/dns/geoip.c

@@ -114,7 +114,7 @@ state_key_init(void) {
 			int ret;
 
 			if (state_mctx == NULL)
-				result = isc_mem_create(0, 0, &state_mctx);
+				result = isc_mem_create(&state_mctx);
 			if (result != ISC_R_SUCCESS)
 				goto unlock;
 			isc_mem_setname(state_mctx, "geoip_state", NULL);

lib/dns/lib.c

@@ -79,7 +79,7 @@ initialize(void) {
 
 	REQUIRE(initialize_done == false);
 
-	result = isc_mem_create(0, 0, &dns_g_mctx);
+	result = isc_mem_create(&dns_g_mctx);
 	if (result != ISC_R_SUCCESS)
 		return;
 	dns_result_register();

lib/dns/name.c

@@ -1301,7 +1301,7 @@ totext_filter_proc_key_init(void) {
 	if (!thread_key_initialized) {
 		LOCK(&thread_key_mutex);
 		if (thread_key_mctx == NULL)
-			result = isc_mem_create(0, 0, &thread_key_mctx);
+			result = isc_mem_create( &thread_key_mctx);
 		if (result != ISC_R_SUCCESS)
 			goto unlock;
 		isc_mem_setname(thread_key_mctx, "threadkey", NULL);

lib/dns/resolver.c

@@ -9910,7 +9910,7 @@ dns_resolver_create(dns_view_t *view,
 		 * contention among multiple threads.  Do this only when
 		 * enabling threads because it will be require more memory.
 		 */
-		result = isc_mem_create(0, 0, &res->buckets[i].mctx);
+		result = isc_mem_create(&res->buckets[i].mctx);
 		if (result != ISC_R_SUCCESS) {
 			isc_task_detach(&res->buckets[i].task);
 			DESTROYLOCK(&res->buckets[i].lock);

lib/dns/tests/db_test.c

@@ -49,7 +49,7 @@ ATF_TC_BODY(getoriginnode, tc) {
 	isc_mem_t *mymctx = NULL;
 	isc_result_t result;
 
-	result = isc_mem_create(0, 0, &mymctx);
+	result = isc_mem_create(&mymctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = dns_db_create(mymctx, "rbt", dns_rootname, dns_dbtype_zone,
@@ -79,7 +79,7 @@ ATF_TC_BODY(getsetservestalettl, tc) {
 	isc_result_t result;
 	dns_ttl_t ttl;
 
-	result = isc_mem_create(0, 0, &mymctx);
+	result = isc_mem_create(&mymctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = dns_db_create(mymctx, "rbt", dns_rootname, dns_dbtype_cache,
@@ -124,7 +124,7 @@ ATF_TC_BODY(dns_dbfind_staleok, tc) {
 	isc_result_t result;
 	unsigned char data[] = { 0x0a, 0x00, 0x00, 0x01 };
 
-	result = isc_mem_create(0, 0, &mymctx);
+	result = isc_mem_create(&mymctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = dns_db_create(mymctx, "rbt", dns_rootname, dns_dbtype_cache,

lib/dns/tests/dnstest.c

@@ -113,7 +113,7 @@ dns_test_begin(FILE *logfile, bool start_managers) {
 		CHECK(isc_app_start());
 	if (debug_mem_record)
 		isc_mem_debugging |= ISC_MEM_DEBUGRECORD;
-	CHECK(isc_mem_create(0, 0, &mctx));
+	CHECK(isc_mem_create(&mctx));
 
 	CHECK(dst_lib_init(mctx, NULL));
 	dst_active = true;

lib/dns/view.c

@@ -818,7 +818,7 @@ dns_view_createresolver(dns_view_t *view,
 	dns_resolver_whenshutdown(view->resolver, view->task, &event);
 	view->attributes &= ~DNS_VIEWATTR_RESSHUTDOWN;
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS) {
 		dns_resolver_shutdown(view->resolver);
 		return (result);

lib/dns/zone.c

@@ -16442,7 +16442,7 @@ mctxinit(void **target, void *arg) {
 
 	REQUIRE(target != NULL && *target == NULL);
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 	isc_mem_setname(mctx, "zonemgr-pool", NULL);

lib/irs/context.c

@@ -96,7 +96,7 @@ ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp,
 {
 	isc_result_t result;
 
-	result = isc_mem_create(0, 0, mctxp);
+	result = isc_mem_create(mctxp);
 	if (result != ISC_R_SUCCESS)
 		goto fail;
 

lib/irs/tests/resconf_test.c

@@ -30,7 +30,7 @@ static void
 setup_test() {
 	isc_result_t result;
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	/*

lib/isc/include/isc/mem.h

@@ -111,19 +111,6 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
 #define _ISC_MEM_FLARG
 #endif
 
-/*!
- * Define ISC_MEM_USE_INTERNAL_MALLOC=1 to use the internal malloc()
- * implementation in preference to the system one.  The internal malloc()
- * is very space-efficient, and quite fast on uniprocessor systems.  It
- * performs poorly on multiprocessor machines.
- * JT: we can overcome the performance issue on multiprocessor machines
- * by carefully separating memory contexts.
- */
-
-#ifndef ISC_MEM_USE_INTERNAL_MALLOC
-#define ISC_MEM_USE_INTERNAL_MALLOC 1
-#endif
-
 /*
  * Flags for isc_mem_createx() calls.
  */
@@ -131,11 +118,7 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
 #define ISC_MEMFLAG_INTERNAL	0x00000002	 /* use internal malloc */
 #define ISC_MEMFLAG_FILL	0x00000004	 /* fill with pattern after alloc and frees */
 
-#if !ISC_MEM_USE_INTERNAL_MALLOC
-#define ISC_MEMFLAG_DEFAULT 	0
-#else
-#define ISC_MEMFLAG_DEFAULT	ISC_MEMFLAG_INTERNAL|ISC_MEMFLAG_FILL
-#endif
+#define ISC_MEMFLAG_DEFAULT	ISC_MEMFLAG_FILL
 
 /*%
  * isc_mem_putanddetach() is a convenience function for use where you
@@ -166,19 +149,6 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
  * \endcode
  */
 
-/*% memory and memory pool methods */
-typedef struct isc_memmethods {
-	void *(*memget)(isc_mem_t *mctx, size_t size _ISC_MEM_FLARG);
-	void (*memput)(isc_mem_t *mctx, void *ptr, size_t size _ISC_MEM_FLARG);
-	void (*memputanddetach)(isc_mem_t **mctxp, void *ptr,
-				size_t size _ISC_MEM_FLARG);
-	void *(*memallocate)(isc_mem_t *mctx, size_t size _ISC_MEM_FLARG);
-	void *(*memreallocate)(isc_mem_t *mctx, void *ptr,
-			       size_t size _ISC_MEM_FLARG);
-	char *(*memstrdup)(isc_mem_t *mctx, const char *s _ISC_MEM_FLARG);
-	void (*memfree)(isc_mem_t *mctx, void *ptr _ISC_MEM_FLARG);
-} isc_memmethods_t;
-
 /*%
  * This structure is actually just the common prefix of a memory context
  * implementation's version of an isc_mem_t.
@@ -191,7 +161,6 @@ typedef struct isc_memmethods {
 struct isc_mem {
 	unsigned int		impmagic;
 	unsigned int		magic;
-	isc_memmethods_t	*methods;
 };
 
 #define ISCAPI_MCTX_MAGIC	ISC_MAGIC('A','m','c','x')
@@ -216,11 +185,6 @@ struct isc_mempool {
  * (two underscores). The single-underscore macros are used to pass
  * __FILE__ and __LINE__, and in the case of the put functions, to
  * set the pointer being freed to NULL in the calling function.
- *
- * Many of these functions have a further isc___mem_<function>
- * (three underscores) implementation, which is called indirectly
- * via the isc_memmethods structure in the mctx so that dynamically
- * loaded modules can use them even if named is statically linked.
  */
 
 #define ISCMEMFUNC(sfx) isc__mem_ ## sfx
@@ -255,13 +219,10 @@ struct isc_mempool {
 
 /*@{*/
 isc_result_t
-isc_mem_create(size_t max_size, size_t target_size,
-	       isc_mem_t **mctxp);
+isc_mem_create(isc_mem_t **mctxp);
 
 isc_result_t
-isc_mem_createx(size_t max_size, size_t target_size,
-		isc_memalloc_t memalloc, isc_memfree_t memfree,
-		void *arg, isc_mem_t **mctxp, unsigned int flags);
+isc_mem_createx(isc_mem_t **mctxp, unsigned int flags);
 
 /*!<
  * \brief Create a memory context.

lib/isc/tests/heap_test.c

@@ -56,7 +56,7 @@ ATF_TC_BODY(isc_heap_delete, tc) {
 
 	UNUSED(tc);
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = isc_heap_create(mctx, compare, idx, 0, &heap);

lib/isc/tests/ht_test.c

@@ -27,28 +27,13 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-static void *
-default_memalloc(void *arg, size_t size) {
-	UNUSED(arg);
-	if (size == 0U)
-		size = 1;
-	return (malloc(size));
-}
-
-static void
-default_memfree(void *arg, void *ptr) {
-	UNUSED(arg);
-	free(ptr);
-}
-
 static void test_ht_full(int bits, uintptr_t count) {
 	isc_ht_t *ht = NULL;
 	isc_result_t result;
 	isc_mem_t *mctx = NULL;
 	uintptr_t i;
 
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &mctx, 0);
+	result = isc_mem_createx(&mctx, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = isc_ht_init(&ht, mctx, bits);
@@ -200,8 +185,7 @@ static void test_ht_iterator() {
 	unsigned char *tkey;
 	size_t tksize;
 
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &mctx, 0);
+	result = isc_mem_createx(&mctx, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = isc_ht_init(&ht, mctx, 16);

lib/isc/tests/isctest.c

@@ -100,7 +100,7 @@ isc_test_begin(FILE *logfile, bool start_managers,
 	isc_result_t result;
 
 	isc_mem_debugging |= ISC_MEM_DEBUGRECORD;
-	CHECK(isc_mem_create(0, 0, &mctx));
+	CHECK(isc_mem_create(&mctx));
 
 	if (logfile != NULL) {
 		isc_logdestination_t destination;

lib/isc/tests/lex_test.c

@@ -38,7 +38,7 @@ ATF_TC_BODY(lex_0xff, tc) {
 
 	UNUSED(tc);
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = isc_lex_create(mctx, 1024, &lex);
@@ -70,7 +70,7 @@ ATF_TC_BODY(lex_setline, tc) {
 
 	UNUSED(tc);
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = isc_lex_create(mctx, 1024, &lex);

lib/isc/tests/mem_test.c

@@ -26,20 +26,6 @@
 
 #include "isctest.h"
 
-static void *
-default_memalloc(void *arg, size_t size) {
-	UNUSED(arg);
-	if (size == 0U)
-		size = 1;
-	return (malloc(size));
-}
-
-static void
-default_memfree(void *arg, void *ptr) {
-	UNUSED(arg);
-	free(ptr);
-}
-
 ATF_TC(isc_mem);
 ATF_TC_HEAD(isc_mem, tc) {
 	atf_tc_set_md_var(tc, "descr", "general memory system tests");
@@ -65,7 +51,7 @@ ATF_TC_BODY(isc_mem, tc) {
 	result = isc_test_begin(NULL, true, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	result = isc_mem_create(0, 0, &localmctx);
+	result = isc_mem_create(&localmctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = isc_mempool_create(localmctx, 24, &mp1);
@@ -139,8 +125,7 @@ ATF_TC_BODY(isc_mem, tc) {
 
 	isc_mem_destroy(&localmctx);
 
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &localmctx,
+	result = isc_mem_createx(&localmctx,
 				 ISC_MEMFLAG_FILL | ISC_MEMFLAG_INTERNAL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
@@ -174,8 +159,7 @@ ATF_TC_BODY(isc_mem_total, tc) {
 
 	/* Local alloc, free */
 	mctx2 = NULL;
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &mctx2, 0);
+	result = isc_mem_createx(&mctx2, 0);
 	if (result != ISC_R_SUCCESS)
 		goto out;
 
@@ -240,8 +224,7 @@ ATF_TC_BODY(isc_mem_inuse, tc) {
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	mctx2 = NULL;
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &mctx2, 0);
+	result = isc_mem_createx(&mctx2, 0);
 	if (result != ISC_R_SUCCESS)
 		goto out;
 
@@ -284,8 +267,7 @@ ATF_TC_BODY(isc_mem_noflags, tc) {
 	result = isc_test_begin(NULL, true, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &mctx2, 0);
+	result = isc_mem_createx(&mctx2, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 	isc_mem_debugging = 0;
 	ptr = isc_mem_get(mctx2, 2048);
@@ -336,8 +318,7 @@ ATF_TC_BODY(isc_mem_recordflag, tc) {
 	result = isc_test_begin(NULL, false, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &mctx2, 0);
+	result = isc_mem_createx(&mctx2, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 	ptr = isc_mem_get(mctx2, 2048);
 	ATF_CHECK(ptr != NULL);
@@ -386,8 +367,7 @@ ATF_TC_BODY(isc_mem_traceflag, tc) {
 	result = isc_test_begin(NULL, true, 0);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	result = isc_mem_createx(0, 0, default_memalloc, default_memfree,
-				 NULL, &mctx2, 0);
+	result = isc_mem_createx(&mctx2, 0);
 	isc_mem_debugging = ISC_MEM_DEBUGTRACE;
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 	ptr = isc_mem_get(mctx2, 2048);

lib/isc/tests/random_test.c

@@ -276,7 +276,7 @@ random_test(pvalue_func_t *func, isc_random_func test_func) {
 
 	tables_init();
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	m = 1000;

lib/isc/tests/task_test.c

@@ -691,7 +691,7 @@ ATF_TC_BODY(manytasks, tc) {
 	result = isc_condition_init(&cv);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	result = isc_taskmgr_create(mctx, 4, 0, &taskmgr);

lib/isccfg/tests/parser_test.c

@@ -63,7 +63,7 @@ setup() {
 	isc_result_t result;
 
 	isc_mem_debugging |= ISC_MEM_DEBUGRECORD;
-	CHECK(isc_mem_create(0, 0, &mctx));
+	CHECK(isc_mem_create(&mctx));
 
 	isc_logdestination_t destination;
 	isc_logconfig_t *logconfig = NULL;

lib/ns/client.c

@@ -2903,7 +2903,7 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) {
 	 * Caller must be holding the manager lock.
 	 */
 	if ((manager->sctx->options & NS_SERVER_CLIENTTEST) != 0) {
-		result = isc_mem_create(0, 0, mctxp);
+		result = isc_mem_create(mctxp);
 		if (result == ISC_R_SUCCESS)
 			isc_mem_setname(*mctxp, "client", NULL);
 		return (result);
@@ -2917,7 +2917,7 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) {
 
 	clientmctx = manager->mctxpool[nextmctx];
 	if (clientmctx == NULL) {
-		result = isc_mem_create(0, 0, &clientmctx);
+		result = isc_mem_create(&clientmctx);
 		if (result != ISC_R_SUCCESS)
 			return (result);
 		isc_mem_setname(clientmctx, "client", NULL);

lib/ns/lib.c

@@ -50,7 +50,7 @@ initialize(void) {
 
 	REQUIRE(initialize_done == false);
 
-	result = isc_mem_create(0, 0, &ns_g_mctx);
+	result = isc_mem_create(&ns_g_mctx);
 	if (result != ISC_R_SUCCESS)
 		return;
 

lib/ns/tests/nstest.c

@@ -227,7 +227,7 @@ ns_test_begin(FILE *logfile, bool start_managers) {
 		CHECK(isc_app_start());
 	if (debug_mem_record)
 		isc_mem_debugging |= ISC_MEM_DEBUGRECORD;
-	CHECK(isc_mem_create(0, 0, &mctx));
+	CHECK(isc_mem_create(&mctx));
 
 	CHECK(dst_lib_init(mctx, NULL));
 	dst_active = true;

lib/samples/nsprobe.c

@@ -218,7 +218,7 @@ ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp,
 {
 	isc_result_t result;
 
-	result = isc_mem_create(0, 0, mctxp);
+	result = isc_mem_create(mctxp);
 	if (result != ISC_R_SUCCESS)
 		goto fail;
 

lib/samples/resolve.c

@@ -115,7 +115,7 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr,
 	isc_region_t r;
 	dns_secalg_t alg;
 
-	result = isc_mem_create(0, 0, mctxp);
+	result = isc_mem_create(mctxp);
 	if (result != ISC_R_SUCCESS) {
 		fprintf(stderr, "failed to create mctx\n");
 		exit(1);
@@ -369,7 +369,7 @@ main(int argc, char *argv[]) {
 		exit(1);
 	}
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS) {
 		fprintf(stderr, "failed to crate mctx\n");
 		exit(1);

lib/samples/sample-async.c

@@ -100,7 +100,7 @@ ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp,
 {
 	isc_result_t result;
 
-	result = isc_mem_create(0, 0, mctxp);
+	result = isc_mem_create(mctxp);
 	if (result != ISC_R_SUCCESS)
 		goto fail;
 

lib/samples/sample-request.c

@@ -191,7 +191,7 @@ main(int argc, char *argv[]) {
 	qmessage = NULL;
 	rmessage = NULL;
 
-	result = isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(&mctx);
 	if (result != ISC_R_SUCCESS) {
 		fprintf(stderr, "failed to create a memory context\n");
 		exit(1);

lib/samples/sample-update.c

@@ -243,7 +243,7 @@ main(int argc, char *argv[]) {
 		fprintf(stderr, "dns_lib_init failed: %u\n", result);
 		exit(1);
 	}
-	result = isc_mem_create(0, 0, &umctx);
+	result = isc_mem_create(&umctx);
 	if (result != ISC_R_SUCCESS) {
 		fprintf(stderr, "failed to crate mctx\n");
 		exit(1);