libbpf-tools: fix some tools error info and usage

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>

diff --git a/libbpf-tools/biolatency.c b/libbpf-tools/biolatency.c
index 3bd8672ae8d702c8d14193e087ab49258cbc4a23..e510079688321f312b9c3defae686e3bd5af6b69 100644 (file)
--- a/libbpf-tools/biolatency.c
+++ b/libbpf-tools/biolatency.c
@@ -40,7 +40,7 @@ const char *argp_program_bug_address = "<bpf@vger.kernel.org>";
 const char argp_program_doc[] =
 "Summarize block device I/O latency as a histogram.\n"
 "\n"
-"USAGE: biolatency [--help] [-T] [-m] [-Q] [-D] [-F] [-d] [interval] [count]\n"
+"USAGE: biolatency [--help] [-T] [-m] [-Q] [-D] [-F] [-d DISK] [interval] [count]\n"
 "\n"
 "EXAMPLES:\n"
 "    biolatency              # summarize block I/O latency as a histogram\n"
@@ -250,7 +250,7 @@ int main(int argc, char **argv)
 
        obj = biolatency_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF ojbect\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/biopattern.c b/libbpf-tools/biopattern.c
index 121e5f8e1d09c26432c366b16122b16b1b4815d2..472e63a5dd736319af305d181c491491aa496f07 100644 (file)
--- a/libbpf-tools/biopattern.c
+++ b/libbpf-tools/biopattern.c
@@ -32,7 +32,7 @@ const char *argp_program_bug_address = "<bpf@vger.kernel.org>";
 const char argp_program_doc[] =
 "Show block device I/O pattern.\n"
 "\n"
-"USAGE: biopattern [--help] [-T] [-d] [interval] [count]\n"
+"USAGE: biopattern [--help] [-T] [-d DISK] [interval] [count]\n"
 "\n"
 "EXAMPLES:\n"
 "    biopattern              # show block I/O pattern\n"
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
 
        obj = biopattern_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF ojbect\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/biosnoop.c b/libbpf-tools/biosnoop.c
index 3bdfd8c6d5e43863d82ac921e787752bdef7ee7e..8dfcfd0ab48e5e19bca85ae5f567e173d547cbde 100644 (file)
--- a/libbpf-tools/biosnoop.c
+++ b/libbpf-tools/biosnoop.c
@@ -33,7 +33,7 @@ const char *argp_program_bug_address = "<bpf@vger.kernel.org>";
 const char argp_program_doc[] =
 "Trace block I/O.\n"
 "\n"
-"USAGE: biosnoop [--help] [-d] [-Q]\n"
+"USAGE: biosnoop [--help] [-d DISK] [-Q]\n"
 "\n"
 "EXAMPLES:\n"
 "    biosnoop              # trace all block I/O\n"
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
 
        obj = biosnoop_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF ojbect\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/biostacks.c b/libbpf-tools/biostacks.c
index 3d25d2c2a256f3c14d015f9ff41f1c68c1fc7b3f..eab20251f4774491ad66849669ec1bc8d40b33db 100644 (file)
--- a/libbpf-tools/biostacks.c
+++ b/libbpf-tools/biostacks.c
@@ -27,7 +27,7 @@ const char *argp_program_bug_address = "<bpf@vger.kernel.org>";
 const char argp_program_doc[] =
 "Tracing block I/O with init stacks.\n"
 "\n"
-"USAGE: biostacks [--help] [-d disk] [-m] [duration]\n"
+"USAGE: biostacks [--help] [-d DISK] [-m] [duration]\n"
 "\n"
 "EXAMPLES:\n"
 "    biostacks              # trace block I/O with init stacks.\n"
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
 
        obj = biostacks_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF ojbect\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/bitesize.c b/libbpf-tools/bitesize.c
index 967bf80a3f74ac0fcdc6c5f465d9ba8668d0c722..9fc49da2703ba02dc8523d0d99fddbb90f8b2b92 100644 (file)
--- a/libbpf-tools/bitesize.c
+++ b/libbpf-tools/bitesize.c
@@ -34,7 +34,7 @@ const char *argp_program_bug_address = "<bpf@vger.kernel.org>";
 const char argp_program_doc[] =
 "Summarize block device I/O size as a histogram.\n"
 "\n"
-"USAGE: bitesize [--help] [-T] [-c] [-d] [interval] [count]\n"
+"USAGE: bitesize [--help] [-T] [-c COMM] [-d DISK] [interval] [count]\n"
 "\n"
 "EXAMPLES:\n"
 "    bitesize              # summarize block I/O latency as a histogram\n"
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
 
        obj = bitesize_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF ojbect\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/cpudist.c b/libbpf-tools/cpudist.c
