Skip to contentSkip to conversation

perf config: Handle errors from {show_spec, set}_config() in the loop

PATCH Superseded Taeung Song 1 participant 1 message May 9, 2017 perf events

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/7 perf config: Handle errors from {show_spec, set}_config() in the loop

show_spec_config() and set_config() can be called multiple times
in the loop in cmd_config(). However, the return values from them did not checked. Even though one of the return values means a error (i.e. -1),
it can be just skipped. It is a bug, so fix it.

Check each return value from show_spec_config() and set_config() in the loop in cmd_config() and if the return value means a error, handle it.

---
 tools/perf/builtin-config.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
tools/perf/builtin-config.c +15 -2
index 7545966..bb1be79 100644
@@ -225,10 +225,23 @@ int cmd_config(int argc, const char **argv)
 				break;
 			}
 
-			if (value == NULL)
+			if (value == NULL) {
 				ret = show_spec_config(set, var);
-			else
+				if (ret < 0) {
+					pr_err("%s is not configured: %s\n",
+					       var, config_filename);
+					free(arg);
+					break;
+				}
+			} else {
 				ret = set_config(set, config_filename, var, value);
+				if (ret < 0) {
+					pr_err("Failed to set '%s=%s' on %s\n",
+					       var, value, config_filename);
+					free(arg);
+					break;
+				}
+			}
 			free(arg);
 		}
 	}
Signature · 1 line
2.7.4