perf python: Add missing perf_event__parse_sample 'swapped' parm
[linux-2.6.git] / tools / perf / builtin-script.c
index 4539551..09024ec 100644 (file)
 #include "util/symbol.h"
 #include "util/thread.h"
 #include "util/trace-event.h"
-#include "util/parse-options.h"
 #include "util/util.h"
+#include "util/evlist.h"
+#include "util/evsel.h"
+#include <linux/bitmap.h>
 
 static char const              *script_name;
 static char const              *generate_script_lang;
@@ -19,6 +21,374 @@ static bool                 debug_mode;
 static u64                     last_timestamp;
 static u64                     nr_unordered;
 extern const struct option     record_options[];
+static bool                    no_callchain;
+static const char              *cpu_list;
+static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
+
+enum perf_output_field {
+       PERF_OUTPUT_COMM            = 1U << 0,
+       PERF_OUTPUT_TID             = 1U << 1,
+       PERF_OUTPUT_PID             = 1U << 2,
+       PERF_OUTPUT_TIME            = 1U << 3,
+       PERF_OUTPUT_CPU             = 1U << 4,
+       PERF_OUTPUT_EVNAME          = 1U << 5,
+       PERF_OUTPUT_TRACE           = 1U << 6,
+       PERF_OUTPUT_IP              = 1U << 7,
+       PERF_OUTPUT_SYM             = 1U << 8,
+       PERF_OUTPUT_DSO             = 1U << 9,
+       PERF_OUTPUT_ADDR            = 1U << 10,
+};
+
+struct output_option {
+       const char *str;
+       enum perf_output_field field;
+} all_output_options[] = {
+       {.str = "comm",  .field = PERF_OUTPUT_COMM},
+       {.str = "tid",   .field = PERF_OUTPUT_TID},
+       {.str = "pid",   .field = PERF_OUTPUT_PID},
+       {.str = "time",  .field = PERF_OUTPUT_TIME},
+       {.str = "cpu",   .field = PERF_OUTPUT_CPU},
+       {.str = "event", .field = PERF_OUTPUT_EVNAME},
+       {.str = "trace", .field = PERF_OUTPUT_TRACE},
+       {.str = "ip",    .field = PERF_OUTPUT_IP},
+       {.str = "sym",   .field = PERF_OUTPUT_SYM},
+       {.str = "dso",   .field = PERF_OUTPUT_DSO},
+       {.str = "addr",  .field = PERF_OUTPUT_ADDR},
+};
+
+/* default set to maintain compatibility with current format */
+static struct {
+       bool user_set;
+       bool wildcard_set;
+       u64 fields;
+       u64 invalid_fields;
+} output[PERF_TYPE_MAX] = {
+
+       [PERF_TYPE_HARDWARE] = {
+               .user_set = false,
+
+               .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
+                             PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
+                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
+
+               .invalid_fields = PERF_OUTPUT_TRACE,
+       },
+
+       [PERF_TYPE_SOFTWARE] = {
+               .user_set = false,
+
+               .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
+                             PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
+                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
+
+               .invalid_fields = PERF_OUTPUT_TRACE,
+       },
+
+       [PERF_TYPE_TRACEPOINT] = {
+               .user_set = false,
+
+               .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
+                                 PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
+                                 PERF_OUTPUT_EVNAME | PERF_OUTPUT_TRACE,
+       },
+
+       [PERF_TYPE_RAW] = {
+               .user_set = false,
+
+               .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
+                             PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
+                             PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
+
+               .invalid_fields = PERF_OUTPUT_TRACE,
+       },
+};
+
+static bool output_set_by_user(void)
+{
+       int j;
+       for (j = 0; j < PERF_TYPE_MAX; ++j) {
+               if (output[j].user_set)
+                       return true;
+       }
+       return false;
+}
+
+static const char *output_field2str(enum perf_output_field field)
+{
+       int i, imax = ARRAY_SIZE(all_output_options);
+       const char *str = "";
+
+       for (i = 0; i < imax; ++i) {
+               if (all_output_options[i].field == field) {
+                       str = all_output_options[i].str;
+                       break;
+               }
+       }
+       return str;
+}
+
+#define PRINT_FIELD(x)  (output[attr->type].fields & PERF_OUTPUT_##x)
+
+static int perf_event_attr__check_stype(struct perf_event_attr *attr,
+                                 u64 sample_type, const char *sample_msg,
+                                 enum perf_output_field field)
+{
+       int type = attr->type;
+       const char *evname;
+
+       if (attr->sample_type & sample_type)
+               return 0;
+
+       if (output[type].user_set) {
+               evname = __event_name(attr->type, attr->config);
+               pr_err("Samples for '%s' event do not have %s attribute set. "
+                      "Cannot print '%s' field.\n",
+                      evname, sample_msg, output_field2str(field));
+               return -1;
+       }
+
+       /* user did not ask for it explicitly so remove from the default list */
+       output[type].fields &= ~field;
+       evname = __event_name(attr->type, attr->config);
+       pr_debug("Samples for '%s' event do not have %s attribute set. "
+                "Skipping '%s' field.\n",
+                evname, sample_msg, output_field2str(field));
+
+       return 0;
+}
+
+static int perf_evsel__check_attr(struct perf_evsel *evsel,
+                                 struct perf_session *session)
+{
+       struct perf_event_attr *attr = &evsel->attr;
+
+       if (PRINT_FIELD(TRACE) &&
+               !perf_session__has_traces(session, "record -R"))
+               return -EINVAL;
+
+       if (PRINT_FIELD(IP)) {
+               if (perf_event_attr__check_stype(attr, PERF_SAMPLE_IP, "IP",
+                                          PERF_OUTPUT_IP))
+                       return -EINVAL;
+
+               if (!no_callchain &&
+                   !(attr->sample_type & PERF_SAMPLE_CALLCHAIN))
+                       symbol_conf.use_callchain = false;
+       }
+
+       if (PRINT_FIELD(ADDR) &&
+               perf_event_attr__check_stype(attr, PERF_SAMPLE_ADDR, "ADDR",
+                                      PERF_OUTPUT_ADDR))
+               return -EINVAL;
+
+       if (PRINT_FIELD(SYM) && !PRINT_FIELD(IP) && !PRINT_FIELD(ADDR)) {
+               pr_err("Display of symbols requested but neither sample IP nor "
+                          "sample address\nis selected. Hence, no addresses to convert "
+                      "to symbols.\n");
+               return -EINVAL;
+       }
+       if (PRINT_FIELD(DSO) && !PRINT_FIELD(IP) && !PRINT_FIELD(ADDR)) {
+               pr_err("Display of DSO requested but neither sample IP nor "
+                          "sample address\nis selected. Hence, no addresses to convert "
+                      "to DSO.\n");
+               return -EINVAL;
+       }
+
+       if ((PRINT_FIELD(PID) || PRINT_FIELD(TID)) &&
+               perf_event_attr__check_stype(attr, PERF_SAMPLE_TID, "TID",
+                                      PERF_OUTPUT_TID|PERF_OUTPUT_PID))
+               return -EINVAL;
+
+       if (PRINT_FIELD(TIME) &&
+               perf_event_attr__check_stype(attr, PERF_SAMPLE_TIME, "TIME",
+                                      PERF_OUTPUT_TIME))
+               return -EINVAL;
+
+       if (PRINT_FIELD(CPU) &&
+               perf_event_attr__check_stype(attr, PERF_SAMPLE_CPU, "CPU",
+                                      PERF_OUTPUT_CPU))
+               return -EINVAL;
+
+       return 0;
+}
+
+/*
+ * verify all user requested events exist and the samples
+ * have the expected data
+ */
+static int perf_session__check_output_opt(struct perf_session *session)
+{
+       int j;
+       struct perf_evsel *evsel;
+
+       for (j = 0; j < PERF_TYPE_MAX; ++j) {
+               evsel = perf_session__find_first_evtype(session, j);
+
+               /*
+                * even if fields is set to 0 (ie., show nothing) event must
+                * exist if user explicitly includes it on the command line
+                */
+               if (!evsel && output[j].user_set && !output[j].wildcard_set) {
+                       pr_err("%s events do not exist. "
+                              "Remove corresponding -f option to proceed.\n",
+                              event_type(j));
+                       return -1;
+               }
+
+               if (evsel && output[j].fields &&
+                       perf_evsel__check_attr(evsel, session))
+                       return -1;
+       }
+
+       return 0;
+}
+
+static void print_sample_start(struct perf_sample *sample,
+                              struct thread *thread,
+                              struct perf_event_attr *attr)
+{
+       int type;
+       struct event *event;
+       const char *evname = NULL;
+       unsigned long secs;
+       unsigned long usecs;
+       unsigned long long nsecs;
+
+       if (PRINT_FIELD(COMM)) {
+               if (latency_format)
+                       printf("%8.8s ", thread->comm);
+               else if (PRINT_FIELD(IP) && symbol_conf.use_callchain)
+                       printf("%s ", thread->comm);
+               else
+                       printf("%16s ", thread->comm);
+       }
+
+       if (PRINT_FIELD(PID) && PRINT_FIELD(TID))
+               printf("%5d/%-5d ", sample->pid, sample->tid);
+       else if (PRINT_FIELD(PID))
+               printf("%5d ", sample->pid);
+       else if (PRINT_FIELD(TID))
+               printf("%5d ", sample->tid);
+
+       if (PRINT_FIELD(CPU)) {
+               if (latency_format)
+                       printf("%3d ", sample->cpu);
+               else
+                       printf("[%03d] ", sample->cpu);
+       }
+
+       if (PRINT_FIELD(TIME)) {
+               nsecs = sample->time;
+               secs = nsecs / NSECS_PER_SEC;
+               nsecs -= secs * NSECS_PER_SEC;
+               usecs = nsecs / NSECS_PER_USEC;
+               printf("%5lu.%06lu: ", secs, usecs);
+       }
+
+       if (PRINT_FIELD(EVNAME)) {
+               if (attr->type == PERF_TYPE_TRACEPOINT) {
+                       type = trace_parse_common_type(sample->raw_data);
+                       event = trace_find_event(type);
+                       if (event)
+                               evname = event->name;
+               } else
+                       evname = __event_name(attr->type, attr->config);
+
+               printf("%s: ", evname ? evname : "(unknown)");
+       }
+}
+
+static bool sample_addr_correlates_sym(struct perf_event_attr *attr)
+{
+       if ((attr->type == PERF_TYPE_SOFTWARE) &&
+           ((attr->config == PERF_COUNT_SW_PAGE_FAULTS) ||
+            (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MIN) ||
+            (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MAJ)))
+               return true;
+
+       return false;
+}
+
+static void print_sample_addr(union perf_event *event,
+                         struct perf_sample *sample,
+                         struct perf_session *session,
+                         struct thread *thread,
+                         struct perf_event_attr *attr)
+{
+       struct addr_location al;
+       u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
+       const char *symname, *dsoname;
+
+       printf("%16" PRIx64, sample->addr);
+
+       if (!sample_addr_correlates_sym(attr))
+               return;
+
+       thread__find_addr_map(thread, session, cpumode, MAP__FUNCTION,
+                             event->ip.pid, sample->addr, &al);
+       if (!al.map)
+               thread__find_addr_map(thread, session, cpumode, MAP__VARIABLE,
+                                     event->ip.pid, sample->addr, &al);
+
+       al.cpu = sample->cpu;
+       al.sym = NULL;
+
+       if (al.map)
+               al.sym = map__find_symbol(al.map, al.addr, NULL);
+
+       if (PRINT_FIELD(SYM)) {
+               if (al.sym && al.sym->name)
+                       symname = al.sym->name;
+               else
+                       symname = "";
+
+               printf(" %16s", symname);
+       }
+
+       if (PRINT_FIELD(DSO)) {
+               if (al.map && al.map->dso && al.map->dso->name)
+                       dsoname = al.map->dso->name;
+               else
+                       dsoname = "";
+
+               printf(" (%s)", dsoname);
+       }
+}
+
+static void process_event(union perf_event *event __unused,
+                         struct perf_sample *sample,
+                         struct perf_evsel *evsel,
+                         struct perf_session *session,
+                         struct thread *thread)
+{
+       struct perf_event_attr *attr = &evsel->attr;
+
+       if (output[attr->type].fields == 0)
+               return;
+
+       print_sample_start(sample, thread, attr);
+
+       if (PRINT_FIELD(TRACE))
+               print_trace_event(sample->cpu, sample->raw_data,
+                                 sample->raw_size);
+
+       if (PRINT_FIELD(ADDR))
+               print_sample_addr(event, sample, session, thread, attr);
+
+       if (PRINT_FIELD(IP)) {
+               if (!symbol_conf.use_callchain)
+                       printf(" ");
+               else
+                       printf("\n");
+               perf_session__print_ip(event, sample, session,
+                                             PRINT_FIELD(SYM), PRINT_FIELD(DSO));
+       }
+
+       printf("\n");
+}
 
 static int default_start_script(const char *script __unused,
                                int argc __unused,
@@ -40,7 +410,7 @@ static int default_generate_script(const char *outfile __unused)
 static struct scripting_ops default_scripting_ops = {
        .start_script           = default_start_script,
        .stop_script            = default_stop_script,
-       .process_event          = print_event,
+       .process_event          = process_event,
        .generate_script        = default_generate_script,
 };
 
@@ -63,71 +433,51 @@ static int cleanup_scripting(void)
 
 static char const              *input_name = "perf.data";
 
-static int process_sample_event(event_t *event, struct perf_session *session)
+static int process_sample_event(union perf_event *event,
+                               struct perf_sample *sample,
+                               struct perf_evsel *evsel,
+                               struct perf_session *session)
 {
-       struct sample_data data;
-       struct thread *thread;
-
-       memset(&data, 0, sizeof(data));
-       data.time = -1;
-       data.cpu = -1;
-       data.period = 1;
+       struct thread *thread = perf_session__findnew(session, event->ip.pid);
 
-       event__parse_sample(event, session->sample_type, &data);
-
-       dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
-                   data.pid, data.tid, data.ip, data.period);
-
-       thread = perf_session__findnew(session, event->ip.pid);
        if (thread == NULL) {
                pr_debug("problem processing %d event, skipping it.\n",
                         event->header.type);
                return -1;
        }
 
-       if (session->sample_type & PERF_SAMPLE_RAW) {
-               if (debug_mode) {
-                       if (data.time < last_timestamp) {
-                               pr_err("Samples misordered, previous: %llu "
-                                       "this: %llu\n", last_timestamp,
-                                       data.time);
-                               nr_unordered++;
-                       }
-                       last_timestamp = data.time;
-                       return 0;
+       if (debug_mode) {
+               if (sample->time < last_timestamp) {
+                       pr_err("Samples misordered, previous: %" PRIu64
+                               " this: %" PRIu64 "\n", last_timestamp,
+                               sample->time);
+                       nr_unordered++;
                }
-               /*
-                * FIXME: better resolve from pid from the struct trace_entry
-                * field, although it should be the same than this perf
-                * event pid
-                */
-               scripting_ops->process_event(data.cpu, data.raw_data,
-                                            data.raw_size,
-                                            data.time, thread->comm);
+               last_timestamp = sample->time;
+               return 0;
        }
 
-       session->hists.stats.total_period += data.period;
-       return 0;
-}
+       if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))
+               return 0;
 
