Skip to content

I
iproute2
Commit a55a8fd8 authored by Stephen Hemminger's avatar Stephen Hemminger
Browse files
Options

fix dependency on sizeof(__u64) == sizeof(unsigned long long) 

Some platforms like ppc64 have unsigned long long as 128 bits, and
the printf format string would cause errors. Resolve this by using
unsigned long long where necessary (or unsigned long).
parent 609106d3
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 52 deletions
ip/ipntable.c
View file @ a55a8fd8
...@@ -431,8 +431,8 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -431,8 +431,8 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
fprintf(fp, "thresh3 %u ", thresh3); fprintf(fp, "thresh3 %u ", thresh3);
} }
if (tb[NDTA_GC_INTERVAL]) { if (tb[NDTA_GC_INTERVAL]) {
__u64 gc_int = rta_getattr_u64(tb[NDTA_GC_INTERVAL]); unsigned long long gc_int = rta_getattr_u64(tb[NDTA_GC_INTERVAL]);
fprintf(fp, "gc_int %llu ", (unsigned long long) gc_int); fprintf(fp, "gc_int %llu ", gc_int);
} }
if (ret) if (ret)
...@@ -484,19 +484,16 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -484,19 +484,16 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
fprintf(fp, "refcnt %u ", refcnt); fprintf(fp, "refcnt %u ", refcnt);
} }
if (tpb[NDTPA_REACHABLE_TIME]) { if (tpb[NDTPA_REACHABLE_TIME]) {
__u64 reachable = rta_getattr_u64(tpb[NDTPA_REACHABLE_TIME]); unsigned long long reachable = rta_getattr_u64(tpb[NDTPA_REACHABLE_TIME]);
fprintf(fp, "reachable %llu ", fprintf(fp, "reachable %llu ", reachable);
(unsigned long long) reachable);
} }
if (tpb[NDTPA_BASE_REACHABLE_TIME]) { if (tpb[NDTPA_BASE_REACHABLE_TIME]) {
__u64 breachable = rta_getattr_u64(tpb[NDTPA_BASE_REACHABLE_TIME]); unsigned long long breachable = rta_getattr_u64(tpb[NDTPA_BASE_REACHABLE_TIME]);
fprintf(fp, "base_reachable %llu ", fprintf(fp, "base_reachable %llu ", breachable);
(unsigned long long) breachable);
} }
if (tpb[NDTPA_RETRANS_TIME]) { if (tpb[NDTPA_RETRANS_TIME]) {
__u64 retrans = rta_getattr_u64(tpb[NDTPA_RETRANS_TIME]); unsigned long long retrans = rta_getattr_u64(tpb[NDTPA_RETRANS_TIME]);
fprintf(fp, "retrans %llu ", fprintf(fp, "retrans %llu ", retrans);
(unsigned long long) retrans);
} }
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
...@@ -504,14 +501,12 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -504,14 +501,12 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
fprintf(fp, " "); fprintf(fp, " ");
if (tpb[NDTPA_GC_STALETIME]) { if (tpb[NDTPA_GC_STALETIME]) {
__u64 gc_stale = rta_getattr_u64(tpb[NDTPA_GC_STALETIME]); unsigned long long gc_stale = rta_getattr_u64(tpb[NDTPA_GC_STALETIME]);
fprintf(fp, "gc_stale %llu ", fprintf(fp, "gc_stale %llu ", gc_stale);
(unsigned long long) gc_stale);
} }
if (tpb[NDTPA_DELAY_PROBE_TIME]) { if (tpb[NDTPA_DELAY_PROBE_TIME]) {
__u64 delay_probe = rta_getattr_u64(tpb[NDTPA_DELAY_PROBE_TIME]); unsigned long long delay_probe = rta_getattr_u64(tpb[NDTPA_DELAY_PROBE_TIME]);
fprintf(fp, "delay_probe %llu ", fprintf(fp, "delay_probe %llu ", delay_probe);
(unsigned long long) delay_probe);
} }
if (tpb[NDTPA_QUEUE_LEN]) { if (tpb[NDTPA_QUEUE_LEN]) {
__u32 queue = rta_getattr_u32(tpb[NDTPA_QUEUE_LEN]); __u32 queue = rta_getattr_u32(tpb[NDTPA_QUEUE_LEN]);
...@@ -540,23 +535,20 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -540,23 +535,20 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
fprintf(fp, " "); fprintf(fp, " ");
if (tpb[NDTPA_ANYCAST_DELAY]) { if (tpb[NDTPA_ANYCAST_DELAY]) {
__u64 anycast_delay = rta_getattr_u64(tpb[NDTPA_ANYCAST_DELAY]); unsigned long long anycast_delay = rta_getattr_u64(tpb[NDTPA_ANYCAST_DELAY]);
fprintf(fp, "anycast_delay %llu ", fprintf(fp, "anycast_delay %llu ", anycast_delay);
(unsigned long long) anycast_delay);
} }
if (tpb[NDTPA_PROXY_DELAY]) { if (tpb[NDTPA_PROXY_DELAY]) {
__u64 proxy_delay = rta_getattr_u64(tpb[NDTPA_PROXY_DELAY]); unsigned long long proxy_delay = rta_getattr_u64(tpb[NDTPA_PROXY_DELAY]);
fprintf(fp, "proxy_delay %llu ", fprintf(fp, "proxy_delay %llu ", proxy_delay);
(unsigned long long) proxy_delay);
} }
if (tpb[NDTPA_PROXY_QLEN]) { if (tpb[NDTPA_PROXY_QLEN]) {
__u32 pqueue = rta_getattr_u32(tpb[NDTPA_PROXY_QLEN]); __u32 pqueue = rta_getattr_u32(tpb[NDTPA_PROXY_QLEN]);
fprintf(fp, "proxy_queue %u ", pqueue); fprintf(fp, "proxy_queue %u ", pqueue);
} }
if (tpb[NDTPA_LOCKTIME]) { if (tpb[NDTPA_LOCKTIME]) {
__u64 locktime = rta_getattr_u64(tpb[NDTPA_LOCKTIME]); unsigned long long locktime = rta_getattr_u64(tpb[NDTPA_LOCKTIME]);
fprintf(fp, "locktime %llu ", fprintf(fp, "locktime %llu ", locktime);
(unsigned long long) locktime);
} }
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
...@@ -568,38 +560,28 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -568,38 +560,28 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
fprintf(fp, " "); fprintf(fp, " ");
fprintf(fp, "stats "); fprintf(fp, "stats ");
fprintf(fp, "allocs %llu ", fprintf(fp, "allocs %llu ", ndts->ndts_allocs);
(unsigned long long) ndts->ndts_allocs); fprintf(fp, "destroys %llu ", ndts->ndts_destroys);
fprintf(fp, "destroys %llu ", fprintf(fp, "hash_grows %llu ", ndts->ndts_hash_grows);
(unsigned long long) ndts->ndts_destroys);
fprintf(fp, "hash_grows %llu ",
(unsigned long long) ndts->ndts_hash_grows);
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
fprintf(fp, "res_failed %llu ", fprintf(fp, "res_failed %llu ", ndts->ndts_res_failed);
(unsigned long long) ndts->ndts_res_failed); fprintf(fp, "lookups %llu ", ndts->ndts_lookups);
fprintf(fp, "lookups %llu ", fprintf(fp, "hits %llu ", ndts->ndts_hits);
(unsigned long long) ndts->ndts_lookups);
fprintf(fp, "hits %llu ",
(unsigned long long) ndts->ndts_hits);
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
fprintf(fp, "rcv_probes_mcast %llu ", fprintf(fp, "rcv_probes_mcast %llu ", ndts->ndts_rcv_probes_mcast);
(unsigned long long) ndts->ndts_rcv_probes_mcast); fprintf(fp, "rcv_probes_ucast %llu ", ndts->ndts_rcv_probes_ucast);
fprintf(fp, "rcv_probes_ucast %llu ",
(unsigned long long) ndts->ndts_rcv_probes_ucast);
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
fprintf(fp, "periodic_gc_runs %llu ", fprintf(fp, "periodic_gc_runs %llu ", ndts->ndts_periodic_gc_runs);
(unsigned long long) ndts->ndts_periodic_gc_runs); fprintf(fp, "forced_gc_runs %llu ", ndts->ndts_forced_gc_runs);
fprintf(fp, "forced_gc_runs %llu ",
(unsigned long long) ndts->ndts_forced_gc_runs);
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
} }
......
ip/tcp_metrics.c
View file @ a55a8fd8
...@@ -166,7 +166,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n, ...@@ -166,7 +166,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
a = attrs[TCP_METRICS_ATTR_AGE]; a = attrs[TCP_METRICS_ATTR_AGE];
if (a) { if (a) {
__u64 val = rta_getattr_u64(a); unsigned long long val = rta_getattr_u64(a);
fprintf(fp, " age %llu.%03llusec", fprintf(fp, " age %llu.%03llusec",
val / 1000, val % 1000); val / 1000, val % 1000);
...@@ -189,7 +189,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n, ...@@ -189,7 +189,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
parse_rtattr_nested(m, TCP_METRIC_MAX + 1, a); parse_rtattr_nested(m, TCP_METRIC_MAX + 1, a);
for (i = 0; i < TCP_METRIC_MAX + 1; i++) { for (i = 0; i < TCP_METRIC_MAX + 1; i++) {
__u32 val; unsigned long val;
a = m[i + 1]; a = m[i + 1];
if (!a) if (!a)
...@@ -198,19 +198,20 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n, ...@@ -198,19 +198,20 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
fprintf(fp, " %s ", metric_name[i]); fprintf(fp, " %s ", metric_name[i]);
else else
fprintf(fp, " metric_%d ", i); fprintf(fp, " metric_%d ", i);
val = rta_getattr_u32(a); val = rta_getattr_u32(a);
switch (i) { switch (i) {
case TCP_METRIC_RTT: case TCP_METRIC_RTT:
fprintf(fp, "%lluus", (val * 1000ULL) >> 3); fprintf(fp, "%luus", (val * 1000UL) >> 3);
break; break;
case TCP_METRIC_RTTVAR: case TCP_METRIC_RTTVAR:
fprintf(fp, "%lluus", (val * 1000ULL) >> 2); fprintf(fp, "%luus", (val * 1000UL) >> 2);
break; break;
case TCP_METRIC_SSTHRESH: case TCP_METRIC_SSTHRESH:
case TCP_METRIC_CWND: case TCP_METRIC_CWND:
case TCP_METRIC_REORDERING: case TCP_METRIC_REORDERING:
default: default:
fprintf(fp, "%u", val); fprintf(fp, "%lu", val);
break; break;
} }
} }
...@@ -223,7 +224,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n, ...@@ -223,7 +224,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
a = attrs[TCP_METRICS_ATTR_FOPEN_SYN_DROPS]; a = attrs[TCP_METRICS_ATTR_FOPEN_SYN_DROPS];
if (a) { if (a) {
__u16 syn_loss = rta_getattr_u16(a); __u16 syn_loss = rta_getattr_u16(a);
__u64 ts; unsigned long long ts;
a = attrs[TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS]; a = attrs[TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS];
ts = a ? rta_getattr_u64(a) : 0; ts = a ? rta_getattr_u64(a) : 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7