perf script: Factor out perf_sample__sprintf_flags()

Factor out perf_sample__sprintf_flags() so it can be reused.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20210525095112.1399-5-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index f502d1c..69bce65 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1553,41 +1553,49 @@ static const char *sample_flags_to_name(u32 flags)
        return NULL;
 }
 
-static int perf_sample__fprintf_flags(u32 flags, FILE *fp)
+int perf_sample__sprintf_flags(u32 flags, char *str, size_t sz)
 {
        const char *chars = PERF_IP_FLAG_CHARS;
-       const int n = strlen(PERF_IP_FLAG_CHARS);
+       const size_t n = strlen(PERF_IP_FLAG_CHARS);
        bool in_tx = flags & PERF_IP_FLAG_IN_TX;
        const char *name = NULL;
-       char str[33];
-       int i, pos = 0;
+       size_t i, pos = 0;
 
        name = sample_flags_to_name(flags & ~PERF_IP_FLAG_IN_TX);
        if (name)
-               return fprintf(fp, "  %-15s%4s ", name, in_tx ? "(x)" : "");
+               return snprintf(str, sz, "%-15s%4s", name, in_tx ? "(x)" : "");
 
        if (flags & PERF_IP_FLAG_TRACE_BEGIN) {
                name = sample_flags_to_name(flags & ~(PERF_IP_FLAG_IN_TX | PERF_IP_FLAG_TRACE_BEGIN));
                if (name)
-                       return fprintf(fp, "  tr strt %-7s%4s ", name, in_tx ? "(x)" : "");
+                       return snprintf(str, sz, "tr strt %-7s%4s", name, in_tx ? "(x)" : "");
        }
 
        if (flags & PERF_IP_FLAG_TRACE_END) {
                name = sample_flags_to_name(flags & ~(PERF_IP_FLAG_IN_TX | PERF_IP_FLAG_TRACE_END));
                if (name)
-                       return fprintf(fp, "  tr end  %-7s%4s ", name, in_tx ? "(x)" : "");
+                       return snprintf(str, sz, "tr end  %-7s%4s", name, in_tx ? "(x)" : "");
        }
 
        for (i = 0; i < n; i++, flags >>= 1) {
-               if (flags & 1)
+               if ((flags & 1) && pos < sz)
                        str[pos++] = chars[i];
        }
        for (; i < 32; i++, flags >>= 1) {
-               if (flags & 1)
+               if ((flags & 1) && pos < sz)
                        str[pos++] = '?';
        }
-       str[pos] = 0;
+       if (pos < sz)
+               str[pos] = 0;
+
+       return pos;
+}
+
+static int perf_sample__fprintf_flags(u32 flags, FILE *fp)
+{
+       char str[SAMPLE_FLAGS_BUF_SIZE];
 
+       perf_sample__sprintf_flags(flags, str, sizeof(str));
        return fprintf(fp, "  %-19s ", str);
 }
 

diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index 2469446..7276674 100644 (file)
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -105,4 +105,7 @@ int common_pc(struct scripting_context *context);
 int common_flags(struct scripting_context *context);
 int common_lock_depth(struct scripting_context *context);
 
+#define SAMPLE_FLAGS_BUF_SIZE 64
+int perf_sample__sprintf_flags(u32 flags, char *str, size_t sz);
+
 #endif /* _PERF_UTIL_TRACE_EVENT_H */