devlink: Left justification on FMSG output

ayalevin123 · shemminger · commit 7dd3d51b9137 · 2019-10-08T20:22:13.000-07:00
FMSG output is dynamic, space separator must be on the left hand side of the value. Otherwise output has redundant left indentation regardless the hierarchy. Before the patch: Common config: SQ: stride size: 64 size: 1024 CQ: stride size: 64 size: 1024 SQs: channel ix: 0 tc: 0 txq ix: 0 sqn: 10 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 6 HW status: 0 channel ix: 1 tc: 0 txq ix: 1 sqn: 14 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 10 HW status: 0 channel ix: 2 tc: 0 txq ix: 2 sqn: 18 HW state: 1 stopped: false cc: 5 pc: 5 CQ: cqn: 14 HW status: 0 channel ix: 3 tc: 0 txq ix: 3 sqn: 22 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 18 HW status: 0 With the patch: Common config: SQ: stride size: 64 size: 1024 CQ: stride size: 64 size: 1024 SQs: channel ix: 0 tc: 0 txq ix: 0 sqn: 10 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 6 HW status: 0 channel ix: 1 tc: 0 txq ix: 1 sqn: 14 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 10 HW status: 0 channel ix: 2 tc: 0 txq ix: 2 sqn: 18 HW state: 1 stopped: false cc: 5 pc: 5 CQ: cqn: 14 HW status: 0 channel ix: 3 tc: 0 txq ix: 3 sqn: 22 HW state: 1 stopped: false cc: 0 pc: 0 CQ: cqn: 18 HW status: 0 Fixes: 844a617 ("devlink: Add helper functions for name and value separately") Signed-off-by: Aya Levin <ayal@mellanox.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.com> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
diff --git a/devlink/devlink.c b/devlink/devlink.c
@@ -1872,26 +1872,29 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
 
 static void pr_out_bool_value(struct dl *dl, bool value)
 {
+	__pr_out_indent_newline(dl);
 	if (dl->json_output)
 		jsonw_bool(dl->jw, value);
 	else
-		pr_out(" %s", value ? "true" : "false");
+		pr_out("%s", value ? "true" : "false");
 }
 
 static void pr_out_uint_value(struct dl *dl, unsigned int value)
 {
+	__pr_out_indent_newline(dl);
 	if (dl->json_output)
 		jsonw_uint(dl->jw, value);
 	else
-		pr_out(" %u", value);
+		pr_out("%u", value);
 }
 
 static void pr_out_uint64_value(struct dl *dl, uint64_t value)
 {
+	__pr_out_indent_newline(dl);
 	if (dl->json_output)
 		jsonw_u64(dl->jw, value);
 	else
-		pr_out(" %"PRIu64, value);
+		pr_out("%"PRIu64, value);
 }
 
 static bool is_binary_eol(int i)
@@ -1918,18 +1921,20 @@ static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
 
 static void pr_out_str_value(struct dl *dl, const char *value)
 {
+	__pr_out_indent_newline(dl);
 	if (dl->json_output)
 		jsonw_string(dl->jw, value);
 	else
-		pr_out(" %s", value);
+		pr_out("%s", value);
 }
 
 static void pr_out_name(struct dl *dl, const char *name)
 {
+	__pr_out_indent_newline(dl);
 	if (dl->json_output)
 		jsonw_name(dl->jw, name);
 	else
-		pr_out(" %s:", name);
+		pr_out("%s:", name);
 }
 
 static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)

Original file line number	Diff line number	Diff line change
`@@ -1872,26 +1872,29 @@ static void pr_out_u64(struct dl dl, const char name, uint64_t val)`
`1872`	`1872`
`1873`	`1873`	`static void pr_out_bool_value(struct dl *dl, bool value)`
`1874`	`1874`	`{`
	`1875`	`+ __pr_out_indent_newline(dl);`
`1875`	`1876`	`if (dl->json_output)`
`1876`	`1877`	`jsonw_bool(dl->jw, value);`
`1877`	`1878`	`else`
`1878`		`- pr_out(" %s", value ? "true" : "false");`
	`1879`	`+ pr_out("%s", value ? "true" : "false");`
`1879`	`1880`	`}`
`1880`	`1881`
`1881`	`1882`	`static void pr_out_uint_value(struct dl *dl, unsigned int value)`
`1882`	`1883`	`{`
	`1884`	`+ __pr_out_indent_newline(dl);`
`1883`	`1885`	`if (dl->json_output)`
`1884`	`1886`	`jsonw_uint(dl->jw, value);`
`1885`	`1887`	`else`
`1886`		`- pr_out(" %u", value);`
	`1888`	`+ pr_out("%u", value);`
`1887`	`1889`	`}`
`1888`	`1890`
`1889`	`1891`	`static void pr_out_uint64_value(struct dl *dl, uint64_t value)`
`1890`	`1892`	`{`
	`1893`	`+ __pr_out_indent_newline(dl);`
`1891`	`1894`	`if (dl->json_output)`
`1892`	`1895`	`jsonw_u64(dl->jw, value);`
`1893`	`1896`	`else`
`1894`		`- pr_out(" %"PRIu64, value);`
	`1897`	`+ pr_out("%"PRIu64, value);`
`1895`	`1898`	`}`
`1896`	`1899`
`1897`	`1900`	`static bool is_binary_eol(int i)`
`@@ -1918,18 +1921,20 @@ static void pr_out_binary_value(struct dl dl, uint8_t data, uint32_t len)`
`1918`	`1921`
`1919`	`1922`	`static void pr_out_str_value(struct dl dl, const char value)`
`1920`	`1923`	`{`
	`1924`	`+ __pr_out_indent_newline(dl);`
`1921`	`1925`	`if (dl->json_output)`
`1922`	`1926`	`jsonw_string(dl->jw, value);`
`1923`	`1927`	`else`
`1924`		`- pr_out(" %s", value);`
	`1928`	`+ pr_out("%s", value);`
`1925`	`1929`	`}`
`1926`	`1930`
`1927`	`1931`	`static void pr_out_name(struct dl dl, const char name)`
`1928`	`1932`	`{`
	`1933`	`+ __pr_out_indent_newline(dl);`
`1929`	`1934`	`if (dl->json_output)`
`1930`	`1935`	`jsonw_name(dl->jw, name);`
`1931`	`1936`	`else`
`1932`		`- pr_out(" %s:", name);`
	`1937`	`+ pr_out("%s:", name);`
`1933`	`1938`	`}`
`1934`	`1939`
`1935`	`1940`	`static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)`