From: Witold Kręcicki Date: Mon, 6 Aug 2018 14:58:48 +0000 (+0200) Subject: Remove layering from isc_socket, isc_timer, isc_mem X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a33835a96e318d9c24fa72f00a29ffd06a954a7;p=thirdparty%2Fbind9.git Remove layering from isc_socket, isc_timer, isc_mem --- diff --git a/bin/named/main.c b/bin/named/main.c index 1dc35741c35..c9c5503c5de 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -822,7 +822,7 @@ create_managers(void) { isc_result_totext(result)); return (ISC_R_UNEXPECTED); } - isc__socketmgr_maxudp(named_g_socketmgr, maxudp); + isc_socketmgr_maxudp(named_g_socketmgr, maxudp); result = isc_socketmgr_getmaxsockets(named_g_socketmgr, &socks); if (result == ISC_R_SUCCESS) { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, diff --git a/bin/named/server.c b/bin/named/server.c index d9a1a51c94d..cdbe62fbee6 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -8000,7 +8000,7 @@ load_configuration(const char *filename, named_server_t *server, "less than 128 UDP sockets available after " "applying 'reserved-sockets' and 'maxsockets'"); } - isc__socketmgr_setreserved(named_g_socketmgr, reserved); + isc_socketmgr_setreserved(named_g_socketmgr, reserved); #ifdef HAVE_GEOIP /* diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index 7732ff766be..f3d730badbd 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -662,30 +662,6 @@ ISCMEMPOOLFUNC(get)(isc_mempool_t * _ISC_MEM_FLARG); void ISCMEMPOOLFUNC(put)(isc_mempool_t *, void * _ISC_MEM_FLARG); -/*%< - * See isc_mem_create2() above. - */ -typedef isc_result_t -(*isc_memcreatefunc_t)(size_t init_max_size, size_t target_size, - isc_mem_t **ctxp, unsigned int flags); - -isc_result_t -isc_mem_register(isc_memcreatefunc_t createfunc); -/*%< - * Register a new memory management implementation and add it to the list of - * supported implementations. This function must be called when a different - * memory management library is used than the one contained in the ISC library. - */ - -isc_result_t -isc__mem_register(void); -/*%< - * A short cut function that specifies the memory management module in the ISC - * library for isc_mem_register(). An application that uses the ISC library - * usually do not have to care about this function: it would call - * isc_lib_register(), which internally calls this function. - */ - void isc__mem_printactive(isc_mem_t *mctx, FILE *file); /*%< diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index 41020cb7311..a8f0a79a6d8 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -62,55 +62,6 @@ #include #include -#ifdef WIN32 - -/* from the old namespace.h */ - -#define isc_socket_create isc__socket_create -#define isc_socket_dup isc__socket_dup -#define isc_socket_attach isc__socket_attach -#define isc_socket_detach isc__socket_detach -#define isc_socketmgr_create isc__socketmgr_create -#define isc_socketmgr_create2 isc__socketmgr_create2 -#define isc_socketmgr_destroy isc__socketmgr_destroy -#define isc_socket_open isc__socket_open -#define isc_socket_close isc__socket_close -#define isc_socket_recvv isc__socket_recvv -#define isc_socket_recv isc__socket_recv -#define isc_socket_recv2 isc__socket_recv2 -#define isc_socket_send isc__socket_send -#define isc_socket_sendto isc__socket_sendto -#define isc_socket_sendv isc__socket_sendv -#define isc_socket_sendtov isc__socket_sendtov -#define isc_socket_sendtov2 isc__socket_sendtov2 -#define isc_socket_sendto2 isc__socket_sendto2 -#define isc_socket_cleanunix isc__socket_cleanunix -#define isc_socket_permunix isc__socket_permunix -#define isc_socket_bind isc__socket_bind -#define isc_socket_filter isc__socket_filter -#define isc_socket_listen isc__socket_listen -#define isc_socket_accept isc__socket_accept -#define isc_socket_connect isc__socket_connect -#define isc_socket_getfd isc__socket_getfd -#define isc_socket_getname isc__socket_getname -#define isc_socket_gettag isc__socket_gettag -#define isc_socket_getpeername isc__socket_getpeername -#define isc_socket_getsockname isc__socket_getsockname -#define isc_socket_cancel isc__socket_cancel -#define isc_socket_gettype isc__socket_gettype -#define isc_socket_isbound isc__socket_isbound -#define isc_socket_ipv6only isc__socket_ipv6only -#define isc_socket_setname isc__socket_setname -#define isc_socketmgr_getmaxsockets isc__socketmgr_getmaxsockets -#define isc_socketmgr_setstats isc__socketmgr_setstats -#define isc_socketmgr_setreserved isc__socketmgr_setreserved -#define isc__socketmgr_maxudp isc___socketmgr_maxudp -#define isc_socket_fdwatchcreate isc__socket_fdwatchcreate -#define isc_socket_fdwatchpoke isc__socket_fdwatchpoke -#define isc_socket_dscp isc__socket_dscp - -#endif - ISC_LANG_BEGINDECLS /*** @@ -1082,7 +1033,7 @@ isc_socket_gettype(isc_socket_t *sock); /*@{*/ bool -isc__socket_isbound(isc_socket_t *sock); +isc_socket_isbound(isc_socket_t *sock); /*% * Intended for internal use in BIND9 only */ @@ -1175,13 +1126,13 @@ int isc_socket_getfd(isc_socket_t *socket); */ void -isc__socketmgr_setreserved(isc_socketmgr_t *mgr, uint32_t); +isc_socketmgr_setreserved(isc_socketmgr_t *mgr, uint32_t); /*%< * Temporary. For use by named only. */ void -isc__socketmgr_maxudp(isc_socketmgr_t *mgr, int maxudp); +isc_socketmgr_maxudp(isc_socketmgr_t *mgr, int maxudp); /*%< * Test interface. Drop UDP packet > 'maxudp'. */ @@ -1208,23 +1159,6 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr, json_object *stats); typedef isc_result_t (*isc_socketmgrcreatefunc_t)(isc_mem_t *mctx, isc_socketmgr_t **managerp); -isc_result_t -isc_socket_register(isc_socketmgrcreatefunc_t createfunc); -/*%< - * Register a new socket I/O implementation and add it to the list of - * supported implementations. This function must be called when a different - * event library is used than the one contained in the ISC library. - */ - -isc_result_t -isc__socket_register(void); -/*%< - * A short cut function that specifies the socket I/O module in the ISC - * library for isc_socket_register(). An application that uses the ISC library - * usually do not have to care about this function: it would call - * isc_lib_register(), which internally calls this function. - */ - ISC_LANG_ENDDECLS #endif /* ISC_SOCKET_H */ diff --git a/lib/isc/lib.c b/lib/isc/lib.c index 43bef6cd02b..ae5a24ba13b 100644 --- a/lib/isc/lib.c +++ b/lib/isc/lib.c @@ -79,5 +79,5 @@ isc_lib_initmsgcat(void) { void isc_lib_register(void) { - isc_bind9 = ISC_FALSE; + isc_bind9 = false; } diff --git a/lib/isc/mem.c b/lib/isc/mem.c index fd4b13b6c49..dd9bf73f8de 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -216,98 +216,6 @@ struct isc__mempool { static void print_active(isc__mem_t *ctx, FILE *out); -#endif /* ISC_MEM_TRACKLINES */ - -/*% - * The following are intended for internal use (indicated by "isc__" - * prefix) but are not declared as static, allowing direct access - * from unit tests, etc. - */ - -isc_result_t -isc__mem_create2(size_t init_max_size, size_t target_size, - isc_mem_t **ctxp, unsigned int flags); -void -isc__mem_attach(isc_mem_t *source, isc_mem_t **targetp); -void -isc__mem_detach(isc_mem_t **ctxp); -void -isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG); -void -isc__mem_destroy(isc_mem_t **ctxp); -void * -isc___mem_get(isc_mem_t *ctx, size_t size FLARG); -void -isc___mem_put(isc_mem_t *ctx, void *ptr, size_t size FLARG); -void -isc__mem_stats(isc_mem_t *ctx, FILE *out); -void * -isc___mem_allocate(isc_mem_t *ctx, size_t size FLARG); -void * -isc___mem_reallocate(isc_mem_t *ctx, void *ptr, size_t size FLARG); -void -isc___mem_free(isc_mem_t *ctx, void *ptr FLARG); -char * -isc___mem_strdup(isc_mem_t *mctx, const char *s FLARG); -void -isc__mem_setdestroycheck(isc_mem_t *ctx, bool flag); -void -isc__mem_setquota(isc_mem_t *ctx, size_t quota); -size_t -isc__mem_getquota(isc_mem_t *ctx); -size_t -isc__mem_inuse(isc_mem_t *ctx); -size_t -isc__mem_maxinuse(isc_mem_t *ctx); -size_t -isc__mem_total(isc_mem_t *ctx); -bool -isc__mem_isovermem(isc_mem_t *ctx); -void -isc__mem_setwater(isc_mem_t *ctx, isc_mem_water_t water, void *water_arg, - size_t hiwater, size_t lowater); -void -isc__mem_waterack(isc_mem_t *ctx0, int flag); -void -isc__mem_setname(isc_mem_t *ctx, const char *name, void *tag); -const char * -isc__mem_getname(isc_mem_t *ctx); -void * -isc__mem_gettag(isc_mem_t *ctx); -isc_result_t -isc__mempool_create(isc_mem_t *mctx, size_t size, isc_mempool_t **mpctxp); -void -isc__mempool_setname(isc_mempool_t *mpctx, const char *name); -void -isc__mempool_destroy(isc_mempool_t **mpctxp); -void -isc__mempool_associatelock(isc_mempool_t *mpctx, isc_mutex_t *lock); -void * -isc___mempool_get(isc_mempool_t *mpctx FLARG); -void -isc___mempool_put(isc_mempool_t *mpctx, void *mem FLARG); -void -isc__mempool_setfreemax(isc_mempool_t *mpctx, unsigned int limit); -unsigned int -isc__mempool_getfreemax(isc_mempool_t *mpctx); -unsigned int -isc__mempool_getfreecount(isc_mempool_t *mpctx); -void -isc__mempool_setmaxalloc(isc_mempool_t *mpctx, unsigned int limit); -unsigned int -isc__mempool_getmaxalloc(isc_mempool_t *mpctx); -unsigned int -isc__mempool_getallocated(isc_mempool_t *mpctx); -void -isc__mempool_setfillcount(isc_mempool_t *mpctx, unsigned int limit); -unsigned int -isc__mempool_getfillcount(isc_mempool_t *mpctx); -void -isc__mem_printactive(isc_mem_t *ctx0, FILE *file); -unsigned int -isc__mem_references(isc_mem_t *ctx0); - -#if ISC_MEM_TRACKLINES /*! * mctx must be locked. */ @@ -1024,7 +932,7 @@ destroy(isc__mem_t *ctx) { } void -isc__mem_attach(isc_mem_t *source0, isc_mem_t **targetp) { +isc_mem_attach(isc_mem_t *source0, isc_mem_t **targetp) { isc__mem_t *source = (isc__mem_t *)source0; REQUIRE(VALID_CONTEXT(source)); @@ -1038,7 +946,7 @@ isc__mem_attach(isc_mem_t *source0, isc_mem_t **targetp) { } void -isc__mem_detach(isc_mem_t **ctxp) { +isc_mem_detach(isc_mem_t **ctxp) { isc__mem_t *ctx; bool want_destroy = false; @@ -1070,7 +978,7 @@ isc__mem_detach(isc_mem_t **ctxp) { */ void -isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) { +isc__mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) { isc__mem_t *ctx; bool want_destroy = false; size_info *si; @@ -1133,7 +1041,7 @@ isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) { } void -isc__mem_destroy(isc_mem_t **ctxp) { +isc_mem_destroy(isc_mem_t **ctxp) { isc__mem_t *ctx; /* @@ -1160,7 +1068,7 @@ isc__mem_destroy(isc_mem_t **ctxp) { } void * -isc___mem_get(isc_mem_t *ctx0, size_t size FLARG) { +isc__mem_get(isc_mem_t *ctx0, size_t size FLARG) { isc__mem_t *ctx = (isc__mem_t *)ctx0; void *ptr; bool call_water = false; @@ -1204,7 +1112,7 @@ isc___mem_get(isc_mem_t *ctx0, size_t size FLARG) { } void -isc___mem_put(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { +isc__mem_put(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { isc__mem_t *ctx = (isc__mem_t *)ctx0; bool call_water = false; size_info *si; @@ -1256,7 +1164,7 @@ isc___mem_put(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { } void -isc__mem_waterack(isc_mem_t *ctx0, int flag) { +isc_mem_waterack(isc_mem_t *ctx0, int flag) { isc__mem_t *ctx = (isc__mem_t *)ctx0; REQUIRE(VALID_CONTEXT(ctx)); @@ -1418,7 +1326,7 @@ mem_allocateunlocked(isc_mem_t *ctx0, size_t size) { } void * -isc___mem_allocate(isc_mem_t *ctx0, size_t size FLARG) { +isc__mem_allocate(isc_mem_t *ctx0, size_t size FLARG) { isc__mem_t *ctx = (isc__mem_t *)ctx0; size_info *si; bool call_water = false; @@ -1458,7 +1366,7 @@ isc___mem_allocate(isc_mem_t *ctx0, size_t size FLARG) { } void * -isc___mem_reallocate(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { +isc__mem_reallocate(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { isc__mem_t *ctx = (isc__mem_t *)ctx0; void *new_ptr = NULL; size_t oldsize, copysize; @@ -1499,7 +1407,7 @@ isc___mem_reallocate(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { } void -isc___mem_free(isc_mem_t *ctx0, void *ptr FLARG) { +isc__mem_free(isc_mem_t *ctx0, void *ptr FLARG) { isc__mem_t *ctx = (isc__mem_t *)ctx0; size_info *si; size_t size; @@ -1557,7 +1465,7 @@ isc___mem_free(isc_mem_t *ctx0, void *ptr FLARG) { */ char * -isc___mem_strdup(isc_mem_t *mctx0, const char *s FLARG) { +isc__mem_strdup(isc_mem_t *mctx0, const char *s FLARG) { isc__mem_t *mctx = (isc__mem_t *)mctx0; size_t len; char *ns; @@ -1576,7 +1484,7 @@ isc___mem_strdup(isc_mem_t *mctx0, const char *s FLARG) { } void -isc__mem_setdestroycheck(isc_mem_t *ctx0, bool flag) { +isc_mem_setdestroycheck(isc_mem_t *ctx0, bool flag) { isc__mem_t *ctx = (isc__mem_t *)ctx0; REQUIRE(VALID_CONTEXT(ctx)); @@ -1619,7 +1527,7 @@ isc_mem_getquota(isc_mem_t *ctx0) { } size_t -isc__mem_inuse(isc_mem_t *ctx0) { +isc_mem_inuse(isc_mem_t *ctx0) { isc__mem_t *ctx = (isc__mem_t *)ctx0; size_t inuse; @@ -1634,7 +1542,7 @@ isc__mem_inuse(isc_mem_t *ctx0) { } size_t -isc__mem_maxinuse(isc_mem_t *ctx0) { +isc_mem_maxinuse(isc_mem_t *ctx0) { isc__mem_t *ctx = (isc__mem_t *)ctx0; size_t maxinuse; @@ -1649,7 +1557,7 @@ isc__mem_maxinuse(isc_mem_t *ctx0) { } size_t -isc__mem_total(isc_mem_t *ctx0) { +isc_mem_total(isc_mem_t *ctx0) { isc__mem_t *ctx = (isc__mem_t *)ctx0; size_t total; @@ -1664,7 +1572,7 @@ isc__mem_total(isc_mem_t *ctx0) { } void -isc__mem_setwater(isc_mem_t *ctx0, isc_mem_water_t water, void *water_arg, +isc_mem_setwater(isc_mem_t *ctx0, isc_mem_water_t water, void *water_arg, size_t hiwater, size_t lowater) { isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -1701,7 +1609,7 @@ isc__mem_setwater(isc_mem_t *ctx0, isc_mem_water_t water, void *water_arg, } bool -isc__mem_isovermem(isc_mem_t *ctx0) { +isc_mem_isovermem(isc_mem_t *ctx0) { isc__mem_t *ctx = (isc__mem_t *)ctx0; REQUIRE(VALID_CONTEXT(ctx)); @@ -1752,7 +1660,7 @@ isc_mem_gettag(isc_mem_t *ctx0) { */ isc_result_t -isc__mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) { +isc_mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) { isc__mem_t *mctx = (isc__mem_t *)mctx0; isc__mempool_t *mpctx; @@ -1795,7 +1703,7 @@ isc__mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) { } void -isc__mempool_setname(isc_mempool_t *mpctx0, const char *name) { +isc_mempool_setname(isc_mempool_t *mpctx0, const char *name) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; REQUIRE(name != NULL); @@ -1816,7 +1724,7 @@ isc__mempool_setname(isc_mempool_t *mpctx0, const char *name) { } void -isc__mempool_destroy(isc_mempool_t **mpctxp) { +isc_mempool_destroy(isc_mempool_t **mpctxp) { isc__mempool_t *mpctx; isc__mem_t *mctx; isc_mutex_t *lock; @@ -1880,7 +1788,7 @@ isc__mempool_destroy(isc_mempool_t **mpctxp) { } void -isc__mempool_associatelock(isc_mempool_t *mpctx0, isc_mutex_t *lock) { +isc_mempool_associatelock(isc_mempool_t *mpctx0, isc_mutex_t *lock) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; REQUIRE(VALID_MEMPOOL(mpctx)); @@ -1891,7 +1799,7 @@ isc__mempool_associatelock(isc_mempool_t *mpctx0, isc_mutex_t *lock) { } void * -isc___mempool_get(isc_mempool_t *mpctx0 FLARG) { +isc__mempool_get(isc_mempool_t *mpctx0 FLARG) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; element *item; isc__mem_t *mctx; @@ -1967,7 +1875,7 @@ isc___mempool_get(isc_mempool_t *mpctx0 FLARG) { /* coverity[+free : arg-1] */ void -isc___mempool_put(isc_mempool_t *mpctx0, void *mem FLARG) { +isc__mempool_put(isc_mempool_t *mpctx0, void *mem FLARG) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; isc__mem_t *mctx; element *item; @@ -2025,7 +1933,7 @@ isc___mempool_put(isc_mempool_t *mpctx0, void *mem FLARG) { */ void -isc__mempool_setfreemax(isc_mempool_t *mpctx0, unsigned int limit) { +isc_mempool_setfreemax(isc_mempool_t *mpctx0, unsigned int limit) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; REQUIRE(VALID_MEMPOOL(mpctx)); @@ -2076,7 +1984,7 @@ isc_mempool_getfreecount(isc_mempool_t *mpctx0) { } void -isc__mempool_setmaxalloc(isc_mempool_t *mpctx0, unsigned int limit) { +isc_mempool_setmaxalloc(isc_mempool_t *mpctx0, unsigned int limit) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; REQUIRE(limit > 0); @@ -2111,7 +2019,7 @@ isc_mempool_getmaxalloc(isc_mempool_t *mpctx0) { } unsigned int -isc__mempool_getallocated(isc_mempool_t *mpctx0) { +isc_mempool_getallocated(isc_mempool_t *mpctx0) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; unsigned int allocated; @@ -2129,7 +2037,7 @@ isc__mempool_getallocated(isc_mempool_t *mpctx0) { } void -isc__mempool_setfillcount(isc_mempool_t *mpctx0, unsigned int limit) { +isc_mempool_setfillcount(isc_mempool_t *mpctx0, unsigned int limit) { isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; REQUIRE(limit > 0); @@ -2164,7 +2072,7 @@ isc_mempool_getfillcount(isc_mempool_t *mpctx0) { } void -isc__mem_printactive(isc_mem_t *ctx0, FILE *file) { +isc_mem_printactive(isc_mem_t *ctx0, FILE *file) { #if ISC_MEM_TRACKLINES isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -2609,13 +2517,6 @@ isc_mem_renderjson(json_object *memobj) { } #endif /* HAVE_JSON */ -isc_result_t -isc__mem_create2(size_t init_max_size, size_t target_size, isc_mem_t **mctxp, - unsigned int flags) -{ - return (isc_mem_create2(init_max_size, target_size, mctxp, flags)); -} - isc_result_t isc_mem_create(size_t init_max_size, size_t target_size, isc_mem_t **mctxp) { return (isc_mem_createx2(init_max_size, target_size, @@ -2631,210 +2532,3 @@ isc_mem_create2(size_t init_max_size, size_t target_size, isc_mem_t **mctxp, default_memalloc, default_memfree, NULL, mctxp, flags)); } - -void -isc_mem_attach(isc_mem_t *source, isc_mem_t **targetp) { - REQUIRE(ISCAPI_MCTX_VALID(source)); - REQUIRE(targetp != NULL && *targetp == NULL); - - isc__mem_attach(source, targetp); - - ENSURE(*targetp == source); -} - -void -isc_mem_detach(isc_mem_t **mctxp) { - REQUIRE(mctxp != NULL && ISCAPI_MCTX_VALID(*mctxp)); - - isc__mem_detach(mctxp); - - ENSURE(*mctxp == NULL); -} - -void -isc_mem_destroy(isc_mem_t **mctxp) { - REQUIRE(mctxp != NULL && ISCAPI_MCTX_VALID(*mctxp)); - - isc__mem_destroy(mctxp); - - ENSURE(*mctxp == NULL); -} - -void -isc_mem_setdestroycheck(isc_mem_t *mctx, bool flag) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - isc__mem_setdestroycheck(mctx, flag); -} - -void -isc_mem_setwater(isc_mem_t *ctx, isc_mem_water_t water, void *water_arg, - size_t hiwater, size_t lowater) -{ - REQUIRE(ISCAPI_MCTX_VALID(ctx)); - - isc__mem_setwater(ctx, water, water_arg, hiwater, lowater); -} - -void -isc_mem_waterack(isc_mem_t *ctx, int flag) { - REQUIRE(ISCAPI_MCTX_VALID(ctx)); - - isc__mem_waterack(ctx, flag); -} - -size_t -isc_mem_inuse(isc_mem_t *mctx) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc__mem_inuse(mctx)); -} - -size_t -isc_mem_maxinuse(isc_mem_t *mctx) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc__mem_maxinuse(mctx)); -} - -size_t -isc_mem_total(isc_mem_t *mctx) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc__mem_total(mctx)); -} - -bool -isc_mem_isovermem(isc_mem_t *mctx) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc__mem_isovermem(mctx)); -} - - -isc_result_t -isc_mempool_create(isc_mem_t *mctx, size_t size, isc_mempool_t **mpctxp) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc__mempool_create(mctx, size, mpctxp)); -} - -void -isc_mempool_destroy(isc_mempool_t **mpctxp) { - REQUIRE(mpctxp != NULL && ISCAPI_MPOOL_VALID(*mpctxp)); - - isc__mempool_destroy(mpctxp); - - ENSURE(*mpctxp == NULL); -} - -unsigned int -isc_mempool_getallocated(isc_mempool_t *mpctx) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - return (isc__mempool_getallocated(mpctx)); -} - -void -isc_mempool_setmaxalloc(isc_mempool_t *mpctx, unsigned int limit) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - isc__mempool_setmaxalloc(mpctx, limit); -} - -void -isc_mempool_setfreemax(isc_mempool_t *mpctx, unsigned int limit) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - isc__mempool_setfreemax(mpctx, limit); -} - -void -isc_mempool_setname(isc_mempool_t *mpctx, const char *name) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - isc__mempool_setname(mpctx, name); -} - -void -isc_mempool_associatelock(isc_mempool_t *mpctx, isc_mutex_t *lock) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - isc__mempool_associatelock(mpctx, lock); -} - -void -isc_mempool_setfillcount(isc_mempool_t *mpctx, unsigned int limit) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - isc__mempool_setfillcount(mpctx, limit); -} - -void * -isc__mem_get(isc_mem_t *mctx, size_t size FLARG) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc___mem_get(mctx, size FLARG_PASS)); - -} - -void -isc__mem_put(isc_mem_t *mctx, void *ptr, size_t size FLARG) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - isc___mem_put(mctx, ptr, size FLARG_PASS); -} - -void -isc__mem_putanddetach(isc_mem_t **mctxp, void *ptr, size_t size FLARG) { - REQUIRE(mctxp != NULL && ISCAPI_MCTX_VALID(*mctxp)); - - isc___mem_putanddetach(mctxp, ptr, size FLARG_PASS); - - /* - * XXX: We cannot always ensure *mctxp == NULL here - * (see lib/isc/mem.c). - */ -} - -void * -isc__mem_allocate(isc_mem_t *mctx, size_t size FLARG) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc___mem_allocate(mctx, size FLARG_PASS)); -} - -void * -isc__mem_reallocate(isc_mem_t *mctx, void *ptr, size_t size FLARG) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc___mem_reallocate(mctx, ptr, size FLARG_PASS)); -} - -char * -isc__mem_strdup(isc_mem_t *mctx, const char *s FLARG) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - return (isc___mem_strdup(mctx, s FLARG_PASS)); -} - -void -isc__mem_free(isc_mem_t *mctx, void *ptr FLARG) { - REQUIRE(ISCAPI_MCTX_VALID(mctx)); - - isc___mem_free(mctx, ptr FLARG_PASS); -} - -void * -isc__mempool_get(isc_mempool_t *mpctx FLARG) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - return (isc___mempool_get(mpctx FLARG_PASS)); -} - -void -isc__mempool_put(isc_mempool_t *mpctx, void *mem FLARG) { - REQUIRE(ISCAPI_MPOOL_VALID(mpctx)); - - isc___mempool_put(mpctx, mem FLARG_PASS); -} diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c deleted file mode 100644 index 7b847a2d72d..00000000000 --- a/lib/isc/socket_api.c +++ /dev/null @@ -1,307 +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 http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -isc_result_t -isc_socketmgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx, - isc_socketmgr_t **managerp) -{ - isc_result_t result; - - result = isc__socketmgr_create(mctx, managerp); - - if (result == ISC_R_SUCCESS) - isc_appctx_setsocketmgr(actx, *managerp); - - return (result); -} - -isc_result_t -isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) { - return (isc__socketmgr_create(mctx, managerp)); -} - -void -isc_socketmgr_destroy(isc_socketmgr_t **managerp) { - REQUIRE(managerp != NULL && ISCAPI_SOCKETMGR_VALID(*managerp)); - - isc__socketmgr_destroy(managerp); - - ENSURE(*managerp == NULL); -} - -isc_result_t -isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, - isc_socket_t **socketp) -{ - REQUIRE(ISCAPI_SOCKETMGR_VALID(manager)); - - return (isc__socket_create(manager, pf, type, socketp)); -} - -void -isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - REQUIRE(socketp != NULL && *socketp == NULL); - - isc__socket_attach(sock, socketp); - - ENSURE(*socketp == sock); -} - -void -isc_socket_detach(isc_socket_t **socketp) { - REQUIRE(socketp != NULL && ISCAPI_SOCKET_VALID(*socketp)); - - isc__socket_detach(socketp); - - ENSURE(*socketp == NULL); -} - -isc_result_t -isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, - unsigned int options) -{ - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_bind(sock, sockaddr, options)); -} - -isc_result_t -isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, - isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) -{ - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_sendto(sock, region, task, - action, arg, address, pktinfo)); -} - -isc_result_t -isc_socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_connect(sock, addr, task, action, arg)); -} - -isc_result_t -isc_socket_recv(isc_socket_t *sock, isc_region_t *region, unsigned int minimum, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_recv(sock, region, minimum, - task, action, arg)); -} - -void -isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - isc__socket_cancel(sock, task, how); -} - -isc_result_t -isc_socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_getsockname(sock, addressp)); -} - -void -isc_socket_ipv6only(isc_socket_t *sock, bool yes) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - isc__socket_ipv6only(sock, yes); -} - -void -isc_socket_dscp(isc_socket_t *sock, isc_dscp_t dscp) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - isc__socket_dscp(sock, dscp); -} - -isc_sockettype_t -isc_socket_gettype(isc_socket_t *sock) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_gettype(sock)); -} - -void -isc_socket_setname(isc_socket_t *sock, const char *name, void *tag) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - UNUSED(sock); /* in case REQUIRE() is empty */ - UNUSED(name); - UNUSED(tag); -} - -isc_result_t -isc_socket_fdwatchcreate(isc_socketmgr_t *manager, int fd, int flags, - isc_sockfdwatch_t callback, void *cbarg, - isc_task_t *task, isc_socket_t **socketp) -{ - REQUIRE(ISCAPI_SOCKETMGR_VALID(manager)); - - return (isc__socket_fdwatchcreate(manager, fd, flags, - callback, cbarg, - task, socketp)); -} - -isc_result_t -isc_socket_fdwatchpoke(isc_socket_t *sock, int flags) -{ - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_fdwatchpoke(sock, flags)); -} - -isc_result_t -isc_socket_dup(isc_socket_t *sock, isc_socket_t **socketp) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - REQUIRE(socketp != NULL && *socketp == NULL); - - return (isc__socket_dup(sock, socketp)); -} - -int -isc_socket_getfd(isc_socket_t *sock) { - REQUIRE(ISCAPI_SOCKET_VALID(sock)); - - return (isc__socket_getfd(sock)); -} - -isc_result_t -isc_socket_open(isc_socket_t *sock) { - return (isc__socket_open(sock)); -} - -isc_result_t -isc_socket_close(isc_socket_t *sock) { - return (isc__socket_close(sock)); -} - -isc_result_t -isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, - unsigned int maxsocks) -{ - return (isc__socketmgr_create2(mctx, managerp, maxsocks)); -} - -isc_result_t -isc_socket_recvv(isc_socket_t *sock, isc_bufferlist_t *buflist, - unsigned int minimum, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ - return (isc__socket_recvv(sock, buflist, minimum, task, action, arg)); -} - -isc_result_t -isc_socket_recv2(isc_socket_t *sock, isc_region_t *region, - unsigned int minimum, isc_task_t *task, - isc_socketevent_t *event, unsigned int flags) -{ - return (isc__socket_recv2(sock, region, minimum, task, event, flags)); -} - -isc_result_t -isc_socket_send(isc_socket_t *sock, isc_region_t *region, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ - return (isc__socket_send(sock, region, task, action, arg)); -} - -isc_result_t -isc_socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ - return (isc__socket_sendv(sock, buflist, task, action, arg)); -} - -isc_result_t -isc_socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) -{ - return (isc__socket_sendtov(sock, buflist, task, action, arg, - address, pktinfo)); -} - -isc_result_t -isc_socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - unsigned int flags) -{ - return (isc__socket_sendtov2(sock, buflist, task, action, arg, - address, pktinfo, flags)); -} - -isc_result_t -isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, - isc_task_t *task, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - isc_socketevent_t *event, unsigned int flags) -{ - return (isc__socket_sendto2(sock, region, task, address, pktinfo, - event, flags)); -} - -void -isc_socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active) { - isc__socket_cleanunix(sockaddr, active); -} - -isc_result_t -isc_socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, - uint32_t owner, uint32_t group) -{ - return (isc__socket_permunix(sockaddr, perm, owner, group)); -} - -isc_result_t -isc_socket_filter(isc_socket_t *sock, const char *filter) { - return (isc__socket_filter(sock, filter)); -} - -isc_result_t -isc_socket_listen(isc_socket_t *sock, unsigned int backlog) { - return (isc__socket_listen(sock, backlog)); -} - -isc_result_t -isc_socket_accept(isc_socket_t *sock, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ - return (isc__socket_accept(sock, task, action, arg)); -} - -isc_result_t -isc_socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) { - return (isc__socket_getpeername(sock, addressp)); -} diff --git a/lib/isc/task.c b/lib/isc/task.c index 8f81aef2985..1d03e791273 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -152,6 +152,12 @@ struct isc__taskmgr { isc__task_t *excl; }; +void +isc__taskmgr_pause(isc_taskmgr_t *manager0); +void +isc__taskmgr_resume(isc_taskmgr_t *manager0); + + #define DEFAULT_TASKMGR_QUANTUM 10 #define DEFAULT_DEFAULT_QUANTUM 5 #define FINISHED(m) ((m)->exiting && EMPTY((m)->tasks)) @@ -339,7 +345,7 @@ task_shutdown(isc__task_t *task) { static inline void task_ready(isc__task_t *task) { isc__taskmgr_t *manager = task->manager; - bool has_privilege = isc__task_privilege((isc_task_t *) task); + bool has_privilege = isc_task_privilege((isc_task_t *) task); REQUIRE(VALID_MANAGER(manager)); REQUIRE(task->state == task_state_ready); @@ -879,10 +885,6 @@ push_readyq(isc__taskmgr_t *manager, isc__task_t *task) { static void dispatch(isc__taskmgr_t *manager) { isc__task_t *task; - unsigned int total_dispatch_count = 0; - isc__tasklist_t new_ready_tasks; - isc__tasklist_t new_priority_tasks; - REQUIRE(VALID_MANAGER(manager)); @@ -936,8 +938,6 @@ dispatch(isc__taskmgr_t *manager) { * unlocks. The while expression is always protected by the lock. */ - ISC_LIST_INIT(new_ready_tasks); - ISC_LIST_INIT(new_priority_tasks); LOCK(&manager->lock); while (!FINISHED(manager)) { @@ -1404,7 +1404,7 @@ isc_taskmgr_mode(isc_taskmgr_t *manager0) { } void -isc_taskmgr_pause(isc_taskmgr_t *manager0) { +isc__taskmgr_pause(isc_taskmgr_t *manager0) { isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; manager->pause_requested = true; LOCK(&manager->lock); @@ -1415,7 +1415,7 @@ isc_taskmgr_pause(isc_taskmgr_t *manager0) { } void -isc_taskmgr_resume(isc_taskmgr_t *manager0) { +isc__taskmgr_resume(isc_taskmgr_t *manager0) { isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; LOCK(&manager->lock); @@ -1528,7 +1528,7 @@ isc_task_setprivilege(isc_task_t *task0, bool priv) { bool isc_task_privilege(isc_task_t *task0) { isc__task_t *task = (isc__task_t *)task0; - isc_boolean_t priv; + bool priv; REQUIRE(VALID_TASK(task)); LOCK(&task->lock); diff --git a/lib/isc/tests/mem_test.c b/lib/isc/tests/mem_test.c index a32b33ae5a8..e461372c2ba 100644 --- a/lib/isc/tests/mem_test.c +++ b/lib/isc/tests/mem_test.c @@ -273,7 +273,7 @@ ATF_TC_BODY(isc_mem_noflags, tc) { isc_mem_debugging = 0; ptr = isc_mem_get(mctx2, 2048); ATF_CHECK(ptr != NULL); - isc__mem_printactive(mctx2, f); + isc_mem_printactive(mctx2, f); isc_mem_put(mctx2, ptr, 2048); isc_mem_destroy(&mctx2); isc_stdio_close(f); @@ -324,7 +324,7 @@ ATF_TC_BODY(isc_mem_recordflag, tc) { ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ptr = isc_mem_get(mctx2, 2048); ATF_CHECK(ptr != NULL); - isc__mem_printactive(mctx2, f); + isc_mem_printactive(mctx2, f); isc_mem_put(mctx2, ptr, 2048); isc_mem_destroy(&mctx2); isc_stdio_close(f); @@ -375,7 +375,7 @@ ATF_TC_BODY(isc_mem_traceflag, tc) { ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ptr = isc_mem_get(mctx2, 2048); ATF_CHECK(ptr != NULL); - isc__mem_printactive(mctx2, f); + isc_mem_printactive(mctx2, f); isc_mem_put(mctx2, ptr, 2048); isc_mem_destroy(&mctx2); isc_stdio_close(f); diff --git a/lib/isc/timer.c b/lib/isc/timer.c index f20fcd0367c..89216267ad5 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -97,35 +97,8 @@ struct isc__timermgr { isc_heap_t * heap; }; -/*% - * The following are intended for internal use (indicated by "isc__" - * prefix) but are not declared as static, allowing direct access from - * unit tests etc. - */ - -isc_result_t -isc__timer_create(isc_timermgr_t *manager, isc_timertype_t type, - const isc_time_t *expires, const isc_interval_t *interval, - isc_task_t *task, isc_taskaction_t action, void *arg, - isc_timer_t **timerp); -isc_result_t -isc__timer_reset(isc_timer_t *timer, isc_timertype_t type, - const isc_time_t *expires, const isc_interval_t *interval, - bool purge); -isc_timertype_t -isc_timer_gettype(isc_timer_t *timer); -isc_result_t -isc__timer_touch(isc_timer_t *timer); -void -isc__timer_attach(isc_timer_t *timer0, isc_timer_t **timerp); -void -isc__timer_detach(isc_timer_t **timerp); -isc_result_t -isc__timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp); void isc_timermgr_poke(isc_timermgr_t *manager0); -void -isc__timermgr_destroy(isc_timermgr_t **managerp); static inline isc_result_t schedule(isc__timer_t *timer, isc_time_t *now, bool signal_ok) { @@ -303,10 +276,10 @@ destroy(isc__timer_t *timer) { } isc_result_t -isc__timer_create(isc_timermgr_t *manager0, isc_timertype_t type, - const isc_time_t *expires, const isc_interval_t *interval, - isc_task_t *task, isc_taskaction_t action, void *arg, - isc_timer_t **timerp) +isc_timer_create(isc_timermgr_t *manager0, isc_timertype_t type, + const isc_time_t *expires, const isc_interval_t *interval, + isc_task_t *task, isc_taskaction_t action, void *arg, + isc_timer_t **timerp) { isc__timermgr_t *manager = (isc__timermgr_t *)manager0; isc__timer_t *timer; @@ -424,7 +397,7 @@ isc__timer_create(isc_timermgr_t *manager0, isc_timertype_t type, } isc_result_t -isc__timer_reset(isc_timer_t *timer0, isc_timertype_t type, +isc_timer_reset(isc_timer_t *timer0, isc_timertype_t type, const isc_time_t *expires, const isc_interval_t *interval, bool purge) { @@ -514,7 +487,7 @@ isc_timer_gettype(isc_timer_t *timer0) { } isc_result_t -isc__timer_touch(isc_timer_t *timer0) { +isc_timer_touch(isc_timer_t *timer0) { isc__timer_t *timer = (isc__timer_t *)timer0; isc_result_t result; isc_time_t now; @@ -545,7 +518,7 @@ isc__timer_touch(isc_timer_t *timer0) { } void -isc__timer_attach(isc_timer_t *timer0, isc_timer_t **timerp) { +isc_timer_attach(isc_timer_t *timer0, isc_timer_t **timerp) { isc__timer_t *timer = (isc__timer_t *)timer0; /* @@ -563,7 +536,7 @@ isc__timer_attach(isc_timer_t *timer0, isc_timer_t **timerp) { } void -isc__timer_detach(isc_timer_t **timerp) { +isc_timer_detach(isc_timer_t **timerp) { isc__timer_t *timer; bool free_timer = false; @@ -777,7 +750,7 @@ set_index(void *what, unsigned int index) { } isc_result_t -isc__timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) { +isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) { isc__timermgr_t *manager; isc_result_t result; @@ -853,7 +826,7 @@ isc_timermgr_poke(isc_timermgr_t *manager0) { } void -isc__timermgr_destroy(isc_timermgr_t **managerp) { +isc_timermgr_destroy(isc_timermgr_t **managerp) { isc__timermgr_t *manager; isc_mem_t *mctx; @@ -907,73 +880,10 @@ isc_timermgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx, { isc_result_t result; - result = isc__timermgr_create(mctx, managerp); + result = isc_timermgr_create(mctx, managerp); if (result == ISC_R_SUCCESS) isc_appctx_settimermgr(actx, *managerp); return (result); } - -isc_result_t -isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) { - return (isc__timermgr_create(mctx, managerp)); -} - -void -isc_timermgr_destroy(isc_timermgr_t **managerp) { - REQUIRE(*managerp != NULL && ISCAPI_TIMERMGR_VALID(*managerp)); - - isc__timermgr_destroy(managerp); - - ENSURE(*managerp == NULL); -} - -isc_result_t -isc_timer_create(isc_timermgr_t *manager, isc_timertype_t type, - const isc_time_t *expires, const isc_interval_t *interval, - isc_task_t *task, isc_taskaction_t action, void *arg, - isc_timer_t **timerp) -{ - REQUIRE(ISCAPI_TIMERMGR_VALID(manager)); - - return (isc__timer_create(manager, type, expires, interval, - task, action, arg, timerp)); -} - -void -isc_timer_attach(isc_timer_t *timer, isc_timer_t **timerp) { - REQUIRE(ISCAPI_TIMER_VALID(timer)); - REQUIRE(timerp != NULL && *timerp == NULL); - - isc__timer_attach(timer, timerp); - - ENSURE(*timerp == timer); -} - -void -isc_timer_detach(isc_timer_t **timerp) { - REQUIRE(timerp != NULL && ISCAPI_TIMER_VALID(*timerp)); - - isc__timer_detach(timerp); - - ENSURE(*timerp == NULL); -} - -isc_result_t -isc_timer_reset(isc_timer_t *timer, isc_timertype_t type, - const isc_time_t *expires, const isc_interval_t *interval, - bool purge) -{ - REQUIRE(ISCAPI_TIMER_VALID(timer)); - - return (isc__timer_reset(timer, type, expires, - interval, purge)); -} - -isc_result_t -isc_timer_touch(isc_timer_t *timer) { - REQUIRE(ISCAPI_TIMER_VALID(timer)); - - return (isc__timer_touch(timer)); -} diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c index 3774473885a..3eeb2eb19a0 100644 --- a/lib/isc/unix/app.c +++ b/lib/isc/unix/app.c @@ -50,7 +50,7 @@ * as an event loop dispatching various events. */ static pthread_t blockedthread; -static isc_boolean_t is_running; +static bool is_running; /* * The application context of this module. This implementation actually @@ -493,13 +493,13 @@ isc_app_ctxrun(isc_appctx_t *ctx0) { isc_result_t isc_app_run(void) { isc_result_t result; - is_running = ISC_TRUE; + is_running = true; result = isc_app_ctxrun((isc_appctx_t *)&isc_g_appctx); - is_running = ISC_FALSE; + is_running = false; return result; } -isc_boolean_t +bool isc_app_isrunning() { return (is_running); } @@ -601,6 +601,7 @@ isc_app_ctxsuspend(isc_appctx_t *ctx0) { ctx->want_reload = true; else { ctx->want_reload = true; +#ifdef HAVE_LINUXTHREADS if (isc_bind9) { /* BIND9 internal, single context */ int result; diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index b7ced512b89..5f24f26f9c1 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -477,135 +478,6 @@ static void build_msghdr_recv(isc__socket_t *, char *, isc_socketevent_t *, static bool process_ctlfd(isc__socketmgr_t *manager); static void setdscp(isc__socket_t *sock, isc_dscp_t dscp); -/*% - * The following are intended for internal use (indicated by "isc__" - * prefix) but are not declared as static, allowing direct access from - * unit tests etc. - */ - -isc_result_t -isc__socket_open(isc_socket_t *sock0); -isc_result_t -isc__socket_close(isc_socket_t *sock0); -isc_result_t -isc__socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, - isc_socket_t **socketp); -void -isc__socket_attach(isc_socket_t *sock, isc_socket_t **socketp); -void -isc__socket_detach(isc_socket_t **socketp); -isc_result_t -isc__socket_recvv(isc_socket_t *sock, isc_bufferlist_t *buflist, - unsigned int minimum, isc_task_t *task, - isc_taskaction_t action, void *arg); -isc_result_t -isc__socket_recv(isc_socket_t *sock, isc_region_t *region, - unsigned int minimum, isc_task_t *task, - isc_taskaction_t action, void *arg); -isc_result_t -isc__socket_recv2(isc_socket_t *sock, isc_region_t *region, - unsigned int minimum, isc_task_t *task, - isc_socketevent_t *event, unsigned int flags); -isc_result_t -isc__socket_send(isc_socket_t *sock, isc_region_t *region, - isc_task_t *task, isc_taskaction_t action, void *arg); -isc_result_t -isc__socket_sendto(isc_socket_t *sock, isc_region_t *region, - isc_task_t *task, isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); -isc_result_t -isc__socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg); -isc_result_t -isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); -isc_result_t -isc__socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - unsigned int flags); -isc_result_t -isc__socket_sendto2(isc_socket_t *sock, isc_region_t *region, - isc_task_t *task, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - isc_socketevent_t *event, unsigned int flags); -isc_socketevent_t * -isc_socket_socketevent(isc_mem_t *mctx, void *sender, - isc_eventtype_t eventtype, isc_taskaction_t action, - void *arg); - -void -isc__socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active); -isc_result_t -isc__socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, - uint32_t owner, uint32_t group); -isc_result_t -isc__socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, - unsigned int options); -isc_result_t -isc__socket_filter(isc_socket_t *sock, const char *filter); -isc_result_t -isc__socket_listen(isc_socket_t *sock, unsigned int backlog); -isc_result_t -isc__socket_accept(isc_socket_t *sock, - isc_task_t *task, isc_taskaction_t action, void *arg); -isc_result_t -isc__socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, - isc_task_t *task, isc_taskaction_t action, - void *arg); -isc_result_t -isc__socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp); -isc_result_t -isc__socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp); -void -isc__socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how); -isc_sockettype_t -isc__socket_gettype(isc_socket_t *sock); -bool -isc__socket_isbound(isc_socket_t *sock); -void -isc__socket_ipv6only(isc_socket_t *sock, bool yes); -void -isc__socket_dscp(isc_socket_t *sock, isc_dscp_t dscp); -isc_result_t -isc__socket_fdwatchcreate(isc_socketmgr_t *manager, int fd, int flags, - isc_sockfdwatch_t callback, void *cbarg, - isc_task_t *task, isc_socket_t **socketp); -isc_result_t -isc__socket_fdwatchpoke(isc_socket_t *sock, int flags); -isc_result_t -isc__socket_dup(isc_socket_t *sock, isc_socket_t **socketp); -int -isc__socket_getfd(isc_socket_t *sock); - -isc_result_t -isc__socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp); -isc_result_t -isc__socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, - unsigned int maxsocks); -isc_result_t -isc_socketmgr_getmaxsockets(isc_socketmgr_t *manager0, unsigned int *nsockp); -void -isc_socketmgr_setstats(isc_socketmgr_t *manager0, isc_stats_t *stats); -void -isc__socketmgr_destroy(isc_socketmgr_t **managerp); -void -isc__socket_setname(isc_socket_t *socket0, const char *name, void *tag); -const char * -isc__socket_getname(isc_socket_t *socket0); -void * -isc__socket_gettag(isc_socket_t *socket0); - -#ifdef HAVE_LIBXML2 -void -isc__socketmgr_renderxml(isc_socketmgr_t *mgr0, xmlTextWriterPtr writer); -#endif -#ifdef HAVE_JSON -isc_result_t -isc__socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats); -#endif - #define SELECT_POKE_SHUTDOWN (-1) #define SELECT_POKE_NOTHING (-2) #define SELECT_POKE_READ (-3) @@ -2908,7 +2780,7 @@ socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, * in 'socketp'. */ isc_result_t -isc__socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, +isc_socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, isc_socket_t **socketp) { return (socket_create(manager0, pf, type, socketp, NULL)); @@ -2919,7 +2791,7 @@ isc__socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, * in 'socketp'. */ isc_result_t -isc__socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) { +isc_socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -2931,7 +2803,7 @@ isc__socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) { } isc_result_t -isc__socket_open(isc_socket_t *sock0) { +isc_socket_open(isc_socket_t *sock0) { isc_result_t result; isc__socket_t *sock = (isc__socket_t *)sock0; @@ -2984,7 +2856,7 @@ isc__socket_open(isc_socket_t *sock0) { * in 'socketp'. */ isc_result_t -isc__socket_fdwatchcreate(isc_socketmgr_t *manager0, int fd, int flags, +isc_socket_fdwatchcreate(isc_socketmgr_t *manager0, int fd, int flags, isc_sockfdwatch_t callback, void *cbarg, isc_task_t *task, isc_socket_t **socketp) { @@ -3054,7 +2926,7 @@ isc__socket_fdwatchcreate(isc_socketmgr_t *manager0, int fd, int flags, */ isc_result_t -isc__socket_fdwatchpoke(isc_socket_t *sock0, int flags) +isc_socket_fdwatchpoke(isc_socket_t *sock0, int flags) { isc__socket_t *sock = (isc__socket_t *)sock0; @@ -3088,7 +2960,7 @@ isc__socket_fdwatchpoke(isc_socket_t *sock0, int flags) * Attach to a socket. Caller must explicitly detach when it is done. */ void -isc__socket_attach(isc_socket_t *sock0, isc_socket_t **socketp) { +isc_socket_attach(isc_socket_t *sock0, isc_socket_t **socketp) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -3106,7 +2978,7 @@ isc__socket_attach(isc_socket_t *sock0, isc_socket_t **socketp) { * up by destroying the socket. */ void -isc__socket_detach(isc_socket_t **socketp) { +isc_socket_detach(isc_socket_t **socketp) { isc__socket_t *sock; bool kill_socket = false; @@ -3128,7 +3000,7 @@ isc__socket_detach(isc_socket_t **socketp) { } isc_result_t -isc__socket_close(isc_socket_t *sock0) { +isc_socket_close(isc_socket_t *sock0) { isc__socket_t *sock = (isc__socket_t *)sock0; int fd; isc__socketmgr_t *manager; @@ -4239,7 +4111,7 @@ watcher(void *uap) { } void -isc__socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) { +isc_socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) { isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; REQUIRE(VALID_MANAGER(manager)); @@ -4248,7 +4120,7 @@ isc__socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) { } void -isc__socketmgr_maxudp(isc_socketmgr_t *manager0, int maxudp) { +isc_socketmgr_maxudp(isc_socketmgr_t *manager0, int maxudp) { isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; REQUIRE(VALID_MANAGER(manager)); @@ -4460,12 +4332,12 @@ cleanup_watcher(isc_mem_t *mctx, isc__socketmgr_t *manager) { } isc_result_t -isc__socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) { - return (isc__socketmgr_create2(mctx, managerp, 0)); +isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) { + return (isc_socketmgr_create2(mctx, managerp, 0)); } isc_result_t -isc__socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, +isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, unsigned int maxsocks) { int i; @@ -4652,7 +4524,7 @@ isc_socketmgr_setstats(isc_socketmgr_t *manager0, isc_stats_t *stats) { } void -isc__socketmgr_destroy(isc_socketmgr_t **managerp) { +isc_socketmgr_destroy(isc_socketmgr_t **managerp) { isc__socketmgr_t *manager; int i; isc_mem_t *mctx; @@ -4812,7 +4684,7 @@ socket_recv(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, } isc_result_t -isc__socket_recvv(isc_socket_t *sock0, isc_bufferlist_t *buflist, +isc_socket_recvv(isc_socket_t *sock0, isc_bufferlist_t *buflist, unsigned int minimum, isc_task_t *task, isc_taskaction_t action, void *arg) { @@ -4867,7 +4739,7 @@ isc__socket_recvv(isc_socket_t *sock0, isc_bufferlist_t *buflist, } isc_result_t -isc__socket_recv(isc_socket_t *sock0, isc_region_t *region, +isc_socket_recv(isc_socket_t *sock0, isc_region_t *region, unsigned int minimum, isc_task_t *task, isc_taskaction_t action, void *arg) { @@ -4888,11 +4760,11 @@ isc__socket_recv(isc_socket_t *sock0, isc_region_t *region, if (dev == NULL) return (ISC_R_NOMEMORY); - return (isc__socket_recv2(sock0, region, minimum, task, dev, 0)); + return (isc_socket_recv2(sock0, region, minimum, task, dev, 0)); } isc_result_t -isc__socket_recv2(isc_socket_t *sock0, isc_region_t *region, +isc_socket_recv2(isc_socket_t *sock0, isc_region_t *region, unsigned int minimum, isc_task_t *task, isc_socketevent_t *event, unsigned int flags) { @@ -5016,18 +4888,18 @@ socket_send(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, } isc_result_t -isc__socket_send(isc_socket_t *sock, isc_region_t *region, +isc_socket_send(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg) { /* * REQUIRE() checking is performed in isc_socket_sendto(). */ - return (isc__socket_sendto(sock, region, task, action, arg, NULL, + return (isc_socket_sendto(sock, region, task, action, arg, NULL, NULL)); } isc_result_t -isc__socket_sendto(isc_socket_t *sock0, isc_region_t *region, +isc_socket_sendto(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { @@ -5056,24 +4928,24 @@ isc__socket_sendto(isc_socket_t *sock0, isc_region_t *region, } isc_result_t -isc__socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, +isc_socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg) { - return (isc__socket_sendtov2(sock, buflist, task, action, arg, NULL, + return (isc_socket_sendtov2(sock, buflist, task, action, arg, NULL, NULL, 0)); } isc_result_t -isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, +isc_socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { - return (isc__socket_sendtov2(sock, buflist, task, action, arg, address, + return (isc_socket_sendtov2(sock, buflist, task, action, arg, address, pktinfo, 0)); } isc_result_t -isc__socket_sendtov2(isc_socket_t *sock0, isc_bufferlist_t *buflist, +isc_socket_sendtov2(isc_socket_t *sock0, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, unsigned int flags) @@ -5115,7 +4987,7 @@ isc__socket_sendtov2(isc_socket_t *sock0, isc_bufferlist_t *buflist, } isc_result_t -isc__socket_sendto2(isc_socket_t *sock0, isc_region_t *region, +isc_socket_sendto2(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, isc_socketevent_t *event, unsigned int flags) @@ -5138,7 +5010,7 @@ isc__socket_sendto2(isc_socket_t *sock0, isc_region_t *region, } void -isc__socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active) { +isc_socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active) { #ifdef ISC_PLATFORM_HAVESYSUNH int s; struct stat sb; @@ -5268,7 +5140,7 @@ isc__socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active) { } isc_result_t -isc__socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, +isc_socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, uint32_t owner, uint32_t group) { #ifdef ISC_PLATFORM_HAVESYSUNH @@ -5324,7 +5196,7 @@ isc__socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, } isc_result_t -isc__socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr, +isc_socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr, isc_socket_options_t options) { isc__socket_t *sock = (isc__socket_t *)sock0; @@ -5401,7 +5273,7 @@ isc__socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr, #undef ENABLE_ACCEPTFILTER isc_result_t -isc__socket_filter(isc_socket_t *sock0, const char *filter) { +isc_socket_filter(isc_socket_t *sock0, const char *filter) { isc__socket_t *sock = (isc__socket_t *)sock0; #if defined(SO_ACCEPTFILTER) && defined(ENABLE_ACCEPTFILTER) char strbuf[ISC_STRERRORSIZE]; @@ -5504,7 +5376,7 @@ set_tcp_fastopen(isc__socket_t *sock, unsigned int backlog) { * as well keep things simple rather than having to track them. */ isc_result_t -isc__socket_listen(isc_socket_t *sock0, unsigned int backlog) { +isc_socket_listen(isc_socket_t *sock0, unsigned int backlog) { isc__socket_t *sock = (isc__socket_t *)sock0; char strbuf[ISC_STRERRORSIZE]; @@ -5541,7 +5413,7 @@ isc__socket_listen(isc_socket_t *sock0, unsigned int backlog) { * This should try to do aggressive accept() XXXMLG */ isc_result_t -isc__socket_accept(isc_socket_t *sock0, +isc_socket_accept(isc_socket_t *sock0, isc_task_t *task, isc_taskaction_t action, void *arg) { isc__socket_t *sock = (isc__socket_t *)sock0; @@ -5616,7 +5488,7 @@ isc__socket_accept(isc_socket_t *sock0, } isc_result_t -isc__socket_connect(isc_socket_t *sock0, const isc_sockaddr_t *addr, +isc_socket_connect(isc_socket_t *sock0, const isc_sockaddr_t *addr, isc_task_t *task, isc_taskaction_t action, void *arg) { isc__socket_t *sock = (isc__socket_t *)sock0; @@ -5891,7 +5763,7 @@ internal_connect(isc_task_t *me, isc_event_t *ev) { } isc_result_t -isc__socket_getpeername(isc_socket_t *sock0, isc_sockaddr_t *addressp) { +isc_socket_getpeername(isc_socket_t *sock0, isc_sockaddr_t *addressp) { isc__socket_t *sock = (isc__socket_t *)sock0; isc_result_t result; @@ -5913,7 +5785,7 @@ isc__socket_getpeername(isc_socket_t *sock0, isc_sockaddr_t *addressp) { } isc_result_t -isc__socket_getsockname(isc_socket_t *sock0, isc_sockaddr_t *addressp) { +isc_socket_getsockname(isc_socket_t *sock0, isc_sockaddr_t *addressp) { isc__socket_t *sock = (isc__socket_t *)sock0; ISC_SOCKADDR_LEN_T len; isc_result_t result; @@ -5952,7 +5824,7 @@ isc__socket_getsockname(isc_socket_t *sock0, isc_sockaddr_t *addressp) { * queued for task "task" of type "how". "how" is a bitmask. */ void -isc__socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) { +isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -6072,7 +5944,7 @@ isc__socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) { } isc_sockettype_t -isc__socket_gettype(isc_socket_t *sock0) { +isc_socket_gettype(isc_socket_t *sock0) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -6080,22 +5952,7 @@ isc__socket_gettype(isc_socket_t *sock0) { return (sock->type); } -bool -isc__socket_isbound(isc_socket_t *sock0) { - isc__socket_t *sock = (isc__socket_t *)sock0; - bool val; - - REQUIRE(VALID_SOCKET(sock)); - - LOCK(&sock->lock); - val = ((sock->bound) ? true : false); - UNLOCK(&sock->lock); - - return (val); -} - -void -isc__socket_ipv6only(isc_socket_t *sock0, bool yes) { +isc_socket_ipv6only(isc_socket_t *sock0, bool yes) { isc__socket_t *sock = (isc__socket_t *)sock0; #if defined(IPV6_V6ONLY) int onoff = yes ? 1 : 0; @@ -6172,7 +6029,7 @@ setdscp(isc__socket_t *sock, isc_dscp_t dscp) { } void -isc__socket_dscp(isc_socket_t *sock0, isc_dscp_t dscp) { +isc_socket_dscp(isc_socket_t *sock0, isc_dscp_t dscp) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -6206,7 +6063,7 @@ isc_socket_socketevent(isc_mem_t *mctx, void *sender, } void -isc__socket_setname(isc_socket_t *socket0, const char *name, void *tag) { +isc_socket_setname(isc_socket_t *socket0, const char *name, void *tag) { isc__socket_t *sock = (isc__socket_t *)socket0; /* @@ -6222,21 +6079,21 @@ isc__socket_setname(isc_socket_t *socket0, const char *name, void *tag) { } const char * -isc__socket_getname(isc_socket_t *socket0) { +isc_socket_getname(isc_socket_t *socket0) { isc__socket_t *sock = (isc__socket_t *)socket0; return (sock->name); } void * -isc__socket_gettag(isc_socket_t *socket0) { +isc_socket_gettag(isc_socket_t *socket0) { isc__socket_t *sock = (isc__socket_t *)socket0; return (sock->tag); } int -isc__socket_getfd(isc_socket_t *socket0) { +isc_socket_getfd(isc_socket_t *socket0) { isc__socket_t *sock = (isc__socket_t *)socket0; return ((short) sock->fd); @@ -6498,4 +6355,16 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats) { } #endif /* HAVE_JSON */ -#include "../socket_api.c" +isc_result_t +isc_socketmgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx, + isc_socketmgr_t **managerp) +{ + isc_result_t result; + + result = isc_socketmgr_create(mctx, managerp); + + if (result == ISC_R_SUCCESS) + isc_appctx_setsocketmgr(actx, *managerp); + + return (result); +} diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c index 665cee8e063..f553d81ad29 100644 --- a/lib/isc/win32/app.c +++ b/lib/isc/win32/app.c @@ -40,7 +40,7 @@ */ static isc_thread_t blockedthread; -static isc_boolean_t is_running; +static bool is_running; #define APPCTX_MAGIC ISC_MAGIC('A', 'p', 'c', 'x') #define VALID_APPCTX(c) ISC_MAGIC_VALID(c, APPCTX_MAGIC) @@ -259,7 +259,7 @@ isc_app_run(void) { return result; } -isc_boolean_t +bool isc_app_isrunning() { return (is_running); } diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in index aa4e71178f8..26a4fba7a38 100644 --- a/lib/isc/win32/libisc.def.in +++ b/lib/isc/win32/libisc.def.in @@ -9,25 +9,25 @@ closelog getpassphrase @END PKCS11 isc___socketmgr_maxudp -isc__app_block -isc__app_ctxfinish -isc__app_ctxonrun -isc__app_ctxrun -isc__app_ctxshutdown -isc__app_ctxstart -isc__app_ctxsuspend -isc__app_finish -isc__app_onrun -isc__app_reload -isc__app_run -isc__app_shutdown -isc__app_start -isc__app_unblock -isc__appctx_create -isc__appctx_destroy -isc__appctx_setsocketmgr -isc__appctx_settaskmgr -isc__appctx_settimermgr +isc_app_block +isc_app_ctxfinish +isc_app_ctxonrun +isc_app_ctxrun +isc_app_ctxshutdown +isc_app_ctxstart +isc_app_ctxsuspend +isc_app_finish +isc_app_onrun +isc_app_reload +isc_app_run +isc_app_shutdown +isc_app_start +isc_app_unblock +isc_appctx_create +isc_appctx_destroy +isc_appctx_setsocketmgr +isc_appctx_settaskmgr +isc_appctx_settimermgr isc__buffer_activeregion isc__buffer_add isc__buffer_availableregion @@ -51,61 +51,61 @@ isc__buffer_remainingregion isc__buffer_setactive isc__buffer_subtract isc__buffer_usedregion -isc__mem_allocate -isc__mem_free -isc__mem_get -isc__mem_printactive -isc__mem_put -isc__mem_putanddetach -isc__mem_reallocate -isc__mem_strdup -isc__mempool_get -isc__mempool_put -isc__socket_accept -isc__socket_attach -isc__socket_bind -isc__socket_cancel -isc__socket_cleanunix -isc__socket_close -isc__socket_connect -isc__socket_create -isc__socket_detach -isc__socket_dscp -isc__socket_dup -isc__socket_filter -isc__socket_getfd -isc__socket_getname -isc__socket_getpeername -isc__socket_getsockname -isc__socket_gettag -isc__socket_gettype -isc__socket_ipv6only -isc__socket_isbound -isc__socket_listen -isc__socket_open -isc__socket_permunix -isc__socket_recv -isc__socket_recv2 -isc__socket_recvv -isc__socket_register -isc__socket_send -isc__socket_sendto -isc__socket_sendto2 -isc__socket_sendtov -isc__socket_sendtov2 -isc__socket_sendv -isc__socket_setname -isc__socketmgr_create -isc__socketmgr_create2 -isc__socketmgr_destroy -isc__socketmgr_getmaxsockets -isc__socketmgr_setreserved -isc__socketmgr_setstats +isc_mem_allocate +isc_mem_free +isc_mem_get +isc_mem_printactive +isc_mem_put +isc_mem_putanddetach +isc_mem_reallocate +isc_mem_strdup +isc_mempool_get +isc_mempool_put +isc_socket_accept +isc_socket_attach +isc_socket_bind +isc_socket_cancel +isc_socket_cleanunix +isc_socket_close +isc_socket_connect +isc_socket_create +isc_socket_detach +isc_socket_dscp +isc_socket_dup +isc_socket_filter +isc_socket_getfd +isc_socket_getname +isc_socket_getpeername +isc_socket_getsockname +isc_socket_gettag +isc_socket_gettype +isc_socket_ipv6only +isc_socket_isbound +isc_socket_listen +isc_socket_open +isc_socket_permunix +isc_socket_recv +isc_socket_recv2 +isc_socket_recvv +isc_socket_register +isc_socket_send +isc_socket_sendto +isc_socket_sendto2 +isc_socket_sendtov +isc_socket_sendtov2 +isc_socket_sendv +isc_socket_setname +isc_socketmgr_create +isc_socketmgr_create2 +isc_socketmgr_destroy +isc_socketmgr_getmaxsockets +isc_socketmgr_setreserved +isc_socketmgr_setstats isc__strerror -isc__task_getname -isc__task_gettag -isc__task_unsendrange -isc__taskmgr_mode +isc_task_getname +isc_task_gettag +isc_task_unsendrange +isc_taskmgr_mode isc__taskmgr_pause isc__taskmgr_resume isc_aes128_crypt diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 1209292dfb1..5a0eac150c2 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -1811,19 +1811,19 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, if (dup_socket) { #ifndef ISC_ALLOW_MAPPED - isc__socket_ipv6only(sock, true); + isc_socket_ipv6only(sock, true); #endif if (dup_socket->bound) { isc_sockaddr_t local; - result = isc__socket_getsockname(dup_socket, &local); + result = isc_socket_getsockname(dup_socket, &local); if (result != ISC_R_SUCCESS) { isc_socket_close(sock); return (result); } - result = isc__socket_bind(sock, &local, - ISC_SOCKET_REUSEADDRESS); + result = isc_socket_bind(sock, &local, + ISC_SOCKET_REUSEADDRESS); if (result != ISC_R_SUCCESS) { isc_socket_close(sock); return (result); @@ -1849,14 +1849,14 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, } isc_result_t -isc__socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, +isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, isc_socket_t **socketp) { return (socket_create(manager, pf, type, socketp, NULL)); } isc_result_t -isc__socket_dup(isc_socket_t *sock, isc_socket_t **socketp) { +isc_socket_dup(isc_socket_t *sock, isc_socket_t **socketp) { REQUIRE(VALID_SOCKET(sock)); REQUIRE(socketp != NULL && *socketp == NULL); @@ -1876,7 +1876,7 @@ isc_socket_open(isc_socket_t *sock) { * Attach to a socket. Caller must explicitly detach when it is done. */ void -isc__socket_attach(isc_socket_t *sock, isc_socket_t **socketp) { +isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) { REQUIRE(VALID_SOCKET(sock)); REQUIRE(socketp != NULL && *socketp == NULL); @@ -1893,7 +1893,7 @@ isc__socket_attach(isc_socket_t *sock, isc_socket_t **socketp) { * up by destroying the socket. */ void -isc__socket_detach(isc_socket_t **socketp) { +isc_socket_detach(isc_socket_t **socketp) { isc_socket_t *sock; REQUIRE(socketp != NULL); @@ -2651,12 +2651,12 @@ SocketIoThread(LPVOID ThreadContext) { * Create a new socket manager. */ isc_result_t -isc__socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) { +isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) { return (isc_socketmgr_create2(mctx, managerp, 0)); } isc_result_t -isc__socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, +isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, unsigned int maxsocks) { isc_socketmgr_t *manager; @@ -2724,7 +2724,7 @@ isc_socketmgr_setstats(isc_socketmgr_t *manager, isc_stats_t *stats) { } void -isc__socketmgr_destroy(isc_socketmgr_t **managerp) { +isc_socketmgr_destroy(isc_socketmgr_t **managerp) { isc_socketmgr_t *manager; int i; isc_mem_t *mctx; @@ -2849,7 +2849,7 @@ socket_recv(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, } isc_result_t -isc__socket_recvv(isc_socket_t *sock, isc_bufferlist_t *buflist, +isc;_socket_recvv(isc_socket_t *sock, isc_bufferlist_t *buflist, unsigned int minimum, isc_task_t *task, isc_taskaction_t action, void *arg) { @@ -2920,7 +2920,7 @@ isc__socket_recvv(isc_socket_t *sock, isc_bufferlist_t *buflist, } isc_result_t -isc__socket_recv(isc_socket_t *sock, isc_region_t *region, +isc_socket_recv(isc_socket_t *sock, isc_region_t *region, unsigned int minimum, isc_task_t *task, isc_taskaction_t action, void *arg) { @@ -2959,7 +2959,7 @@ isc__socket_recv(isc_socket_t *sock, isc_region_t *region, } isc_result_t -isc__socket_recv2(isc_socket_t *sock, isc_region_t *region, +isc_socket_recv2(isc_socket_t *sock, isc_region_t *region, unsigned int minimum, isc_task_t *task, isc_socketevent_t *event, unsigned int flags) { @@ -3070,7 +3070,7 @@ socket_send(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, } isc_result_t -isc__socket_send(isc_socket_t *sock, isc_region_t *region, +isc_socket_send(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg) { /* @@ -3081,7 +3081,7 @@ isc__socket_send(isc_socket_t *sock, isc_region_t *region, } isc_result_t -isc__socket_sendto(isc_socket_t *sock, isc_region_t *region, +isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { @@ -3125,7 +3125,7 @@ isc__socket_sendto(isc_socket_t *sock, isc_region_t *region, } isc_result_t -isc__socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, +isc_socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg) { return (isc_socket_sendtov2(sock, buflist, task, action, arg, NULL, @@ -3133,8 +3133,8 @@ isc__socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, } isc_result_t -isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg, +isc_socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, + isc_task_t *task, isc_taskaction_t action, void *arg, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { return (isc_socket_sendtov2(sock, buflist, task, action, arg, address, @@ -3142,10 +3142,10 @@ isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, } isc_result_t -isc__socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, - isc_task_t *task, isc_taskaction_t action, void *arg, +isc_socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, + isc_task_t *task, isc_taskaction_t action, void *arg, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - unsigned int flags) + unsigned int flags) { isc_socketevent_t *dev; isc_socketmgr_t *manager; @@ -3199,9 +3199,9 @@ isc__socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, } isc_result_t -isc__socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - isc_socketevent_t *event, unsigned int flags) +isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + isc_socketevent_t *event, unsigned int flags) { isc_result_t ret; @@ -3233,8 +3233,8 @@ isc__socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, } isc_result_t -isc__socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, - isc_socket_options_t options) +isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, + isc_socket_options_t options) { int bind_errno; char strbuf[ISC_STRERRORSIZE]; @@ -3301,7 +3301,7 @@ isc__socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, } isc_result_t -isc__socket_filter(isc_socket_t *sock, const char *filter) { +isc_socket_filter(isc_socket_t *sock, const char *filter) { UNUSED(sock); UNUSED(filter); @@ -3320,7 +3320,7 @@ isc__socket_filter(isc_socket_t *sock, const char *filter) { * as well keep things simple rather than having to track them. */ isc_result_t -isc__socket_listen(isc_socket_t *sock, unsigned int backlog) { +isc_socket_listen(isc_socket_t *sock, unsigned int backlog) { char strbuf[ISC_STRERRORSIZE]; #if defined(ISC_PLATFORM_HAVETFO) && defined(TCP_FASTOPEN) char on = 1; @@ -3379,8 +3379,8 @@ isc__socket_listen(isc_socket_t *sock, unsigned int backlog) { * This should try to do aggressive accept() XXXMLG */ isc_result_t -isc__socket_accept(isc_socket_t *sock, - isc_task_t *task, isc_taskaction_t action, void *arg) +isc_socket_accept(isc_socket_t *sock, + isc_task_t *task, isc_taskaction_t action, void *arg) { isc_socket_newconnev_t *adev; isc_socketmgr_t *manager; @@ -3497,8 +3497,8 @@ isc__socket_accept(isc_socket_t *sock, } isc_result_t -isc__socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, - isc_task_t *task, isc_taskaction_t action, void *arg) +isc_socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, + isc_task_t *task, isc_taskaction_t action, void *arg) { char strbuf[ISC_STRERRORSIZE]; isc_socket_connev_t *cdev; @@ -3628,7 +3628,7 @@ isc__socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, } isc_result_t -isc__socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) { +isc_socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) { isc_result_t result; REQUIRE(VALID_SOCKET(sock)); @@ -3658,7 +3658,7 @@ isc__socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) { } isc_result_t -isc__socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) { +isc_socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) { ISC_SOCKADDR_LEN_T len; isc_result_t result; char strbuf[ISC_STRERRORSIZE]; @@ -3705,7 +3705,7 @@ isc__socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) { * queued for task "task" of type "how". "how" is a bitmask. */ void -isc__socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) { +isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) { REQUIRE(VALID_SOCKET(sock)); @@ -3831,7 +3831,7 @@ isc__socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) { } isc_sockettype_t -isc__socket_gettype(isc_socket_t *sock) { +isc_socket_gettype(isc_socket_t *sock) { isc_sockettype_t type; REQUIRE(VALID_SOCKET(sock)); @@ -3851,31 +3851,8 @@ isc__socket_gettype(isc_socket_t *sock) { return (type); } -bool -isc__socket_isbound(isc_socket_t *sock) { - bool val; - - REQUIRE(VALID_SOCKET(sock)); - - LOCK(&sock->lock); - CONSISTENT(sock); - - /* - * make sure that the socket's not closed - */ - if (sock->fd == INVALID_SOCKET) { - UNLOCK(&sock->lock); - return (false); - } - - val = ((sock->bound) ? true : false); - UNLOCK(&sock->lock); - - return (val); -} - void -isc__socket_ipv6only(isc_socket_t *sock, bool yes) { +isc_socket_ipv6only(isc_socket_t *sock, bool yes) { #if defined(IPV6_V6ONLY) int onoff = yes ? 1 : 0; #else @@ -3893,7 +3870,7 @@ isc__socket_ipv6only(isc_socket_t *sock, bool yes) { } void -isc__socket_dscp(isc_socket_t *sock, isc_dscp_t dscp) { +isc_socket_dscp(isc_socket_t *sock, isc_dscp_t dscp) { #if !defined(IP_TOS) && !defined(IPV6_TCLASS) UNUSED(dscp); #else @@ -3921,14 +3898,14 @@ isc__socket_dscp(isc_socket_t *sock, isc_dscp_t dscp) { } void -isc__socket_cleanunix(const isc_sockaddr_t *addr, bool active) { +isc_socket_cleanunix(const isc_sockaddr_t *addr, bool active) { UNUSED(addr); UNUSED(active); } isc_result_t -isc__socket_permunix(const isc_sockaddr_t *addr, uint32_t perm, - uint32_t owner, uint32_t group) +isc_socket_permunix(const isc_sockaddr_t *addr, uint32_t perm, + uint32_t owner, uint32_t group) { UNUSED(addr); UNUSED(perm); @@ -3938,7 +3915,7 @@ isc__socket_permunix(const isc_sockaddr_t *addr, uint32_t perm, } void -isc__socket_setname(isc_socket_t *socket, const char *name, void *tag) { +isc_socket_setname(isc_socket_t *socket, const char *name, void *tag) { /* * Name 'socket'. @@ -3953,33 +3930,26 @@ isc__socket_setname(isc_socket_t *socket, const char *name, void *tag) { } const char * -isc__socket_getname(isc_socket_t *socket) { +isc_socket_getname(isc_socket_t *socket) { return (socket->name); } void * -isc__socket_gettag(isc_socket_t *socket) { +isc_socket_gettag(isc_socket_t *socket) { return (socket->tag); } int -isc__socket_getfd(isc_socket_t *socket) { +isc_socket_getfd(isc_socket_t *socket) { return ((short) socket->fd); } void -isc__socketmgr_setreserved(isc_socketmgr_t *manager, uint32_t reserved) { +isc_socketmgr_setreserved(isc_socketmgr_t *manager, uint32_t reserved) { UNUSED(manager); UNUSED(reserved); } -void -isc___socketmgr_maxudp(isc_socketmgr_t *manager, int maxudp) { - - UNUSED(manager); - UNUSED(maxudp); -} - isc_socketevent_t * isc_socket_socketevent(isc_mem_t *mctx, void *sender, isc_eventtype_t eventtype, isc_taskaction_t action, @@ -4247,15 +4217,6 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr, json_object *stats) { } #endif /* HAVE_JSON */ -/* - * Replace ../socket_api.c - */ - -isc_result_t -isc__socket_register(void) { - return (ISC_R_SUCCESS); -} - isc_result_t isc_socketmgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx, isc_socketmgr_t **managerp) diff --git a/util/copyrights b/util/copyrights index 4ca29f714b5..7e756200f60 100644 --- a/util/copyrights +++ b/util/copyrights @@ -3407,7 +3407,6 @@ ./lib/isc/alpha/include/isc/Makefile.in MAKE 2007,2012,2015,2016,2018 ./lib/isc/alpha/include/isc/atomic.h C 2005,2007,2009,2016,2018 ./lib/isc/api X 1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 -./lib/isc/app_api.c C 2009,2013,2014,2015,2016,2018 ./lib/isc/assertions.c C 1997,1998,1999,2000,2001,2004,2005,2007,2008,2009,2015,2016,2018 ./lib/isc/backtrace-emptytbl.c C 2009,2016,2018 ./lib/isc/backtrace.c C 2009,2013,2014,2015,2016,2018 @@ -3603,7 +3602,6 @@ ./lib/isc/sha1.c C 2000,2001,2003,2004,2005,2007,2009,2011,2012,2014,2016,2017,2018 ./lib/isc/sha2.c C 2005,2006,2007,2009,2011,2012,2014,2016,2017,2018 ./lib/isc/sockaddr.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2010,2011,2012,2014,2015,2016,2017,2018 -./lib/isc/socket_api.c C 2009,2011,2012,2013,2014,2015,2016,2018 ./lib/isc/sparc64/Makefile.in MAKE 2007,2012,2016,2018 ./lib/isc/sparc64/include/Makefile.in MAKE 2007,2012,2016,2018 ./lib/isc/sparc64/include/isc/Makefile.in MAKE 2007,2012,2015,2016,2018