diff options
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-probe.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index cdcd4eb3a57d..c63fa2925075 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c | |||
| @@ -288,6 +288,13 @@ static void cleanup_params(void) | |||
| 288 | memset(¶ms, 0, sizeof(params)); | 288 | memset(¶ms, 0, sizeof(params)); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static void pr_err_with_code(const char *msg, int err) | ||
| 292 | { | ||
| 293 | pr_err("%s", msg); | ||
| 294 | pr_debug(" Reason: %s (Code: %d)", strerror(-err), err); | ||
| 295 | pr_err("\n"); | ||
| 296 | } | ||
| 297 | |||
| 291 | static int | 298 | static int |
| 292 | __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | 299 | __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) |
| 293 | { | 300 | { |
| @@ -379,7 +386,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | |||
| 379 | } | 386 | } |
| 380 | ret = parse_probe_event_argv(argc, argv); | 387 | ret = parse_probe_event_argv(argc, argv); |
| 381 | if (ret < 0) { | 388 | if (ret < 0) { |
| 382 | pr_err(" Error: Parse Error. (%d)\n", ret); | 389 | pr_err_with_code(" Error: Command Parse Error.", ret); |
| 383 | return ret; | 390 | return ret; |
| 384 | } | 391 | } |
| 385 | } | 392 | } |
| @@ -419,8 +426,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | |||
| 419 | } | 426 | } |
| 420 | ret = show_perf_probe_events(); | 427 | ret = show_perf_probe_events(); |
| 421 | if (ret < 0) | 428 | if (ret < 0) |
| 422 | pr_err(" Error: Failed to show event list. (%d)\n", | 429 | pr_err_with_code(" Error: Failed to show event list.", ret); |
| 423 | ret); | ||
| 424 | return ret; | 430 | return ret; |
| 425 | } | 431 | } |
| 426 | if (params.show_funcs) { | 432 | if (params.show_funcs) { |
| @@ -445,8 +451,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | |||
| 445 | strfilter__delete(params.filter); | 451 | strfilter__delete(params.filter); |
| 446 | params.filter = NULL; | 452 | params.filter = NULL; |
| 447 | if (ret < 0) | 453 | if (ret < 0) |
| 448 | pr_err(" Error: Failed to show functions." | 454 | pr_err_with_code(" Error: Failed to show functions.", ret); |
| 449 | " (%d)\n", ret); | ||
| 450 | return ret; | 455 | return ret; |
| 451 | } | 456 | } |
| 452 | 457 | ||
| @@ -464,7 +469,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | |||
| 464 | 469 | ||
| 465 | ret = show_line_range(¶ms.line_range, params.target); | 470 | ret = show_line_range(¶ms.line_range, params.target); |
| 466 | if (ret < 0) | 471 | if (ret < 0) |
| 467 | pr_err(" Error: Failed to show lines. (%d)\n", ret); | 472 | pr_err_with_code(" Error: Failed to show lines.", ret); |
| 468 | return ret; | 473 | return ret; |
| 469 | } | 474 | } |
| 470 | if (params.show_vars) { | 475 | if (params.show_vars) { |
| @@ -485,7 +490,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | |||
| 485 | strfilter__delete(params.filter); | 490 | strfilter__delete(params.filter); |
| 486 | params.filter = NULL; | 491 | params.filter = NULL; |
| 487 | if (ret < 0) | 492 | if (ret < 0) |
| 488 | pr_err(" Error: Failed to show vars. (%d)\n", ret); | 493 | pr_err_with_code(" Error: Failed to show vars.", ret); |
| 489 | return ret; | 494 | return ret; |
| 490 | } | 495 | } |
| 491 | #endif | 496 | #endif |
| @@ -493,7 +498,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | |||
| 493 | if (params.dellist) { | 498 | if (params.dellist) { |
| 494 | ret = del_perf_probe_events(params.dellist); | 499 | ret = del_perf_probe_events(params.dellist); |
| 495 | if (ret < 0) { | 500 | if (ret < 0) { |
| 496 | pr_err(" Error: Failed to delete events. (%d)\n", ret); | 501 | pr_err_with_code(" Error: Failed to delete events.", ret); |
| 497 | return ret; | 502 | return ret; |
| 498 | } | 503 | } |
| 499 | } | 504 | } |
| @@ -504,7 +509,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) | |||
| 504 | params.target, | 509 | params.target, |
| 505 | params.force_add); | 510 | params.force_add); |
| 506 | if (ret < 0) { | 511 | if (ret < 0) { |
| 507 | pr_err(" Error: Failed to add events. (%d)\n", ret); | 512 | pr_err_with_code(" Error: Failed to add events.", ret); |
| 508 | return ret; | 513 | return ret; |
| 509 | } | 514 | } |
| 510 | } | 515 | } |
