> On 12 Mar 2018, at 15:11, Stephen Hemminger <[email protected]> > wrote: > > On Mon, 12 Mar 2018 10:56:09 +0100 > Toke Høiland-Jørgensen <[email protected]> wrote: >> >> Stephen, would you accept patches to fix the API (to add >> print_{u,}int64() variants and turn print_uint() into native-int size)? >> Or should we stick with the API currently there and live with the >> inconsistency? :) >> >> -Toke > > I agree print_int should take int, print_uint should take unsigned int, and > there should > be print_u64 (and print_u32, print_u8)
Submitted a patch to netdev but almost certainly did it wrong/based on wrong tree etc ‘cos I don’t normally inhabit that space. The quite simple attached patch restores corrrect functioning on my BE MIPS box. Validation that the MANY calls to print_uint are using the correct type is left as an exercise for the reader :-) But at least there’s no longer a hidden promotion from uint to uint_64t going on. Cheers, Kevin D-B 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A
--- Begin Message ---Introduce print helper functions for int, uint, explicit int32, uint32, int64 & uint64. print_int used 'int' type internally, whereas print_uint used 'uint64_t' These helper functions eventually call vfprintf(fp, fmt, args) which is a variable argument list function and is dependent upon 'fmt' containing correct information about the length of the passed arguments. Unfortunately print_int v print_uint offered no clue to the programmer that internally passed ints to print_uint were being promoted to 64bits, thus the format passed in 'fmt' string vs the actual passed integer could be different lengths. This is even more interesting on big endian architectures where 'vfprintf' would be looking in the middle of an int64 type and hence produced wildly incorrect values in tc qdisc output. print_u/int now stick with native int size. print_u/int32 & print u/int64 functions offer explicit integer sizes. To portably use these formats you should use the relevant PRIdN or PRIuN formats as defined in inttypes.h e.g. print_uint64(PRINT_ANY, "refcnt", "refcnt %" PRIu64 " ", t->tcm_info) Signed-off-by: Kevin Darbyshire-Bryant <[email protected]> --- include/json_print.h | 6 +++++- lib/json_print.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/json_print.h b/include/json_print.h index 2ca7830a..fb62b142 100644 --- a/include/json_print.h +++ b/include/json_print.h @@ -56,10 +56,14 @@ void close_json_array(enum output_type type, const char *delim); print_color_##type_name(t, COLOR_NONE, key, fmt, value); \ } _PRINT_FUNC(int, int); +_PRINT_FUNC(uint, unsigned int); _PRINT_FUNC(bool, bool); _PRINT_FUNC(null, const char*); _PRINT_FUNC(string, const char*); -_PRINT_FUNC(uint, uint64_t); +_PRINT_FUNC(int32, int32_t); +_PRINT_FUNC(uint32, uint32_t); +_PRINT_FUNC(int64, int64_t); +_PRINT_FUNC(uint64, uint64_t); _PRINT_FUNC(hu, unsigned short); _PRINT_FUNC(hex, unsigned int); _PRINT_FUNC(0xhex, unsigned int); diff --git a/lib/json_print.c b/lib/json_print.c index 6518ba98..12ee26df 100644 --- a/lib/json_print.c +++ b/lib/json_print.c @@ -117,8 +117,12 @@ void close_json_array(enum output_type type, const char *str) } \ } _PRINT_FUNC(int, int); +_PRINT_FUNC(uint, unsigned int); _PRINT_FUNC(hu, unsigned short); -_PRINT_FUNC(uint, uint64_t); +_PRINT_FUNC(int32, int32_t); +_PRINT_FUNC(uint32, uint32_t); +_PRINT_FUNC(int64, int64_t); +_PRINT_FUNC(uint64, uint64_t); _PRINT_FUNC(lluint, unsigned long long int); _PRINT_FUNC(float, double); #undef _PRINT_FUNC -- 2.14.3 (Apple Git-98)
--- End Message ---
signature.asc
Description: Message signed with OpenPGP
_______________________________________________ Cake mailing list [email protected] https://lists.bufferbloat.net/listinfo/cake
