Cleanup the isc_<*>mgr_createinc() constructors

Previously, the taskmgr, timermgr and socketmgr had a constructor
variant, that would create the mgr on top of existing appctx.  This was
no longer true and isc_<*>mgr was just calling isc_<*>mgr_create()
directly without any extra code.

This commit just cleans up the extra function.

(cherry picked from commit 3388ef36b3cff409f78db59cc1c5d71839423ee0)

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index 0c8e951753227175c70de10768677c58bec73e19..27b60287ff63aa61ef079363df0bc87720c8a410 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -1749,9 +1749,9 @@ main(int argc, char *argv[]) {
        isc_mem_create(&mctx);
 
        CHECK(isc_appctx_create(mctx, &actx));
-       CHECK(isc_taskmgr_createinctx(mctx, 1, 0, &taskmgr));
-       CHECK(isc_socketmgr_createinctx(mctx, &socketmgr));
-       CHECK(isc_timermgr_createinctx(mctx, &timermgr));
+       CHECK(isc_taskmgr_create(mctx, 1, 0, NULL, &taskmgr));
+       CHECK(isc_socketmgr_create(mctx, &socketmgr));
+       CHECK(isc_timermgr_create(mctx, &timermgr));
 
        parse_args(argc, argv);
 

diff --git a/bin/tests/system/resolve.c b/bin/tests/system/resolve.c
index 9ee44a8c50de76c955ca83f4126c804947c30dfc..a7993f8ae7340e9681983f0bff7e04b54905397a 100644 (file)
--- a/bin/tests/system/resolve.c
+++ b/bin/tests/system/resolve.c
@@ -370,15 +370,15 @@ main(int argc, char *argv[]) {
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }
-       result = isc_taskmgr_createinctx(mctx, 1, 0, &taskmgr);
+       result = isc_taskmgr_create(mctx, 1, 0, NULL, &taskmgr);
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }
-       result = isc_socketmgr_createinctx(mctx, &socketmgr);
+       result = isc_socketmgr_create(mctx, &socketmgr);
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }
-       result = isc_timermgr_createinctx(mctx, &timermgr);
+       result = isc_timermgr_create(mctx, &timermgr);
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }

diff --git a/lib/irs/context.c b/lib/irs/context.c
index c7dcd0ec25232ba46b4a164f6d279bf2d46c6035..ae42725e30bdfba03a5489ca2cd8ce7da0f2cd81 100644 (file)
--- a/lib/irs/context.c
+++ b/lib/irs/context.c
@@ -97,17 +97,17 @@ ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp,
                goto fail;
        }
 
-       result = isc_taskmgr_createinctx(*mctxp, 1, 0, taskmgrp);
+       result = isc_taskmgr_create(*mctxp, 1, 0, NULL, taskmgrp);
        if (result != ISC_R_SUCCESS) {
                goto fail;
        }
 
-       result = isc_socketmgr_createinctx(*mctxp, socketmgrp);
+       result = isc_socketmgr_create(*mctxp, socketmgrp);
        if (result != ISC_R_SUCCESS) {
                goto fail;
        }
 
-       result = isc_timermgr_createinctx(*mctxp, timermgrp);
+       result = isc_timermgr_create(*mctxp, timermgrp);
        if (result != ISC_R_SUCCESS) {
                goto fail;
        }

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 18b3d3ac71c934c31f7bcd842a6cd7f493c3c46b..61b853c990b0121788f03d5548414962721e9957 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -676,9 +676,6 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task,
  */
 /*@}*/
 
-isc_result_t
-isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp);
-
 isc_result_t
 isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp);
 
@@ -690,8 +687,6 @@ isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp,
  * maximum number of sockets that the created manager should handle.
  * isc_socketmgr_create() is equivalent of isc_socketmgr_create2() with
  * "maxsocks" being zero.
- * isc_socketmgr_createinctx() also associates the new manager with the
- * specified application context.
  *
  * Notes:
  *

diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index e5acaaae664114ddda3b46783908527d54c4b1fa..a78cec1a097b0c529291254e0fe6a5bf5819ea9e 100644 (file)
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -610,16 +610,12 @@ isc_task_privilege(isc_task_t *task);
 ***** Task Manager.
 *****/
 
