mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 01:59:26 +00:00
Code Issues Releases Wiki Activity

Convert the isc/tid.h to use own signed integer isc_tid_t type

Browse Source 
Change the internal type used for isc_tid unit to isc_tid_t to hide the
specific integer type being used for the 'tid'.  Internally, the signed
integer type is being used.  This allows us to have negatively indexed
arrays that works both for threads with assigned tid and the threads
with unassigned tid.  This should be used only in specific situations.
This commit is contained in:
Ondřej Surý 2025-06-04 17:54:20 +02:00
parent 2c58fe486b
commit 1032681af0
34 changed files with 152 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dns/badcache.c
View File

@ -254,7 +254,7 @@ dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name,
REQUIRE(name != NULL);
isc_loop_t *loop = isc_loop();
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
struct cds_list_head *lru = &bc->lru[tid];
isc_stdtime_t now = isc_stdtime_now();
@ -320,7 +320,7 @@ dns_badcache_find(dns_badcache_t *bc, const dns_name_t *name,
}
}
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
struct cds_list_head *lru = &bc->lru[tid];
bcentry_purge(ht, lru, now);

18
lib/dns/dispatch.c
View File

@ -110,7 +110,7 @@ struct dns_dispentry {
struct dns_dispatch {
/* Unlocked. */
unsigned int magic; /*%< magic */
uint32_t tid;
isc_tid_t tid;
isc_socktype_t socktype;
isc_refcount_t references;
isc_mem_t *mctx;
@ -186,7 +186,7 @@ static void
dispentry_cancel(dns_dispentry_t *resp, isc_result_t result);
static isc_result_t
dispatch_createudp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
uint32_t tid, dns_dispatch_t **dispp);
isc_tid_t tid, dns_dispatch_t **dispp);
static void
udp_startrecv(isc_nmhandle_t *handle, dns_dispentry_t *resp);
static void
@ -1102,7 +1102,7 @@ dns_dispatchmgr_getnetmgr(dns_dispatchmgr_t *mgr) {
* Allocate and set important limits.
*/
static void
dispatch_allocate(dns_dispatchmgr_t *mgr, isc_socktype_t type, uint32_t tid,
dispatch_allocate(dns_dispatchmgr_t *mgr, isc_socktype_t type, isc_tid_t tid,
dns_dispatch_t **dispp) {
dns_dispatch_t *disp = NULL;
@ -1168,7 +1168,7 @@ dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
dns_transport_t *transport, dns_dispatchopt_t options,
dns_dispatch_t **dispp) {
dns_dispatch_t *disp = NULL;
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
REQUIRE(VALID_DISPATCHMGR(mgr));
REQUIRE(destaddr != NULL);
@ -1229,7 +1229,7 @@ dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr,
dns_dispatch_t *disp_connected = NULL;
dns_dispatch_t *disp_fallback = NULL;
isc_result_t result = ISC_R_NOTFOUND;
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
REQUIRE(VALID_DISPATCHMGR(mgr));
REQUIRE(destaddr != NULL);
@ -1326,7 +1326,7 @@ dns_dispatch_createudp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
static isc_result_t
dispatch_createudp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
uint32_t tid, dns_dispatch_t **dispp) {
isc_tid_t tid, dns_dispatch_t **dispp) {
isc_result_t result = ISC_R_SUCCESS;
dns_dispatch_t *disp = NULL;
isc_sockaddr_t sa_any;
@ -1379,7 +1379,7 @@ dispatch_destroy_rcu(struct rcu_head *rcu_head) {
static void
dispatch_destroy(dns_dispatch_t *disp) {
dns_dispatchmgr_t *mgr = disp->mgr;
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
disp->magic = 0;
@ -2237,14 +2237,14 @@ dns_dispentry_getlocaladdress(dns_dispentry_t *resp, isc_sockaddr_t *addrp) {
dns_dispatch_t *
dns_dispatchset_get(dns_dispatchset_t *dset) {
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
/* check that dispatch set is configured */
if (dset == NULL || dset->ndisp == 0) {
return NULL;
}
INSIST(tid < dset->ndisp);
INSIST((uint32_t)tid < dset->ndisp);
return dset->dispatches[tid];
}

2
lib/dns/include/dns/qp.h
View File

@ -150,7 +150,7 @@ typedef struct dns_qpreader {
*/
typedef struct dns_qpread {
DNS_QPREADER_FIELDS;
uint32_t tid;
isc_tid_t tid;
} dns_qpread_t;
/*%

2
lib/dns/include/dns/validator.h
View File

@ -76,7 +76,7 @@ struct dns_validator {
unsigned int magic;
dns_view_t *view;
isc_loop_t *loop;
uint32_t tid;
isc_tid_t tid;
isc_refcount_t references;
/* Name and type of the response to be validated. */

2
lib/dns/include/dns/zone.h
View File

@ -145,7 +145,7 @@ typedef enum {
***/
void
dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx, unsigned int tid);
dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx, isc_tid_t tid);
/*%<
* Creates a new empty zone and attach '*zonep' to it.
*

3
lib/dns/qp.c
View File

@ -86,7 +86,8 @@ static atomic_uint_fast64_t rollback_time;
if (isc_log_wouldlog(ISC_LOG_DEBUG(7))) { \
isc_log_write(DNS_LOGCATEGORY_DATABASE, \
DNS_LOGMODULE_QP, ISC_LOG_DEBUG(7), \
"%s:%d:%s(qp %p uctx \"%s\"):t%u: " fmt, \
"%s:%d:%s(qp %p uctx \"%s\"):t%" PRItid \
": " fmt, \
__FILE__, __LINE__, __func__, qp, \
qp ? TRIENAME(qp) : "(null)", isc_tid(), \
##__VA_ARGS__); \

10
lib/dns/request.c
View File

@ -67,7 +67,7 @@ struct dns_request {
int32_t flags;
isc_loop_t *loop;
unsigned int tid;
isc_tid_t tid;
isc_result_t result;
isc_job_cb cb;
@ -172,10 +172,10 @@ dns_requestmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr,
static void
requests_cancel(void *arg) {
dns_requestmgr_t *requestmgr = arg;
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
ISC_LIST_FOREACH (requestmgr->requests[tid], request, link) {
req_log(ISC_LOG_DEBUG(3), "%s(%" PRIu32 ": request %p",
req_log(ISC_LOG_DEBUG(3), "%s(%" PRItid ": request %p",
__func__, tid, request);
if (DNS_REQUEST_COMPLETE(request)) {
/* The callback has been already scheduled */
@ -210,12 +210,12 @@ dns_requestmgr_shutdown(dns_requestmgr_t *requestmgr) {
*/
synchronize_rcu();
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
uint32_t nloops = isc_loopmgr_nloops(requestmgr->loopmgr);
for (size_t i = 0; i < nloops; i++) {
dns_requestmgr_ref(requestmgr);
if (i == tid) {
if (i == (uint32_t)tid) {
/* Run the current loop synchronously */
requests_cancel(requestmgr);
continue;

2
lib/dns/resolver.c
View File

@ -342,7 +342,7 @@ struct fetchctx {
isc_stdtime_t now;
isc_loop_t *loop;
unsigned int tid;
isc_tid_t tid;
dns_edectx_t edectx;

6
lib/dns/unreachcache.c
View File

@ -291,7 +291,7 @@ dns_unreachcache_add(dns_unreachcache_t *uc, const isc_sockaddr_t *remote,
REQUIRE(local != NULL);
isc_loop_t *loop = isc_loop();
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
struct cds_list_head *lru = &uc->lru[tid];
isc_stdtime_t now = isc_stdtime_now();
isc_stdtime_t expire = now + uc->expire_min_s;
@ -377,7 +377,7 @@ dns_unreachcache_find(dns_unreachcache_t *uc, const isc_sockaddr_t *remote,
result = ISC_R_SUCCESS;
}
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
struct cds_list_head *lru = &uc->lru[tid];
ucentry_purge(ht, lru, now);
@ -410,7 +410,7 @@ dns_unreachcache_remove(dns_unreachcache_t *uc, const isc_sockaddr_t *remote,
ucentry_evict(ht, found);
}
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
struct cds_list_head *lru = &uc->lru[tid];
ucentry_purge(ht, lru, now);

6
lib/dns/zone.c
View File

@ -288,7 +288,7 @@ struct dns_zone {
isc_rwlock_t dblock;
dns_db_t *db; /* Locked by dblock */
unsigned int tid;
isc_tid_t tid;
/* Locked */
dns_zonemgr_t *zmgr;
@ -1124,7 +1124,7 @@ inc_stats(dns_zone_t *zone, isc_statscounter_t counter) {
***/
void
dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx, unsigned int tid) {
dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx, isc_tid_t tid) {
isc_time_t now;
dns_zone_t *zone = NULL;
@ -19239,7 +19239,7 @@ isc_result_t
dns_zonemgr_createzone(dns_zonemgr_t *zmgr, dns_zone_t **zonep) {
isc_mem_t *mctx = NULL;
dns_zone_t *zone = NULL;
unsigned int tid;
isc_tid_t tid;
REQUIRE(DNS_ZONEMGR_VALID(zmgr));
REQUIRE(zonep != NULL && *zonep == NULL);

2
lib/isc/include/isc/loop.h
View File

@ -155,7 +155,7 @@ isc_loop_main(isc_loopmgr_t *loopmgr);
*/
isc_loop_t *
isc_loop_get(isc_loopmgr_t *loopmgr, uint32_t tid);
isc_loop_get(isc_loopmgr_t *loopmgr, isc_tid_t tid);
/*%<
* Return the loop object associated with the 'tid' threadid
*

2
lib/isc/include/isc/netmgr.h
View File

@ -917,7 +917,7 @@ isc_nm_verify_tls_peer_result_string(const isc_nmhandle_t *handle);
*/
void
isc__nm_force_tid(int tid);
isc__nm_force_tid(isc_tid_t tid);
/*%<
* Force the thread ID to 'tid'. This is STRICTLY for use in unit
* tests and should not be used in any production code.

106
lib/isc/include/isc/refcount.h
View File

@ -133,57 +133,61 @@ typedef atomic_uint_fast32_t isc_refcount_t;
#define ISC_REFCOUNT_STATIC_TRACE_DECL(name) \
ISC__REFCOUNT_TRACE_DECL(name, static inline)
#define ISC__REFCOUNT_TRACE_IMPL(name, destroy, stat) \
stat name##_t *name##__ref(name##_t *ptr, const char *func, \
const char *file, unsigned int line) { \
REQUIRE(ptr != NULL); \
uint_fast32_t refs = \
isc_refcount_increment(&ptr->references) + 1; \
fprintf(stderr, \
"%s:%s:%s:%u:t%u:%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
return (ptr); \
} \
\
stat void name##__unref(name##_t *ptr, const char *func, \
const char *file, unsigned int line) { \
REQUIRE(ptr != NULL); \
uint_fast32_t refs = \
isc_refcount_decrement(&ptr->references) - 1; \
if (refs == 0) { \
isc_refcount_destroy(&ptr->references); \
destroy(ptr); \
} \
fprintf(stderr, \
"%s:%s:%s:%u:t%u:%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
} \
stat void name##__attach(name##_t *ptr, name##_t **ptrp, \
const char *func, const char *file, \
unsigned int line) { \
REQUIRE(ptrp != NULL && *ptrp == NULL); \
uint_fast32_t refs = \
isc_refcount_increment(&ptr->references) + 1; \
fprintf(stderr, \
"%s:%s:%s:%u:t%u:%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
*ptrp = ptr; \
} \
\
stat void name##__detach(name##_t **ptrp, const char *func, \
const char *file, unsigned int line) { \
REQUIRE(ptrp != NULL && *ptrp != NULL); \
name##_t *ptr = *ptrp; \
*ptrp = NULL; \
uint_fast32_t refs = \
isc_refcount_decrement(&ptr->references) - 1; \
if (refs == 0) { \
isc_refcount_destroy(&ptr->references); \
destroy(ptr); \
} \
fprintf(stderr, \
"%s:%s:%s:%u:t%u:%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
#define ISC__REFCOUNT_TRACE_IMPL(name, destroy, stat) \
stat name##_t *name##__ref(name##_t *ptr, const char *func, \
const char *file, unsigned int line) { \
REQUIRE(ptr != NULL); \
uint_fast32_t refs = \
isc_refcount_increment(&ptr->references) + 1; \
fprintf(stderr, \
"%s:%s:%s:%u:t%" PRItid \
":%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
return (ptr); \
} \
\
stat void name##__unref(name##_t *ptr, const char *func, \
const char *file, unsigned int line) { \
REQUIRE(ptr != NULL); \
uint_fast32_t refs = \
isc_refcount_decrement(&ptr->references) - 1; \
if (refs == 0) { \
isc_refcount_destroy(&ptr->references); \
destroy(ptr); \
} \
fprintf(stderr, \
"%s:%s:%s:%u:t%" PRItid \
":%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
} \
stat void name##__attach(name##_t *ptr, name##_t **ptrp, \
const char *func, const char *file, \
unsigned int line) { \
REQUIRE(ptrp != NULL && *ptrp == NULL); \
uint_fast32_t refs = \
isc_refcount_increment(&ptr->references) + 1; \
fprintf(stderr, \
"%s:%s:%s:%u:t%" PRItid \
":%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
*ptrp = ptr; \
} \
\
stat void name##__detach(name##_t **ptrp, const char *func, \
const char *file, unsigned int line) { \
REQUIRE(ptrp != NULL && *ptrp != NULL); \
name##_t *ptr = *ptrp; \
*ptrp = NULL; \
uint_fast32_t refs = \
isc_refcount_decrement(&ptr->references) - 1; \
if (refs == 0) { \
isc_refcount_destroy(&ptr->references); \
destroy(ptr); \
} \
fprintf(stderr, \
"%s:%s:%s:%u:t%" PRItid \
":%p->references = %" PRIuFAST32 "\n", \
__func__, func, file, line, isc_tid(), ptr, refs); \
}
#define ISC_REFCOUNT_TRACE_IMPL(name, destroy) \

16
lib/isc/include/isc/tid.h
View File

@ -17,17 +17,21 @@
#include <isc/thread.h>
#define ISC_TID_UNKNOWN UINT32_MAX
typedef int32_t isc_tid_t;
uint32_t
#define PRItid PRId32
#define ISC_TID_UNKNOWN (isc_tid_t) - 1
isc_tid_t
isc_tid_count(void);
/*%<
* Returns the number of threads.
*/
extern thread_local uint32_t isc__tid_local;
extern thread_local isc_tid_t isc__tid_local;
static inline uint32_t
static inline isc_tid_t
isc_tid(void) {
return isc__tid_local;
}
@ -38,7 +42,7 @@ isc_tid(void) {
/* Private */
void
isc__tid_init(uint32_t tid);
isc__tid_init(isc_tid_t tid);
void
isc__tid_initcount(uint32_t count);
isc__tid_initcount(isc_tid_t count);

8
lib/isc/include/isc/uv.h
View File

@ -77,7 +77,7 @@ isc__uverr2result(int uverr, bool dolog, const char *file, unsigned int line,
#define uv_idle_init(loop, idle) \
({ \
int __r = uv_idle_init(loop, idle); \
fprintf(stderr, "%" PRIu32 ":%s_:uv_idle_init(%p, %p)\n", \
fprintf(stderr, "%" PRItid ":%s_:uv_idle_init(%p, %p)\n", \
isc_tid(), __func__, loop, idle); \
__r; \
})
@ -85,7 +85,7 @@ isc__uverr2result(int uverr, bool dolog, const char *file, unsigned int line,
#define uv_timer_init(loop, timer) \
({ \
int __r = uv_timer_init(loop, timer); \
fprintf(stderr, "%" PRIu32 ":%s_:uv_timer_init(%p, %p)\n", \
fprintf(stderr, "%" PRItid ":%s_:uv_timer_init(%p, %p)\n", \
isc_tid(), __func__, loop, timer); \
__r; \
})
@ -93,7 +93,7 @@ isc__uverr2result(int uverr, bool dolog, const char *file, unsigned int line,
#define uv_async_init(loop, async, async_cb) \
({ \
int __r = uv_async_init(loop, async, async_cb); \
fprintf(stderr, "%" PRIu32 ":%s_:uv_timer_init(%p, %p, %p)\n", \
fprintf(stderr, "%" PRItid ":%s_:uv_timer_init(%p, %p, %p)\n", \
isc_tid(), __func__, loop, async, async_cb); \
__r; \
})
@ -101,7 +101,7 @@ isc__uverr2result(int uverr, bool dolog, const char *file, unsigned int line,
#define uv_close(handle, close_cb) \
({ \
uv_close(handle, close_cb); \
fprintf(stderr, "%" PRIu32 ":%s_:uv_close(%p, %p)\n", \
fprintf(stderr, "%" PRItid ":%s_:uv_close(%p, %p)\n", \
isc_tid(), __func__, handle, close_cb); \
})

10
lib/isc/loop.c
View File

@ -187,7 +187,7 @@ shutdown_cb(uv_async_t *handle) {
}
static void
loop_init(isc_loop_t *loop, isc_loopmgr_t *loopmgr, uint32_t tid,
loop_init(isc_loop_t *loop, isc_loopmgr_t *loopmgr, isc_tid_t tid,
const char *kind) {
*loop = (isc_loop_t){
.tid = tid,
@ -306,7 +306,7 @@ loop_thread(void *arg) {
/* Start the helper thread */
isc_thread_create(helper_thread, helper, &helper->thread);
snprintf(name, sizeof(name), "isc-helper-%04" PRIu32, loop->tid);
snprintf(name, sizeof(name), "isc-helper-%04" PRItid, loop->tid);
isc_thread_setname(helper->thread, name);
int r = uv_prepare_start(&loop->quiescent, quiescent_cb);
@ -535,7 +535,7 @@ isc_loopmgr_pause(isc_loopmgr_t *loopmgr) {
isc_loop_t *loop = &loopmgr->loops[i];
/* Skip current loop */
if (i == isc_tid()) {
if (i == (size_t)isc_tid()) {
continue;
}
@ -645,9 +645,9 @@ isc_loop_main(isc_loopmgr_t *loopmgr) {
}
isc_loop_t *
isc_loop_get(isc_loopmgr_t *loopmgr, uint32_t tid) {
isc_loop_get(isc_loopmgr_t *loopmgr, isc_tid_t tid) {
REQUIRE(VALID_LOOPMGR(loopmgr));
REQUIRE(tid < loopmgr->nloops);
REQUIRE((uint32_t)tid < loopmgr->nloops);
return LOOP(loopmgr, tid);
}

2
lib/isc/loop_p.h
View File

@ -46,7 +46,7 @@ struct isc_loop {
isc_loopmgr_t *loopmgr;
uv_loop_t loop;
uint32_t tid;
isc_tid_t tid;
isc_mem_t *mctx;

6
lib/isc/netmgr/http.c
View File

@ -304,7 +304,7 @@ static void
http_cleanup_listener_endpoints(isc_nmsocket_t *listener);
static isc_nm_http_endpoints_t *
http_get_listener_endpoints(isc_nmsocket_t *listener, const int tid);
http_get_listener_endpoints(isc_nmsocket_t *listener, const isc_tid_t tid);
static void
http_initsocket(isc_nmsocket_t *sock);
@ -3385,7 +3385,7 @@ typedef struct http_endpoints_data {
static void
http_set_endpoints_cb(void *arg) {
http_endpoints_data_t *data = arg;
const int tid = isc_tid();
const isc_tid_t tid = isc_tid();
isc_nmsocket_t *listener = data->listener;
isc_nm_http_endpoints_t *endpoints = data->endpoints;
isc__networker_t *worker = &listener->worker->netmgr->workers[tid];
@ -3470,7 +3470,7 @@ http_cleanup_listener_endpoints(isc_nmsocket_t *listener) {
}
static isc_nm_http_endpoints_t *
http_get_listener_endpoints(isc_nmsocket_t *listener, const int tid) {
http_get_listener_endpoints(isc_nmsocket_t *listener, const isc_tid_t tid) {
isc_nm_http_endpoints_t *eps;
REQUIRE(VALID_NMSOCK(listener));
REQUIRE(tid >= 0);

8
lib/isc/netmgr/netmgr-int.h
View File

@ -151,8 +151,8 @@ STATIC_ASSERT(ISC_NETMGR_TCP_RECVBUF_SIZE <= ISC_NETMGR_RECVBUF_SIZE,
#define gettid() (uint64_t)(pthread_self())
#endif
#define NETMGR_TRACE_LOG(format, ...) \
fprintf(stderr, "%" PRIu64 ":%d:%s:%u:%s:" format, gettid(), \
#define NETMGR_TRACE_LOG(format, ...) \
fprintf(stderr, "%" PRIu64 ":%" PRItid ":%s:%u:%s:" format, gettid(), \
isc_tid(), file, line, func, __VA_ARGS__)
#define FLARG \
@ -496,7 +496,7 @@ typedef void (*isc_nm_closehandlecb_t)(void *arg);
struct isc_nmsocket {
/*% Unlocked, RO */
int magic;
uint32_t tid;
isc_tid_t tid;
isc_refcount_t references;
isc_nmsocket_type type;
isc__networker_t *worker;
@ -1008,7 +1008,7 @@ isc__nmhandle_tls_keepalive(isc_nmhandle_t *handle, bool value);
void
isc__nm_async_tls_set_tlsctx(isc_nmsocket_t *listener, isc_tlsctx_t *tlsctx,
const int tid);
const isc_tid_t tid);
void
isc__nmhandle_tls_setwritetimeout(isc_nmhandle_t *handle,

12
lib/isc/netmgr/netmgr.c
View File

@ -118,9 +118,10 @@ networker_teardown(void *arg) {
worker->shuttingdown = true;
isc__netmgr_log(worker->netmgr, ISC_LOG_DEBUG(1),
"Shutting down network manager worker on loop %p(%d)",
loop, isc_tid());
isc__netmgr_log(
worker->netmgr, ISC_LOG_DEBUG(1),
"Shutting down network manager worker on loop %p(%" PRItid ")",
loop, isc_tid());
uv_walk(&loop->loop, shutdown_walk_cb, NULL);
@ -2558,7 +2559,7 @@ typedef struct settlsctx_data {
static void
settlsctx_cb(void *arg) {
settlsctx_data_t *data = arg;
const uint32_t tid = isc_tid();
const isc_tid_t tid = isc_tid();
isc_nmsocket_t *listener = data->listener;
isc_tlsctx_t *tlsctx = data->tlsctx;
isc__networker_t *worker = &listener->worker->netmgr->workers[tid];
@ -2666,7 +2667,8 @@ isc__networker_destroy(isc__networker_t *worker) {
worker->netmgr = NULL;
isc__netmgr_log(netmgr, ISC_LOG_DEBUG(1),
"Destroying network manager worker on loop %p(%d)",
"Destroying network manager worker on loop %p(%" PRItid
")",
worker->loop, isc_tid());
isc_loop_detach(&worker->loop);

2
lib/isc/netmgr/proxyudp.c
View File

@ -491,7 +491,7 @@ static void
stop_proxyudp_child_job(void *arg) {
isc_nmsocket_t *listener = NULL;
isc_nmsocket_t *sock = arg;
uint32_t tid = 0;
isc_tid_t tid = 0;
if (sock == NULL) {
return;

2
lib/isc/netmgr/streamdns.c
View File

@ -700,7 +700,7 @@ streamdns_accept_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
isc_nmsocket_t *listensock = (isc_nmsocket_t *)cbarg;
isc_nmsocket_t *nsock;
isc_sockaddr_t iface;
int tid = isc_tid();
isc_tid_t tid = isc_tid();
REQUIRE(VALID_NMHANDLE(handle));
REQUIRE(VALID_NMSOCK(handle->sock));

2
lib/isc/netmgr/tcp.c
View File

@ -442,7 +442,7 @@ done_result:
static void
start_tcp_child(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nmsocket_t *sock,
uv_os_sock_t fd, int tid) {
uv_os_sock_t fd, isc_tid_t tid) {
isc_nmsocket_t *csock = &sock->children[tid];
isc__networker_t *worker = &mgr->workers[tid];

6
lib/isc/netmgr/tlsstream.c
View File

@ -126,7 +126,7 @@ static void
tls_cleanup_listener_tlsctx(isc_nmsocket_t *listener);
static isc_tlsctx_t *
tls_get_listener_tlsctx(isc_nmsocket_t *listener, const int tid);
tls_get_listener_tlsctx(isc_nmsocket_t *listener, const isc_tid_t tid);
static void
tls_keep_client_tls_session(isc_nmsocket_t *sock);
@ -1548,7 +1548,7 @@ tls_cleanup_listener_tlsctx(isc_nmsocket_t *listener) {
}
static isc_tlsctx_t *
tls_get_listener_tlsctx(isc_nmsocket_t *listener, const int tid) {
tls_get_listener_tlsctx(isc_nmsocket_t *listener, const isc_tid_t tid) {
REQUIRE(VALID_NMSOCK(listener));
REQUIRE(tid >= 0);
@ -1561,7 +1561,7 @@ tls_get_listener_tlsctx(isc_nmsocket_t *listener, const int tid) {
void
isc__nm_async_tls_set_tlsctx(isc_nmsocket_t *listener, isc_tlsctx_t *tlsctx,
const int tid) {
const isc_tid_t tid) {
REQUIRE(tid >= 0);
isc_tlsctx_free(&listener->tlsstream.listener_tls_ctx[tid]);

2
lib/isc/netmgr/udp.c
View File

@ -180,7 +180,7 @@ done:
static void
start_udp_child(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nmsocket_t *sock,
uv_os_sock_t fd, int tid) {
uv_os_sock_t fd, isc_tid_t tid) {
isc__networker_t *worker = &mgr->workers[tid];
isc_nmsocket_t *csock = &sock->children[tid];

10
lib/isc/tid.c
View File

@ -22,26 +22,26 @@
/**
* Private
*/
thread_local uint32_t isc__tid_local = ISC_TID_UNKNOWN;
thread_local isc_tid_t isc__tid_local = ISC_TID_UNKNOWN;
/*
* Zero is a better nonsense value in this case than ISC_TID_UNKNOWN;
* avoids things like trying to allocate 32GB of per-thread counters.
*/
static uint32_t tid_count = 0;
static isc_tid_t tid_count = 0;
/**
* Protected
*/
void
isc__tid_init(uint32_t tid) {
isc__tid_init(isc_tid_t tid) {
REQUIRE(isc__tid_local == ISC_TID_UNKNOWN || isc__tid_local == tid);
isc__tid_local = tid;
}
void
isc__tid_initcount(uint32_t count) {
isc__tid_initcount(isc_tid_t count) {
REQUIRE(tid_count == 0 || tid_count == count);
tid_count = count;
}
@ -50,7 +50,7 @@ isc__tid_initcount(uint32_t count) {
* Public
*/
uint32_t
isc_tid_t
isc_tid_count(void) {
return tid_count;
}

3
lib/ns/client.c
View File

@ -2644,7 +2644,8 @@ ISC_REFCOUNT_IMPL(ns_clientmgr, clientmgr_destroy);
isc_result_t
ns_clientmgr_create(ns_server_t *sctx, isc_loopmgr_t *loopmgr,
dns_aclenv_t *aclenv, int tid, ns_clientmgr_t **managerp) {
dns_aclenv_t *aclenv, isc_tid_t tid,
ns_clientmgr_t **managerp) {
ns_clientmgr_t *manager = NULL;
isc_mem_t *mctx = NULL;

5
lib/ns/include/ns/client.h
View File

@ -149,7 +149,7 @@ struct ns_clientmgr {
ns_server_t *sctx;
isc_refcount_t references;
uint32_t tid;
isc_tid_t tid;
isc_loop_t *loop;
dns_aclenv_t *aclenv;
@ -331,7 +331,8 @@ ns_client_settimeout(ns_client_t *client, unsigned int seconds);
isc_result_t
ns_clientmgr_create(ns_server_t *sctx, isc_loopmgr_t *loopmgr,
dns_aclenv_t *aclenv, int tid, ns_clientmgr_t **managerp);
dns_aclenv_t *aclenv, isc_tid_t tid,
ns_clientmgr_t **managerp);
/*%<
* Create a client manager.
*/

5
lib/ns/interfacemgr.c
View File

@ -1358,11 +1358,10 @@ ns_interfacemgr_getserver(ns_interfacemgr_t *mgr) {
ns_clientmgr_t *
ns_interfacemgr_getclientmgr(ns_interfacemgr_t *mgr) {
int tid = isc_tid();
isc_tid_t tid = isc_tid();
REQUIRE(NS_INTERFACEMGR_VALID(mgr));
REQUIRE(tid >= 0);
REQUIRE((uint32_t)tid < mgr->ncpus);
REQUIRE(tid >= 0 && (uint32_t)tid < mgr->ncpus);
return mgr->clientmgrs[tid];
}

8
tests/bench/qpmulti.c
View File

@ -55,10 +55,10 @@
#define ZIPF 0
#if VERBOSE
#define TRACE(fmt, ...) \
isc_log_write(DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_QP, \
ISC_LOG_DEBUG(7), "%s:%d:%s():t%d: " fmt, __FILE__, \
__LINE__, __func__, isc_tid(), ##__VA_ARGS__)
#define TRACE(fmt, ...) \
isc_log_write(DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_QP, \
ISC_LOG_DEBUG(7), "%s:%d:%s():t%" PRItid ": " fmt, \
__FILE__, __LINE__, __func__, isc_tid(), ##__VA_ARGS__)
#else
#define TRACE(...)
#endif

2
tests/dns/dispatch_test.c
View File

@ -303,7 +303,7 @@ ISC_LOOP_TEST_IMPL(dispatchset_get) {
dns_dispatchmgr_t *dispatchmgr = NULL;
dns_dispatchset_t *dset = NULL;
dns_dispatch_t *d1, *d2, *d3, *d4, *d5;
uint32_t tid_saved;
isc_tid_t tid_saved;
UNUSED(arg);

4
tests/isc/async_test.c
View File

@ -41,7 +41,7 @@ static atomic_uint scheduled = 0;
static void
async_cb(void *arg) {
uint32_t tid = isc_tid();
isc_tid_t tid = isc_tid();
UNUSED(arg);
@ -57,7 +57,7 @@ async_cb(void *arg) {
static void
async_setup_cb(void *arg) {
uint32_t tid = isc_loopmgr_nloops(loopmgr) - 1;
isc_tid_t tid = isc_loopmgr_nloops(loopmgr) - 1;
isc_loop_t *loop = isc_loop_get(loopmgr, tid);
UNUSED(arg);

9
tests/isc/netmgr_common.h
View File

@ -211,13 +211,14 @@ extern isc_nm_recv_cb_t connect_readcb;
fprintf(stderr, "%s:%s:%d:%s = %" PRId64 "\n", __func__, __FILE__, \
__LINE__, #v, atomic_load(&v))
#define P(v) fprintf(stderr, #v " = %" PRId64 "\n", v)
#define F() \
fprintf(stderr, "%u:%s(%p, %s, %p)\n", isc_tid(), __func__, handle, \
isc_result_totext(eresult), cbarg)
#define F() \
fprintf(stderr, "%" PRItid ":%s(%p, %s, %p)\n", isc_tid(), __func__, \
handle, isc_result_totext(eresult), cbarg)
#define isc_loopmgr_shutdown(loopmgr) \
{ \
fprintf(stderr, "%u:%s:%s:%d:isc_loopmgr_shutdown(%p)\n", \
fprintf(stderr, \
"%" PRItid ":%s:%s:%d:isc_loopmgr_shutdown(%p)\n", \
isc_tid(), __func__, __FILE__, __LINE__, loopmgr); \
isc_loopmgr_shutdown(loopmgr); \
}

4
tests/isc/work_test.c
View File

@ -45,7 +45,7 @@ work_cb(void *arg) {
atomic_fetch_add(&scheduled, 1);
assert_int_equal(isc_tid(), UINT32_MAX);
assert_int_equal(isc_tid(), ISC_TID_UNKNOWN);
}
static void
@ -59,7 +59,7 @@ after_work_cb(void *arg) {
static void
work_enqueue_cb(void *arg) {
UNUSED(arg);
uint32_t tid = isc_loopmgr_nloops(loopmgr) - 1;
isc_tid_t tid = isc_loopmgr_nloops(loopmgr) - 1;
isc_loop_t *loop = isc_loop_get(loopmgr, tid);