-static u64 nr_lost;
-
-static int process_lost_event(event_t *event, struct perf_session *session __used)
-{
-       nr_lost += event->lost.lost;
+       scripting_ops->process_event(event, sample, evsel, session, thread);
 
+       session->hists.stats.total_period += sample->period;
        return 0;
 }
 
 static struct perf_event_ops event_ops = {
-       .sample = process_sample_event,
-       .comm   = event__process_comm,
-       .attr   = event__process_attr,
-       .event_type = event__process_event_type,
-       .tracing_data = event__process_tracing_data,
-       .build_id = event__process_build_id,
-       .lost = process_lost_event,
+       .sample          = process_sample_event,
+       .mmap            = perf_event__process_mmap,
+       .comm            = perf_event__process_comm,
+       .exit            = perf_event__process_task,
+       .fork            = perf_event__process_task,
+       .attr            = perf_event__process_attr,
+       .event_type      = perf_event__process_event_type,
+       .tracing_data    = perf_event__process_tracing_data,
+       .build_id        = perf_event__process_build_id,
        .ordered_samples = true,
+       .ordering_requires_timestamps = true,
 };
 
 extern volatile int session_done;
@@ -145,10 +495,8 @@ static int __cmd_script(struct perf_session *session)
 
        ret = perf_session__process_events(session, &event_ops);
 