index 2315fb55b3af67599efd84f443b03482bccb1e55..942ce57284f4a4c532fc0ff6fa2a62fa3218585e 100644 (file)
--- a/libbpf-tools/cpudist.c
+++ b/libbpf-tools/cpudist.c
@@ -203,7 +203,7 @@ int main(int argc, char **argv)
 
        obj = cpudist_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF ojbect\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/drsnoop.c b/libbpf-tools/drsnoop.c
index 68903a7f2cc575d030509fcf4b0d7bfe1cd1751a..cb14cac300f56fd8825108c161d3a64c62d8875d 100644 (file)
--- a/libbpf-tools/drsnoop.c
+++ b/libbpf-tools/drsnoop.c
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 
        obj = drsnoop_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/execsnoop.c b/libbpf-tools/execsnoop.c
index 417e41040600aab246e3ea7c0d7cff3ef46e43ee..34cd9441112b10997e2bc5ed6d8c222a7c9a507b 100644 (file)
--- a/libbpf-tools/execsnoop.c
+++ b/libbpf-tools/execsnoop.c
@@ -271,7 +271,7 @@ int main(int argc, char **argv)
 
        obj = execsnoop_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/filelife.c b/libbpf-tools/filelife.c
index 22028412a62494a439370a70389cce01e8a27992..773da25f41b35f0920a6491fa1edb5758e6a56d5 100644 (file)
--- a/libbpf-tools/filelife.c
+++ b/libbpf-tools/filelife.c
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
 
        obj = filelife_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/hardirqs.c b/libbpf-tools/hardirqs.c
index 8366e20885cc57dc166a7eb1aebd6b4c7e83c2dc..c161e1ff9de6cf6b5033880b668301ad80d8def6 100644 (file)
--- a/libbpf-tools/hardirqs.c
+++ b/libbpf-tools/hardirqs.c
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
 
        obj = hardirqs_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/llcstat.c b/libbpf-tools/llcstat.c
index d6ec8636c4e17f5526ccad80f18067256caf09f7..654a911a846c1c7a960e82093ed052238c1baf2f 100644 (file)
--- a/libbpf-tools/llcstat.c
+++ b/libbpf-tools/llcstat.c
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
 
        obj = llcstat_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/opensnoop.c b/libbpf-tools/opensnoop.c
index 37c3f50df84db9a1fc061f6d4d73018d17b1122b..722f6ce2237f682c4b5c21fb993b2c91e4824d7d 100644 (file)
--- a/libbpf-tools/opensnoop.c
+++ b/libbpf-tools/opensnoop.c
@@ -231,7 +231,7 @@ int main(int argc, char **argv)
 
        obj = opensnoop_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/runqlat.c b/libbpf-tools/runqlat.c
index 12cc400810956fa7e9266cebb646afad3b967bca..6d53133c61364f7e2cc093e99742d1676c12c0ce 100644 (file)
--- a/libbpf-tools/runqlat.c
+++ b/libbpf-tools/runqlat.c
@@ -199,7 +199,7 @@ int main(int argc, char **argv)
 
        obj = runqlat_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/runqslower.c b/libbpf-tools/runqslower.c
index 7c598a5a5a35f664cfbd90dbf698660cf944018f..1a33b60fa229194e20271056310e0263c9c368e1 100644 (file)
--- a/libbpf-tools/runqslower.c
+++ b/libbpf-tools/runqslower.c
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
 
        obj = runqslower_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/softirqs.c b/libbpf-tools/softirqs.c
index b23bfa1635617c732dffa72997469d4f5730ab54..6c4844e2f00202ca1cabc6b7c8ae51c0171a32c3 100644 (file)
--- a/libbpf-tools/softirqs.c
+++ b/libbpf-tools/softirqs.c
@@ -201,7 +201,7 @@ int main(int argc, char **argv)
 
        obj = softirqs_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF object\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }
 

diff --git a/libbpf-tools/syscount.c b/libbpf-tools/syscount.c
index 3ccf7ab43f271814ab14bd0cc388ca6869294433..ee5ce27f65ad6a25b1458bfd2d4a0ff1ca957c8e 100644 (file)
--- a/libbpf-tools/syscount.c
+++ b/libbpf-tools/syscount.c
@@ -394,7 +394,7 @@ int main(int argc, char **argv)
 
        obj = syscount_bpf__open();
        if (!obj) {
-               warn("failed to open and/or load BPF object\n");
+               warn("failed to open BPF object\n");
                err = 1;
                goto free_names;
        }

diff --git a/libbpf-tools/tcpconnlat.c b/libbpf-tools/tcpconnlat.c
index b53bf1e351f806ddcdda6d263bdf8f57ec073b92..9cd8636727e4ff7bd36bda517ca1fce182455902 100644 (file)
--- a/libbpf-tools/tcpconnlat.c
+++ b/libbpf-tools/tcpconnlat.c
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
 
        obj = tcpconnlat_bpf__open();
        if (!obj) {
-               fprintf(stderr, "failed to open and/or load BPF ojbect\n");
+               fprintf(stderr, "failed to open BPF object\n");
                return 1;
        }