From aa0009f8dcecfefd3c123baa316c2f86d3525f8c Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Mon, 27 Mar 2023 22:41:53 +0100 Subject: Convert uint32_t struct boolean members to nxt_bool_t. This commit complements the earlier one that changed a bunch of uint8_t struct members to nxt_bool_t (aka uint8_t). It's not entirely clear why these were specifically done as uint32_t's. I've checked these structure layouts with pahole(1) after this change on both 32 and 64bit and the layouts haven't changed. We may get a 3 or 7 byte hole after the nxt_bool_t or 3 bytes of padding at the end of the structure, but the structure members are still at the same offsets and the structure sizes have remained the same. Reviewed-by: Alejandro Colomar Signed-off-by: Andrew Clayton --- src/nxt_event_engine.h | 2 +- src/nxt_lvlhsh.c | 2 +- src/nxt_lvlhsh.h | 2 +- src/nxt_thread_time.h | 2 +- src/nxt_tstr.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nxt_event_engine.h b/src/nxt_event_engine.h index 8773acee..850a7854 100644 --- a/src/nxt_event_engine.h +++ b/src/nxt_event_engine.h @@ -329,7 +329,7 @@ extern const nxt_event_interface_t nxt_poll_engine; typedef struct { int nfds; - uint32_t update_nfds; /* 1 bit */ + nxt_bool_t update_nfds; nxt_fd_event_t **events; diff --git a/src/nxt_lvlhsh.c b/src/nxt_lvlhsh.c index 7a8b3dda..9c31a73a 100644 --- a/src/nxt_lvlhsh.c +++ b/src/nxt_lvlhsh.c @@ -146,7 +146,7 @@ typedef struct { const nxt_lvlhsh_proto_t *proto; void *pool; - uint32_t retrieve; /* 1 bit */ + nxt_bool_t retrieve; } nxt_lvlhsh_peek_t; diff --git a/src/nxt_lvlhsh.h b/src/nxt_lvlhsh.h index c051081c..3115af58 100644 --- a/src/nxt_lvlhsh.h +++ b/src/nxt_lvlhsh.h @@ -87,7 +87,7 @@ typedef struct { struct nxt_lvlhsh_query_s { uint32_t key_hash; - uint32_t replace; /* 1 bit */ + nxt_bool_t replace; nxt_str_t key; void *value; diff --git a/src/nxt_thread_time.h b/src/nxt_thread_time.h index 7c133b4b..11ab0cd7 100644 --- a/src/nxt_thread_time.h +++ b/src/nxt_thread_time.h @@ -45,7 +45,7 @@ typedef struct { struct tm gmtime; struct tm localtime; - uint32_t no_cache; /* 1 bit */ + nxt_bool_t no_cache; /* * The flag indicating a signal state of a thread. diff --git a/src/nxt_tstr.c b/src/nxt_tstr.c index fda585b8..ca1e1ca6 100644 --- a/src/nxt_tstr.c +++ b/src/nxt_tstr.c @@ -37,7 +37,7 @@ struct nxt_tstr_query_s { nxt_tstr_cache_t *cache; nxt_uint_t waiting; - nxt_uint_t failed; /* 1 bit */ + nxt_bool_t failed; void *ctx; void *data; -- cgit