This replaces the use of uint8_t to represent booleans in the configuration type system with the nxt_bool_t type (which happens to be a uint8_t). This is part of the work to use nxt_bool_t in structures to represent booleans rather than uint8_t's which is more intuitive. Reviewed-by: Alejandro Colomar <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Reviewed-by: Alejandro Colomar <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This has been replaced by NXT_CONF_MAP_BOOL. Reviewed-by: Alejandro Colomar <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This replaces the use of NXT_CONF_MAP_INT8 for denoting boolean values. It also makes NXT_CONF_MAP_BOOL an alias for NXT_CONF_MAP_INT8 in nxt_conf_map_object(). A future commit will remove NXT_CONF_MAP_INT8. Reviewed-by: Alejandro Colomar <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
When adding a boolean config option, this is of type NXT_CONF_VALUE_BOOLEAN, however when mapping such an entry to a structure member via nxt_conf_map_object() this is done as a NXT_CONF_MAP_INT8. It took a bit of head scratching to find out that it should have been a NXT_CONF_MAP_INT8 and not a NXT_CONF_MAP_INT. Introduce a new map type of NXT_CONF_MAP_BOOL that will eventually replace NXT_CONF_MAP_INT8 for representing booleans... We use the short form _BOOL as that matches the naming convention of the other types in nxt_conf_map_type_t. This is part of a set of patches and eventually NXT_CONF_MAP_BOOL will simply replace NXT_CONF_MAP_INT8. Reviewed-by: Alejandro Colomar <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
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 <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Replace the usage of uint8_t in structures to represent boolean values
with our nxt_bool_t type.
This will result in no change in structure layout as the nxt_bool_t is
now a uint8_t, same as what it's replacing.
Even though it's essentially the same type, it makes it much clearer as
to what its purpose is.
This was largely done with the following script from Alex, with some
manual conversions
$ grep -rl 'uint8_t.*1 bit' src/ \
| xargs sed -i '/uint8_t.*1 bit/{s/uint8_t /nxt_bool_t /;s/; *\/\*.*/;/}'
This doesn't convert the non-uint8_t booleans, they will be handled
separately.
Reviewed-by: Alejandro Colomar <alx@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
We have a 'bool' type, nxt_bool_t which is defined as a nxt_uint_t, that is used as local variables, and function return types and arguments. However in structs we use a uint8_t, due to not wanting to waste memory in structures, but the use of uint8_t in structs is confusing and unintuitive. We could just switch to using the C99 _Bool type, however there are concerns about this possibly not always being 1-byte on platforms on which Unit runs and might mess with structure layouts. (Switching to _Bool as the underlying type is still an eventual goal) The alternative is to just make our nxt_bool_t be a uint8_t. Reviewed-by: Alejandro Colomar <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
In nxt_kqueue_poll() error is declared as a nxt_bool_t aka unsigned int
(on x86-64 anyway).
It is used both as a boolean and as the return storage for a bitwise AND
operation.
This causes the following issue after we have changed nxt_bool_t to be a
uint8_t (which will happen in a subsequent commit)
gcc12 -c -pipe -fPIC -fvisibility=hidden -O -W -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wmissing-prototypes -Werror -g -O2 -I src -I build -I/usr/local/include -o build/src/nxt_kqueue_engine.o -MMD -MF build/src/nxt_kqueue_engine.dep -MT build/src/nxt_kqueue_engine.o src/nxt_kqueue_engine.c
src/nxt_kqueue_engine.c: In function 'nxt_kqueue_poll':
src/nxt_kqueue_engine.c:728:17: error: overflow in conversion from 'int' to 'nxt_bool_t' {aka 'unsigned char'} changes value from '(int)kev->flags & 16384' to '0' [-Werror=overflow]
728 | error = (kev->flags & EV_ERROR);
| ^
cc1: all warnings being treated as errors
EV_ERROR has the value 16384, after the AND operation error holds 16384,
however this overflows and wraps around (64 times) exactly to 0.
Rather than conflating the use of error, keep error as a boolean (it is
used further down the function) but do the AND operation inside the
if ().
Reviewed-by: Alejandro Colomar <alx@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This is required for the next patch which will change nxt_bool_t from a
nxt_uint_t to a uint8_t, which produces the following compiler warning
cc -c -pipe -fPIC -fvisibility=hidden -O -W -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wmissing-prototypes -Werror -g -I src -I build \
\
\
-o build/src/nxt_sprintf.o \
-MMD -MF build/src/nxt_sprintf.dep -MT build/src/nxt_sprintf.o \
src/nxt_sprintf.c
In file included from src/nxt_unix.h:160,
from src/nxt_main.h:31,
from src/nxt_sprintf.c:7:
src/nxt_sprintf.c: In function ‘nxt_vsprintf’:
src/nxt_sprintf.c:368:44: error: ‘nxt_bool_t’ {aka ‘unsigned char’} is promoted to ‘int’ when passed through ‘...’ [-Werror]
368 | ui64 = (uint64_t) va_arg(args, nxt_bool_t);
| ^
src/nxt_sprintf.c:368:44: note: (so you should pass ‘int’ not ‘nxt_bool_t’ {aka ‘unsigned char’} to ‘va_arg’)
src/nxt_sprintf.c:368:44: note: if this code is reached, the program will abort
cc1: all warnings being treated as errors
Lets use unsigned int as it matches the signedness of nxt_bool_t.
Reviewed-by: Alejandro Colomar <alx@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>