-       if (debug_mode) {
-               pr_err("Misordered timestamps: %llu\n", nr_unordered);
-               pr_err("Lost events: %llu\n", nr_lost);
-       }
+       if (debug_mode)
+               pr_err("Misordered timestamps: %" PRIu64 "\n", nr_unordered);
 
        return ret;
 }
@@ -159,7 +507,7 @@ struct script_spec {
        char                    spec[0];
 };
 
-LIST_HEAD(script_specs);
+static LIST_HEAD(script_specs);
 
 static struct script_spec *script_spec__new(const char *spec,
                                            struct scripting_ops *ops)
@@ -301,6 +649,116 @@ static int parse_scriptname(const struct option *opt __used,
        return 0;
 }
 
+static int parse_output_fields(const struct option *opt __used,
+                           const char *arg, int unset __used)
+{
+       char *tok;
+       int i, imax = sizeof(all_output_options) / sizeof(struct output_option);
+       int j;
+       int rc = 0;
+       char *str = strdup(arg);
+       int type = -1;
+
+       if (!str)
+               return -ENOMEM;
+
+       /* first word can state for which event type the user is specifying
+        * the fields. If no type exists, the specified fields apply to all
+        * event types found in the file minus the invalid fields for a type.
+        */
+       tok = strchr(str, ':');
+       if (tok) {
+               *tok = '\0';
+               tok++;
+               if (!strcmp(str, "hw"))
+                       type = PERF_TYPE_HARDWARE;
+               else if (!strcmp(str, "sw"))
+                       type = PERF_TYPE_SOFTWARE;
+               else if (!strcmp(str, "trace"))
+                       type = PERF_TYPE_TRACEPOINT;
+               else if (!strcmp(str, "raw"))
+                       type = PERF_TYPE_RAW;
+               else {
+                       fprintf(stderr, "Invalid event type in field string.\n");
+                       return -EINVAL;
+               }
+
+               if (output[type].user_set)
+                       pr_warning("Overriding previous field request for %s events.\n",
+                                  event_type(type));
+
+               output[type].fields = 0;
+               output[type].user_set = true;
+               output[type].wildcard_set = false;
+
+       } else {
+               tok = str;
+               if (strlen(str) == 0) {
+                       fprintf(stderr,
+                               "Cannot set fields to 'none' for all event types.\n");
+                       rc = -EINVAL;
+                       goto out;
+               }
+
+               if (output_set_by_user())
+                       pr_warning("Overriding previous field request for all events.\n");
+
+               for (j = 0; j < PERF_TYPE_MAX; ++j) {
+                       output[j].fields = 0;
+                       output[j].user_set = true;
+                       output[j].wildcard_set = true;
+               }
+       }
+
+       tok = strtok(tok, ",");
+       while (tok) {
+               for (i = 0; i < imax; ++i) {
+                       if (strcmp(tok, all_output_options[i].str) == 0)
+                               break;
+               }
+               if (i == imax) {
+                       fprintf(stderr, "Invalid field requested.\n");
+                       rc = -EINVAL;
+                       goto out;
+               }
+
+               if (type == -1) {
+                       /* add user option to all events types for
+                        * which it is valid
+                        */
+                       for (j = 0; j < PERF_TYPE_MAX; ++j) {
+                               if (output[j].invalid_fields & all_output_options[i].field) {
+                                       pr_warning("\'%s\' not valid for %s events. Ignoring.\n",
+                                                  all_output_options[i].str, event_type(j));
+                               } else
+                                       output[j].fields |= all_output_options[i].field;
+                       }
+               } else {
+                       if (output[type].invalid_fields & all_output_options[i].field) {
+                               fprintf(stderr, "\'%s\' not valid for %s events.\n",
+                                        all_output_options[i].str, event_type(type));
+
+                               rc = -EINVAL;
+                               goto out;
+                       }
+                       output[type].fields |= all_output_options[i].field;
+               }
+
+               tok = strtok(NULL, ",");
+       }
+
+       if (type >= 0) {
+               if (output[type].fields == 0) {
+                       pr_debug("No fields requested for %s type. "
+                                "Events will not be displayed.\n", event_type(type));
+               }
+       }
+
+out:
+       free(str);
+       return rc;
+}
+
 /* Helper function for filesystems that return a dent->d_type DT_UNKNOWN */
 static int is_directory(const char *base_path, const struct dirent *dent)
 {
@@ -341,7 +799,7 @@ struct script_desc {
        char                    *args;
 };
 
-LIST_HEAD(script_descs);
+static LIST_HEAD(script_descs);
 
 static struct script_desc *script_desc__new(const char *name)
 {
@@ -397,10 +855,10 @@ out_delete_desc:
        return NULL;
 }
 
-static char *ends_with(char *str, const char *suffix)
+static const char *ends_with(const char *str, const char *suffix)
 {
        size_t suffix_len = strlen(suffix);
-       char *p = str;
+       const char *p = str;
 
        if (strlen(str) > suffix_len) {
                p = str + strlen(str) - suffix_len;
@@ -492,7 +950,7 @@ static int list_available_scripts(const struct option *opt __used,
 
                for_each_script(lang_path, lang_dir, script_dirent, script_next) {
                        script_root = strdup(script_dirent.d_name);
-                       str = ends_with(script_root, REPORT_SUFFIX);
+                       str = (char *)ends_with(script_root, REPORT_SUFFIX);
                        if (str) {
                                *str = '\0';
                                desc = script_desc__findnew(script_root);
@@ -540,7 +998,7 @@ static char *get_script_path(const char *script_root, const char *suffix)
 
                for_each_script(lang_path, lang_dir, script_dirent, script_next) {
                        __script_root = strdup(script_dirent.d_name);
-                       str = ends_with(__script_root, suffix);
+                       str = (char *)ends_with(__script_root, suffix);
                        if (str) {
                                *str = '\0';
                                if (strcmp(__script_root, script_root))
@@ -560,7 +1018,7 @@ static char *get_script_path(const char *script_root, const char *suffix)
 
 static bool is_top_script(const char *script_path)
 {
-       return ends_with((char *)script_path, "top") == NULL ? false : true;
+       return ends_with(script_path, "top") == NULL ? false : true;
 }
 
 static int has_required_arg(char *script_path)
@@ -613,6 +1071,18 @@ static const struct option options[] = {
                    "input file name"),
        OPT_BOOLEAN('d', "debug-mode", &debug_mode,
                   "do various checks like samples ordering and lost events"),
+       OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
+                  "file", "vmlinux pathname"),
+       OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
+                  "file", "kallsyms pathname"),
+       OPT_BOOLEAN('G', "hide-call-graph", &no_callchain,
+                   "When printing symbols do not display call chain"),
+       OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
+                   "Look for files with symbols relative to this directory"),
+       OPT_CALLBACK('f', "fields", NULL, "str",
+                    "comma separated output fields prepend with 'type:'. Valid types: hw,sw,trace,raw. Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,addr",
+                    parse_output_fields),
+       OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
 
        OPT_END()
 };
@@ -789,18 +1259,31 @@ int cmd_script(int argc, const char **argv, const char *prefix __used)
        if (!script_name)
                setup_pager();
 
-       session = perf_session__new(input_name, O_RDONLY, 0, false);
+       session = perf_session__new(input_name, O_RDONLY, 0, false, &event_ops);
        if (session == NULL)
                return -ENOMEM;
 
-       if (strcmp(input_name, "-") &&
-           !perf_session__has_traces(session, "record -R"))
-               return -EINVAL;
+       if (cpu_list) {
+               if (perf_session__cpu_bitmap(session, cpu_list, cpu_bitmap))
+                       return -1;
+       }
+
+       if (!no_callchain)
+               symbol_conf.use_callchain = true;
+       else
+               symbol_conf.use_callchain = false;
 
        if (generate_script_lang) {
                struct stat perf_stat;
+               int input;
 
-               int input = open(input_name, O_RDONLY);
+               if (output_set_by_user()) {
+                       fprintf(stderr,
+                               "custom fields not supported for generated scripts");
+                       return -1;
+               }
+
+               input = open(input_name, O_RDONLY);
                if (input < 0) {
                        perror("failed to open file");
                        exit(-1);
@@ -834,6 +1317,11 @@ int cmd_script(int argc, const char **argv, const char *prefix __used)
                pr_debug("perf script started with script %s\n\n", script_name);
        }
 
+
+       err = perf_session__check_output_opt(session);
+       if (err < 0)
+               goto out;
+
        err = __cmd_script(session);
 
        perf_session__delete(session);