-isc_result_t
-isc_taskmgr_createinctx(isc_mem_t *mctx, unsigned int workers,
-                       unsigned int default_quantum, isc_taskmgr_t **managerp);
 isc_result_t
 isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
                   unsigned int default_quantum, isc_nm_t *nm,
                   isc_taskmgr_t **managerp);
 /*%<
- * Create a new task manager.  isc_taskmgr_createinctx() also associates
- * the new manager with the specified application context.
+ * Create a new task manager.
  *
  * Notes:
  *
@@ -644,8 +640,6 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
  *
  *\li  managerp != NULL && *managerp == NULL
  *
- *\li  'actx' is a valid application context (for createinctx()).
- *
  * Ensures:
  *
  *\li  On success, '*managerp' will be attached to the newly created task

diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index b3bf135eac3bbe8152b737949a7ddb6a6f68fd46..88601b8f859f722830d31853fe2980aa2ece9397 100644 (file)
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -276,14 +276,10 @@ isc_timer_gettype(isc_timer_t *timer);
  *\li  'timer' to be a valid timer.
  */
 
-isc_result_t
-isc_timermgr_createinctx(isc_mem_t *mctx, isc_timermgr_t **managerp);
-
 isc_result_t
 isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp);
 /*%<
- * Create a timer manager.  isc_timermgr_createinctx() also associates
- * the new manager with the specified application context.
+ * Create a timer manager.
  *
  * Notes:
  *
@@ -295,8 +291,6 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp);
  *
  *\li  'managerp' points to a NULL isc_timermgr_t.
  *
- *\li  'actx' is a valid application context (for createinctx()).
- *
  * Ensures:
  *
  *\li  '*managerp' is a valid isc_timermgr_t.

diff --git a/lib/isc/task.c b/lib/isc/task.c
index e73cd0a60948998f23eeef43ee2429002a98a780..b5dccb7b285564f1cee405e68749ef798ea08428 100644 (file)
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1980,15 +1980,3 @@ error:
        return (result);
 }
 #endif /* ifdef HAVE_JSON_C */
-
-isc_result_t
-isc_taskmgr_createinctx(isc_mem_t *mctx, unsigned int workers,
-                       unsigned int default_quantum,
-                       isc_taskmgr_t **managerp) {
-       isc_result_t result;
-
-       result = isc_taskmgr_create(mctx, workers, default_quantum, NULL,
-                                   managerp);
-
-       return (result);
-}

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index a1f16da088dbdf2d151ea01c22f4afab6ada3cc1..2798491d85bcaf3c1ff857b76e8c0572d8b93f79 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -748,12 +748,3 @@ isc_timermgr_destroy(isc_timermgr_t **managerp) {
 
        *managerp = NULL;
 }
-
-isc_result_t
-isc_timermgr_createinctx(isc_mem_t *mctx, isc_timermgr_t **managerp) {
-       isc_result_t result;
-
-       result = isc_timermgr_create(mctx, managerp);
-
-       return (result);
-}

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index bf80dcb3c7962643d11b8a18e3cb8aeb5d1062a7..4ccf58852a2db0ccea2ff432d4bfacfb902415f6 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -5522,12 +5522,3 @@ error:
        return (result);
 }
 #endif /* HAVE_JSON_C */
-
-isc_result_t
-isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
-       isc_result_t result;
-
-       result = isc_socketmgr_create(mctx, managerp);
-
-       return (result);
-}

diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
index 08f0a940ff01d13cd7ced8e7ef705c8db4fc0284..2de59319c35c7962ebb681297d6eee8670f04b29 100644 (file)
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@@ -597,7 +597,6 @@ isc_sockaddr_setport
 isc_sockaddr_totext
 isc_sockaddr_v6fromin
 isc_socket_socketevent
-isc_socketmgr_createinctx
 isc_socketmgr_maxudp
 @IF NOTYET
 isc_socketmgr_renderjson
@@ -659,7 +658,6 @@ isc_task_shutdown
 isc_task_unpause
 isc_task_unsend
 isc_taskmgr_create
-isc_taskmgr_createinctx
 isc_taskmgr_destroy
 isc_taskmgr_excltask
 isc_taskmgr_mode
@@ -712,7 +710,6 @@ isc_timer_gettype
 isc_timer_reset
 isc_timer_touch
 isc_timermgr_create
-isc_timermgr_createinctx
 isc_timermgr_destroy
 isc_timermgr_poke
 isc__tls_initialize

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index e716a2c883441b94c284fd5c66276bf6e9064060..7b3434a0a01f5ef5022c4613678cd3f061f1824c 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -3955,15 +3955,6 @@ error:
 }
 #endif /* HAVE_JSON_C */
 
-isc_result_t
-isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
-       isc_result_t result;
-
-       result = isc_socketmgr_create(mctx, managerp);
-
-       return (result);
-}
-
 void
 isc_socketmgr_maxudp(isc_socketmgr_t *manager, unsigned int maxudp) {
        REQUIRE(VALID_MANAGER(manager));