build: Fix link errors on some systems
Subsystems (3)
PATCH v3 1/1 build: Fix link errors on some systems
Since moving get_rate() and get_size() from tc to lib, on some systems we fail to link because of missing math lib. Move the functions that require math lib to their own c file and add -lm to dcb that now use those functions.
../lib/libutil.a(utils.o): In function `get_rate':
utils.c:(.text+0x10dc): undefined reference to floor' ../lib/libutil.a(utils.o): In function get_size':
utils.c:(.text+0x1394): undefined reference to floor' ../lib/libutil.a(json_print.o): In function sprint_size':
json_print.c:(.text+0x14c0): undefined reference to rint' json_print.c:(.text+0x14f4): undefined reference to rint' json_print.c:(.text+0x157c): undefined reference to `rint'
---
Notes:
v3
- Modify _IS_JSON_CONTEXT comparison order.
v2
- As suggested by Petr.
Instead of adding -lm to all utils move the functions that require math lib to seperate c files and add -lm to dcb that use those functions.
dcb/Makefile | 1 + include/json_print.h | 3 + lib/Makefile | 4 +- lib/json_print.c | 33 ----------- lib/json_print_math.c | 46 +++++++++++++++ lib/utils.c | 114 ------------------------------------ lib/utils_math.c | 133 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 185 insertions(+), 149 deletions(-) create mode 100644 lib/json_print_math.c create mode 100644 lib/utils_math.c
dcb/Makefile +1 -0
@@ -7,6 +7,7 @@ ifeq ($(HAVE_MNL),y) DCBOBJ = dcb.o dcb_buffer.o dcb_ets.o dcb_maxrate.o dcb_pfc.o TARGETS += dcb +LDLIBS += -lm endif
include/json_print.h +3 -0
@@ -15,6 +15,9 @@#include "json_writer.h" #include "color.h" +#define _IS_JSON_CONTEXT (type) (is_json_context() && (type & PRINT_JSON || type & PRINT_ANY)) +#define _IS_FP_CONTEXT (type) (!is_json_context() && (type & PRINT_FP || type & PRINT_ANY)) +json_writer_t *get_json_writer (void );/*
lib/Makefile +2 -2
@@ -3,8 +3,8 @@ include ../config.mk CFLAGS += -fPIC -UTILOBJ = utils.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \ - inet_proto.o namespace.o json_writer.o json_print.o \ +UTILOBJ = utils.o utils_math.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \ + inet_proto.o namespace.o json_writer.o json_print.o json_print_math.o \ names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o ifeq ($(HAVE_ELF),y)
lib/json_print.c +0 -33
@@ -11,16 +11,12 @@#include <stdarg.h> #include <stdio.h> -#include <math.h> #include "utils.h" #include "json_print.h" static json_writer_t *_jw; -#define _IS_JSON_CONTEXT (type) ((type & PRINT_JSON || type & PRINT_ANY) && _jw) -#define _IS_FP_CONTEXT (type) (!_jw && (type & PRINT_FP || type & PRINT_ANY)) -static void __new_json_obj (int json,bool have_array) {if (json) {
@@ -342,32 +338,3 @@ int print_color_rate(bool use_iec, enum output_type type, enum color_attr color,free (buf);return rc; } - -char *sprint_size (__u32 sz,char *buf) -{ -long kilo =1024 ; -long mega = kilo * kilo; -size_t len =SPRINT_BSIZE -1 ; -double tmp = sz; - -if (sz >= mega &&fabs (mega *rint (tmp / mega) - sz) <1024 ) -snprintf (buf, len,"%gMb" ,rint (tmp / mega)); -else if (sz >= kilo &&fabs (kilo *rint (tmp / kilo) - sz) <16 ) -snprintf (buf, len,"%gKb" ,rint (tmp / kilo)); -else -snprintf (buf, len,"%ub" , sz); - -return buf; -} - -int print_color_size (enum output_type type,enum color_attr color, -const char *key,const char *fmt,__u32 sz) -{ -SPRINT_BUF (buf); - -if (_IS_JSON_CONTEXT (type)) -return print_color_uint (type, color, key,"%u" , sz); - -sprint_size (sz, buf); -return print_color_string (type, color, key, fmt, buf); -}
lib/json_print_math.c new file +46 -0
46 lines not on this page · raw message
lib/utils.c +0 -114
120 lines not on this page · raw message
lib/utils_math.c new file +133 -0
133 lines not on this page · raw message
Signature · 1 line
2.26.2
Quoted 6 lines · Roi Dayan
lib/json_print_math.c new file +0
-0
lib/json_print_math.c line 8
Quoted 8 lines
lib/json_print_math.c new file +8
-0@@ -0,0 +1,46 @@ +/* +* json_print_math.c "print regular or json output, based on json_writer". +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*
This should have a SPDX tag instead of the license excerpt:
// SPDX-License-Identifier: GPL-2.0+
lib/json_print_math.c line 10
Quoted 2 lines
lib/json_print_math.c new file +2
-0+* Authors: Julien Fortin, <[email protected]> +*/
sprint_size() comes from TC and predates iproute2 git repo (2004), whereas Cumulus Networks was around from 2010. So the authorship declaration is likely inaccurate. I think it's also unnecessary, and would just drop it.
Quoted 6 lines
lib/utils_math.c new file +0
-0
lib/utils_math.c line 9
Quoted 9 lines
lib/utils_math.c new file +9
-0@@ -0,0 +1,133 @@ +/* +* utils.c +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +* +* Authors: Alexey Kuznetsov, <[email protected]>
The same here re license and authorship. The latter might in fact be accurate in this case, but I would still drop it :)
Otherwise this looks good to me.
Quoted 49 lines · Petr Machata
Quoted 6 lines · Roi Dayan
lib/json_print_math.c new file +0
-0lib/json_print_math.c line 8
Quoted 8 lines
lib/json_print_math.c new file +8
-0@@ -0,0 +1,46 @@ +/* +* json_print_math.c "print regular or json output, based on json_writer". +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +* This should have a SPDX tag instead of the license excerpt:
// SPDX-License-Identifier: GPL-2.0+
lib/json_print_math.c line 10
Quoted 2 lines
lib/json_print_math.c new file +2
-0+* Authors: Julien Fortin, <[email protected]> +*/
sprint_size()comes from TC and predates iproute2 git repo (2004), whereas Cumulus Networks was around from 2010. So the authorship declaration is likely inaccurate. I think it's also unnecessary, and would just drop it.Quoted 6 lines
lib/utils_math.c new file +0
-0lib/utils_math.c line 9
Quoted 9 lines
lib/utils_math.c new file +9
-0@@ -0,0 +1,133 @@ +/* +* utils.c +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +* +* Authors: Alexey Kuznetsov, <[email protected]> The same here re license and authorship. The latter might in fact be accurate in this case, but I would still drop it :)
Quoted 2 lines
Otherwise this looks good to me.
great thanks. sending v4 with the updates.