1 files changed, 20 insertions, 4 deletions

diff --git a/trace-cmd.c b/trace-cmd.c
index cdb0735..cce499a 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;
@@ -979,6 +981,13 @@ static int count_cpus(void)
         size_t n;
         int r;
 
+        cpus = sysconf(_SC_NPROCESSORS_ONLN);
+        if (cpus > 0)
+                return cpus;
+
+        warning("sysconf could not determine number of CPUS");
+
+        /* Do the hack to figure out # of CPUS */
         n = 1024;
         pn = &n;
         pbuf = buf;
@@ -1222,7 +1231,7 @@ static void setup_network(void)
         }
 
         /* Now create the handle through this socket */
-        handle = tracecmd_create_init_fd(sfd, cpu_count);
+        handle = tracecmd_create_init_fd(sfd);
 
         /* OK, we are all set, let'r rip! */
 }
@@ -1427,11 +1436,14 @@ int main (int argc, char **argv)
         } else if (strcmp(argv[1], "split") == 0) {
                 trace_split(argc, argv);
                 exit(0);
+        } else if (strcmp(argv[1], "restore") == 0) {
+                trace_restore(argc, argv);
+                exit(0);
         } else if ((record = (strcmp(argv[1], "record") == 0)) ||
                    (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 +1555,9 @@ int main (int argc, char **argv)
                         case 'k':
                                 keep = 1;
                                 break;
+                        case 'i':
+                                ignore_event_not_found = 1;
+                                break;
                         }
                 }
 
@@ -1708,6 +1723,7 @@ int main (int argc, char **argv)
                 trace_seq_printf(&s, "CPU: %d\n", cpu);
                 tracecmd_stat_cpu(&s, cpu);
                 trace_seq_do_printf(&s);
+                trace_seq_destroy(&s);
                 printf("\n");
         }