trace-cmd: Add option to ignore event not found error

Currently, if 'trace-cmd start' passes an event that is not found
it will cause the command to fail.

This can be a problem for an administrator using trace-cmd on several
machines that have different modules configured in. One script may
be used that has all the events to be traced, but some of the events
may not exist on all machines. This means each machine will need
its own separate script.

Instead of having a separate script, add a '-i' option that lets one
ignore failed events.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
LKML-Reference: <20100629144832.38C6.A69D9226@jp.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 8 insertions, 3 deletions

diff --git a/trace-cmd.c b/trace-cmd.c
index cdb0735..b4eb0fe 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -113,6 +113,8 @@ struct events {
 
 static struct tracecmd_recorder *recorder;
 
+static int ignore_event_not_found = 0;
+
 static char *get_temp_file(int cpu)
 {
         char *file = NULL;
@@ -738,7 +740,7 @@ static void update_event(const char *name, const char *filter,
 
                 ret = update_glob(str, filter, filter_only, update);
                 free(str);
-                if (!ret)
+                if (!ret && !ignore_event_not_found)
                         die("No events enabled with %s", name);
                 return;
         }
@@ -752,7 +754,7 @@ static void update_event(const char *name, const char *filter,
         ret2 = update_glob(str, filter, filter_only, update);
         free(str);
 
-        if (!ret && !ret2)
+        if (!ret && !ret2 && !ignore_event_not_found)
                 goto fail;
 
         return;
@@ -1431,7 +1433,7 @@ int main (int argc, char **argv)
                    (strcmp(argv[1], "start") == 0) ||
                    ((extract = strcmp(argv[1], "extract") == 0))) {
 
-                while ((c = getopt(argc-1, argv+1, "+he:f:Fp:do:O:s:r:vg:l:n:P:N:tb:k")) >= 0) {
+                while ((c = getopt(argc-1, argv+1, "+he:f:Fp:do:O:s:r:vg:l:n:P:N:tb:ki")) >= 0) {
                         switch (c) {
                         case 'h':
                                 usage(argv);
@@ -1543,6 +1545,9 @@ int main (int argc, char **argv)
                         case 'k':
                                 keep = 1;
                                 break;
+                        case 'i':
+                                ignore_event_not_found = 1;
+                                break;
                         }
                 }