1 files changed, 28 insertions, 11 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index ab19a6ee4093..313c42423393 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1489,6 +1489,7 @@ struct perf_script {
         bool                    show_switch_events;
         bool                    show_namespace_events;
         bool                    show_lost_events;
+        bool                    show_round_events;
         bool                    allocated;
         bool                    per_event_dump;
         struct cpu_map          *cpus;
@@ -2104,6 +2105,16 @@ process_lost_event(struct perf_tool *tool,
         return 0;
 }
 
+static int
+process_finished_round_event(struct perf_tool *tool __maybe_unused,
+                             union perf_event *event,
+                             struct ordered_events *oe __maybe_unused)
+
+{
+        perf_event__fprintf(event, stdout);
+        return 0;
+}
+
 static void sig_handler(int sig __maybe_unused)
 {
         session_done = 1;
@@ -2200,6 +2211,10 @@ static int __cmd_script(struct perf_script *script)
                 script->tool.namespaces = process_namespaces_event;
         if (script->show_lost_events)
                 script->tool.lost = process_lost_event;
+        if (script->show_round_events) {
+                script->tool.ordered_events = false;
+                script->tool.finished_round = process_finished_round_event;
+        }
 
         if (perf_script__setup_per_event_dump(script)) {
                 pr_err("Couldn't create the per event dump files\n");
@@ -2659,8 +2674,8 @@ static int list_available_scripts(const struct option *opt __maybe_unused,
         }
 
         for_each_lang(scripts_path, scripts_dir, lang_dirent) {
-                snprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,
-                         lang_dirent->d_name);
+                scnprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,
+                          lang_dirent->d_name);
                 lang_dir = opendir(lang_path);
                 if (!lang_dir)
                         continue;
@@ -2669,8 +2684,8 @@ static int list_available_scripts(const struct option *opt __maybe_unused,
                         script_root = get_script_root(script_dirent, REPORT_SUFFIX);
                         if (script_root) {
                                 desc = script_desc__findnew(script_root);
-                                snprintf(script_path, MAXPATHLEN, "%s/%s",
-                                         lang_path, script_dirent->d_name);
+                                scnprintf(script_path, MAXPATHLEN, "%s/%s",
+                                          lang_path, script_dirent->d_name);
                                 read_script_info(desc, script_path);
                                 free(script_root);
                         }
@@ -2706,7 +2721,7 @@ static int check_ev_match(char *dir_name, char *scriptname,
         int match, len;
         FILE *fp;
 
-        sprintf(filename, "%s/bin/%s-record", dir_name, scriptname);
+        scnprintf(filename, MAXPATHLEN, "%s/bin/%s-record", dir_name, scriptname);
 
         fp = fopen(filename, "r");
         if (!fp)
@@ -2784,8 +2799,8 @@ int find_scripts(char **scripts_array, char **scripts_path_array)
         }
 
         for_each_lang(scripts_path, scripts_dir, lang_dirent) {
-                snprintf(lang_path, MAXPATHLEN, "%s/%s", scripts_path,
-                         lang_dirent->d_name);
+                scnprintf(lang_path, MAXPATHLEN, "%s/%s", scripts_path,
+                          lang_dirent->d_name);
 #ifdef NO_LIBPERL
                 if (strstr(lang_path, "perl"))
                         continue;
@@ -2840,8 +2855,8 @@ static char *get_script_path(const char *script_root, const char *suffix)
                 return NULL;
 
         for_each_lang(scripts_path, scripts_dir, lang_dirent) {
-                snprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,
-                         lang_dirent->d_name);
+                scnprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,
+                          lang_dirent->d_name);
                 lang_dir = opendir(lang_path);
                 if (!lang_dir)
                         continue;
@@ -2852,8 +2867,8 @@ static char *get_script_path(const char *script_root, const char *suffix)
                                 free(__script_root);
                                 closedir(lang_dir);
                                 closedir(scripts_dir);
-                                snprintf(script_path, MAXPATHLEN, "%s/%s",
-                                         lang_path, script_dirent->d_name);
+                                scnprintf(script_path, MAXPATHLEN, "%s/%s",
+                                          lang_path, script_dirent->d_name);
                                 return strdup(script_path);
                         }
                         free(__script_root);
@@ -3139,6 +3154,8 @@ int cmd_script(int argc, const char **argv)
                     "Show namespace events (if recorded)"),
         OPT_BOOLEAN('\0', "show-lost-events", &script.show_lost_events,
                     "Show lost events (if recorded)"),
+        OPT_BOOLEAN('\0', "show-round-events", &script.show_round_events,
+                    "Show round events (if recorded)"),
         OPT_BOOLEAN('\0', "per-event-dump", &script.per_event_dump,
                     "Dump trace output to files named by the monitored events"),
         OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"),