police: Small corrections for the output
Subsystems (2)
PATCH v2 1/1 police: Small corrections for the output
Start a newline before printing the index and ref. Print overhead with print_size().
Fixes 0d5cf51e0d6c ("police: Add support for json output")
Signed-off-by Roi Dayan <[email protected]>
---
Notes:
v2:
- add newline also before ref.
tc/m_police.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tc/m_police.c +5 -3
@@ -301,7 +301,8 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg) RTA_PAYLOAD(tb[TCA_POLICE_RATE64]) >= sizeof(rate64)) rate64 =rta_getattr_u64 (tb[TCA_POLICE_RATE64 ]); -print_uint (PRINT_ANY ,"index" ,"\t index %u " , p->index); +print_nl (); +print_uint (PRINT_ANY ,"index" ,"\tindex %u " , p->index);tc_print_rate (PRINT_FP ,NULL ,"rate %s " , rate64); buffer =tc_calc_xmitsize (rate64, p->burst);print_size (PRINT_FP ,NULL ,"burst %s " , buffer);
@@ -342,12 +343,13 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg)print_string (PRINT_FP ,NULL ," " ,NULL ); } -print_uint (PRINT_ANY ,"overhead" ,"overhead %u " , p->rate.overhead); +print_size (PRINT_ANY ,"overhead" ,"overhead %s " , p->rate.overhead); linklayer = (p->rate.linklayer &TC_LINKLAYER_MASK );if (linklayer >TC_LINKLAYER_ETHERNET || show_details)print_string (PRINT_ANY ,"linklayer" ,"linklayer %s " ,sprint_linklayer (linklayer, b2)); -print_int (PRINT_ANY ,"ref" ,"ref %d " , p->refcnt); +print_nl (); +print_int (PRINT_ANY ,"ref" ,"\tref %d " , p->refcnt);print_int (PRINT_ANY ,"bind" ,"bind %d " , p->bindcnt);if (show_stats) {if (tb[TCA_POLICE_TM ]) {
Signature · 1 line
2.8.0
Quoted 35 lines · Roi Dayan
Start a newline before printing the index and ref. Print overhead with
print_size().Fixes 0d5cf51e0d6c ("police: Add support for json output")Signed-off-by Roi Dayan <[email protected]>---
Notes:
v2:
- add newline also before ref.tc/m_police.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)tc/m_police.c +3
-2@@ -301,7 +301,8 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg) RTA_PAYLOAD(tb[TCA_POLICE_RATE64]) >= sizeof(rate64)) rate64 =rta_getattr_u64 (tb[TCA_POLICE_RATE64 ]); -print_uint (PRINT_ANY ,"index" ,"\t index %u " , p->index); +print_nl (); +print_uint (PRINT_ANY ,"index" ,"\tindex %u " , p->index);tc_print_rate (PRINT_FP ,NULL ,"rate %s " , rate64); buffer =tc_calc_xmitsize (rate64, p->burst);print_size (PRINT_FP ,NULL ,"burst %s " , buffer);@@ -342,12 +343,13 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg)print_string (PRINT_FP ,NULL ," " ,NULL ); } -print_uint (PRINT_ANY ,"overhead" ,"overhead %u " , p->rate.overhead); +print_size (PRINT_ANY ,"overhead" ,"overhead %s " , p->rate.overhead);
tc/m_police.c static int print_police(struct action_util *a, FILE *f, struct rtattr *arg) · line 355
Quoted 10 lines
tc/m_police.c +2
-1linklayer = (p->rate.linklayer &TC_LINKLAYER_MASK );if (linklayer >TC_LINKLAYER_ETHERNET || show_details)print_string (PRINT_ANY ,"linklayer" ,"linklayer %s " ,sprint_linklayer (linklayer, b2)); -print_int (PRINT_ANY ,"ref" ,"ref %d " , p->refcnt); +print_nl (); +print_int (PRINT_ANY ,"ref" ,"\tref %d " , p->refcnt);print_int (PRINT_ANY ,"bind" ,"bind %d " , p->bindcnt);if (show_stats) {if (tb[TCA_POLICE_TM ]) {
this patch should be ignored now.
see "police: Fix normal output back to what it was"