trace-cmd: Allow trace-read -w to work without wakeup event success field

The wakeup event "success" field is going away. Do not depend on it.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 8 insertions, 13 deletions

diff --git a/trace-read.c b/trace-read.c
index f8455a3..4aa8d75 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -300,9 +300,6 @@ static void init_wakeup(struct tracecmd_input *handle)
         if (!wakeup_task)
                 goto fail;
         wakeup_success = pevent_find_field(event, "success");
-        if (!wakeup_success)
-                goto fail;
-
 
         event = pevent_find_event_by_name(pevent, "sched", "sched_switch");
         if (!event)
@@ -323,8 +320,6 @@ static void init_wakeup(struct tracecmd_input *handle)
         if (!wakeup_new_task)
                 goto fail;
         wakeup_new_success = pevent_find_field(event, "success");
-        if (!wakeup_new_success)
-                goto fail;
 
  skip:
         return;
@@ -410,18 +405,18 @@ static void process_wakeup(struct pevent *pevent, struct record *record)
 
         id = pevent_data_type(pevent, record);
         if (id == wakeup_id) {
-                if (pevent_read_number_field(wakeup_success, record->data, &val))
-                        return;
-                if (!val)
-                        return;
+                if (pevent_read_number_field(wakeup_success, record->data, &val) == 0) {
+                        if (!val)
+                                return;
+                }
                 if (pevent_read_number_field(wakeup_task, record->data, &val))
                         return;
                 add_wakeup(val, record->ts);
         } else if (id == wakeup_new_id) {
-                if (pevent_read_number_field(wakeup_new_success, record->data, &val))
-                        return;
-                if (!val)
-                        return;
+                if (pevent_read_number_field(wakeup_new_success, record->data, &val) == 0) {
+                        if (!val)
+                                return;
+                }
                 if (pevent_read_number_field(wakeup_new_task, record->data, &val))
                         return;
                 add_wakeup(val, record->ts);