parse-events: Add helper function pevent_print_num_field()

The _print_field() and print_field() functions were being used by multiple
plugins. Each implementing their own helper function to get a field
and print its value.

Instead of having multiple functions to do the same job in different
plugins, just add it to the core code.

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

4 files changed, 47 insertions, 65 deletions

diff --git a/parse-events.c b/parse-events.c
index d95dda4..8fd93ec 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -4421,6 +4421,38 @@ int pevent_parse_event(struct pevent *pevent,
         return -1;
 }
 
+/**
+ * pevent_print_num_field - print a field and a format
+ * @s: The seq to print to
+ * @fmt: The printf format to print the field with.
+ * @event: the event that the field is for
+ * @name: The name of the field
+ * @record: The record with the field name.
+ * @err: print default error if failed.
+ *
+ * Returns: 0 on success, -1 field not fould, or 1 if buffer is full.
+ */
+int pevent_print_num_field(struct trace_seq *s, const char *fmt,
+                           struct event_format *event, const char *name,
+                           struct record *record, int err)
+{
+        struct format_field *field = pevent_find_field(event, name);
+        unsigned long long val;
+
+        if (!field)
+                goto failed;
+
+        if (pevent_read_number_field(field, record->data, &val))
+                goto failed;
+
+        return trace_seq_printf(s, fmt, val);
+
+ failed:
+        if (err)
+                trace_seq_printf(s, "CAN'T FIND FIELD \"%s\"", name);
+        return -1;
+}
+
 static void free_func_handle(struct pevent_function_handler *func)
 {
         struct pevent_func_params *params;
diff --git a/parse-events.h b/parse-events.h
index fdbe617..d90a698 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -448,6 +448,10 @@ int pevent_parse_header_page(struct pevent *pevent, char *buf, unsigned long siz
 int pevent_parse_event(struct pevent *pevent, const char *buf,
                        unsigned long size, const char *sys);
 
+int pevent_print_num_field(struct trace_seq *s, const char *fmt,
+                           struct event_format *event, const char *name,
+                           struct record *record, int err);
+
 int pevent_register_event_handler(struct pevent *pevent, int id, char *sys_name, char *event_name,
                                   pevent_event_handler_func func, void *context);
 int pevent_register_print_function(struct pevent *pevent,
diff --git a/plugin_hrtimer.c b/plugin_hrtimer.c
index eafcbbd..3db6047 100644
--- a/plugin_hrtimer.c
+++ b/plugin_hrtimer.c
@@ -25,45 +25,17 @@
 
 #include "parse-events.h"
 
-/* return -1 (field not found/not valid number), 0 (ok), 1 (buffer full) */
-static int _print_field(struct trace_seq *s, const char *fmt,
-                        struct event_format *event, const char *name, const void *data)
-{
-        struct format_field *f = pevent_find_field(event, name);
-        unsigned long long val;
-
-        if (!f)
-                return -1;
-
-        if (pevent_read_number_field(f, data, &val))
-                return -1;
-
-        return trace_seq_printf(s, fmt, val);
-}
-
-/* return 0 (ok), 1 (buffer full) */
-static void print_field(struct trace_seq *s, const char *fmt,
-                        struct event_format *event, const char *name, const void *data)
-{
-        int ret = _print_field(s, fmt, event, name, data);
-
-        if (ret == -1)
-                trace_seq_printf(s, "CAN'T FIND FIELD \"%s\"", name);
-}
-
 static int timer_expire_handler(struct trace_seq *s, struct record *record,
                                 struct event_format *event, void *context)
 {
-        void *data = record->data;
-
         trace_seq_printf(s, "hrtimer=");
 
-        if (_print_field(s, "0x%llx", event, "timer", data) == -1)
-                print_field(s, "0x%llx", event, "hrtimer", data);
+        if (pevent_print_num_field(s, "0x%llx", event, "timer", record, 0) == -1)
+                pevent_print_num_field(s, "0x%llx", event, "hrtimer", record, 1);
 
         trace_seq_printf(s, " now=");
 
-        print_field(s, "%llu", event, "now", data);
+        pevent_print_num_field(s, "%llu", event, "now", record, 1);
 
         return 0;
 }
@@ -77,8 +49,8 @@ static int timer_start_handler(struct trace_seq *s, struct record *record,
 
         trace_seq_printf(s, "hrtimer=");
 
-        if (_print_field(s, "0x%llx", event, "timer", data) == -1)
-                print_field(s, "0x%llx", event, "hrtimer", data);
+        if (pevent_print_num_field(s, "0x%llx", event, "timer", record, 0) == -1)
+                pevent_print_num_field(s, "0x%llx", event, "hrtimer", record, 1);
 
         if (!fn) {
                 trace_seq_printf(s, " function=MISSING");
@@ -95,10 +67,10 @@ static int timer_start_handler(struct trace_seq *s, struct record *record,
         }
 
         trace_seq_printf(s, " expires=");
-        print_field(s, "%llu", event, "expires", data);
+        pevent_print_num_field(s, "%llu", event, "expires", record, 1);
 
         trace_seq_printf(s, " softexpires=");
-        print_field(s, "%llu", event, "softexpires", data);
+        pevent_print_num_field(s, "%llu", event, "softexpires", record, 1);
 
         return 0;
 }
diff --git a/plugin_mac80211.c b/plugin_mac80211.c
index e194ec2..3a2747f 100644
--- a/plugin_mac80211.c
+++ b/plugin_mac80211.c
@@ -26,32 +26,6 @@
 
 #define INDENT 65
 
-/* return -1 (field not found/not valid number), 0 (ok), 1 (buffer full) */
-static int _print_field(struct trace_seq *s, const char *fmt,
-                        struct event_format *event, const char *name, const void *data)
-{
-        struct format_field *f = pevent_find_field(event, name);
-        unsigned long long val;
-
-        if (!f)
-                return -1;
-
-        if (pevent_read_number_field(f, data, &val))
-                return -1;
-
-        return trace_seq_printf(s, fmt, val);
-}
-
-/* return 0 (ok), 1 (buffer full) */
-static void print_field(struct trace_seq *s, const char *fmt,
-                        struct event_format *event, const char *name, const void *data)
-{
-        int ret = _print_field(s, fmt, event, name, data);
-
-        if (ret == -1)
-                trace_seq_printf(s, "NOTFOUND:%s", name);
-}
-
 static void print_string(struct trace_seq *s, struct event_format *event,
                          const char *name, const void *data)
 {
@@ -161,8 +135,8 @@ static void _print_flag(struct trace_seq *s, struct event_format *event,
         _print_flag(s, ev, name, data, __n, sizeof(__n)/sizeof(__n[0]));        \
         })
 
-#define SF(fn)  _print_field(s, fn ":%d", event, fn, data)
-#define SFX(fn) _print_field(s, fn ":%#x", event, fn, data)
+#define SF(fn)  pevent_print_num_field(s, fn ":%d", event, fn, record, 0)
+#define SFX(fn) pevent_print_num_field(s, fn ":%#x", event, fn, record, 0)
 #define SP()    trace_seq_putc(s, ' ')
 
 static int drv_bss_info_changed(struct trace_seq *s, struct record *record,
@@ -173,7 +147,7 @@ static int drv_bss_info_changed(struct trace_seq *s, struct record *record,
         print_string(s, event, "wiphy_name", data);
         trace_seq_printf(s, " vif:");
         print_string(s, event, "vif_name", data);
-        print_field(s, "(%d)", event, "vif_type", data);
+        pevent_print_num_field(s, "(%d)", event, "vif_type", record, 1);
 
         trace_seq_printf(s, "\n%*s", INDENT, "");
         SF("assoc"); SP();
@@ -206,7 +180,7 @@ static int drv_config(struct trace_seq *s, struct record *record,
                 { 2, "IDLE" },
                 { 3, "QOS"},
         );
-        print_field(s, " chan:%d/", event, "center_freq", data);
+        pevent_print_num_field(s, " chan:%d/", event, "center_freq", record, 1);
         print_enum(s, event, "channel_type", data,
                 { 0, "noht" },
                 { 1, "ht20" },