Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core

7 files changed, 26 insertions, 18 deletions

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 80d9598db31a..0deac6a14b65 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -1,5 +1,8 @@
 /*
- * GIT - The information manager from hell
+ * config.c
+ *
+ * Helper functions for parsing config items.
+ * Originally copied from GIT source.
  *
  * Copyright (C) Linus Torvalds, 2005
  * Copyright (C) Johannes Schindelin, 2005
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 97c479bcb0dc..b7c7f39a8f6d 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -814,13 +814,14 @@ int perf_event__preprocess_sample(const union perf_event *event,
         al->cpu = sample->cpu;
 
         if (al->map) {
+                struct dso *dso = al->map->dso;
+
                 if (symbol_conf.dso_list &&
-                    (!al->map || !al->map->dso ||
-                     !(strlist__has_entry(symbol_conf.dso_list,
-                                          al->map->dso->short_name) ||
-                       (al->map->dso->short_name != al->map->dso->long_name &&
-                        strlist__has_entry(symbol_conf.dso_list,
-                                           al->map->dso->long_name)))))
+                    (!dso || !(strlist__has_entry(symbol_conf.dso_list,
+                                                  dso->short_name) ||
+                               (dso->short_name != dso->long_name &&
+                                strlist__has_entry(symbol_conf.dso_list,
+                                                   dso->long_name)))))
                         goto out_filtered;
 
                 al->sym = map__find_symbol(al->map, al->addr, filter);
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 8b19e7a1e881..963d63dde457 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -447,8 +447,10 @@ static int __perf_evlist__mmap(struct perf_evlist *evlist,
         evlist->mmap[idx].mask = mask;
         evlist->mmap[idx].base = mmap(NULL, evlist->mmap_len, prot,
                                       MAP_SHARED, fd, 0);
-        if (evlist->mmap[idx].base == MAP_FAILED)
+        if (evlist->mmap[idx].base == MAP_FAILED) {
+                evlist->mmap[idx].base = NULL;
                 return -1;
+        }
 
         perf_evlist__add_pollfd(evlist, fd);
         return 0;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 4a8c8b02e9cc..667f3b78bb2c 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -108,6 +108,9 @@ void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts)
         if (opts->system_wide)
                 attr->sample_type       |= PERF_SAMPLE_CPU;
 
+        if (opts->period)
+                attr->sample_type       |= PERF_SAMPLE_PERIOD;
+
         if (opts->sample_id_all_avail &&
             (opts->sample_time || opts->system_wide ||
              !opts->no_inherit || opts->cpu_list))
@@ -457,7 +460,7 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
                 u32 val32[2];
         } u;
 
-
+        memset(data, 0, sizeof(*data));
         data->cpu = data->pid = data->tid = -1;
         data->stream_id = data->id = data->time = -1ULL;
 
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 632b50c7bc26..215d50f2042e 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1757,7 +1757,7 @@ static int map_groups__set_modules_path_dir(struct map_groups *mg,
                 struct stat st;
 
                 /*sshfs might return bad dent->d_type, so we have to stat*/
-                sprintf(path, "%s/%s", dir_name, dent->d_name);
+                snprintf(path, sizeof(path), "%s/%s", dir_name, dent->d_name);
                 if (stat(path, &st))
                         continue;
 
@@ -1766,8 +1766,6 @@ static int map_groups__set_modules_path_dir(struct map_groups *mg,
                             !strcmp(dent->d_name, ".."))
                                 continue;
 
-                        snprintf(path, sizeof(path), "%s/%s",
-                                 dir_name, dent->d_name);
                         ret = map_groups__set_modules_path_dir(mg, path);
                         if (ret < 0)
                                 goto out;
@@ -1788,9 +1786,6 @@ static int map_groups__set_modules_path_dir(struct map_groups *mg,
                         if (map == NULL)
                                 continue;
 
-                        snprintf(path, sizeof(path), "%s/%s",
-                                 dir_name, dent->d_name);
-
                         long_name = strdup(path);
                         if (long_name == NULL) {
                                 ret = -1;
@@ -2609,10 +2604,10 @@ int symbol__init(void)
         symbol_conf.initialized = true;
         return 0;
 
-out_free_dso_list:
-        strlist__delete(symbol_conf.dso_list);
 out_free_comm_list:
         strlist__delete(symbol_conf.comm_list);
+out_free_dso_list:
+        strlist__delete(symbol_conf.dso_list);
         return -1;
 }
 
diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c
index e16bf9a707e8..d76d1c0ff98f 100644
--- a/tools/perf/util/usage.c
+++ b/tools/perf/util/usage.c
@@ -1,5 +1,8 @@
 /*
- * GIT - The information manager from hell
+ * usage.c
+ *
+ * Various reporting routines.
+ * Originally copied from GIT source.
  *
  * Copyright (C) Linus Torvalds, 2005
  */
diff --git a/tools/perf/util/values.c b/tools/perf/util/values.c
index bdd33470b235..697c8b4e59cc 100644
--- a/tools/perf/util/values.c
+++ b/tools/perf/util/values.c
@@ -32,6 +32,7 @@ void perf_read_values_destroy(struct perf_read_values *values)
 
         for (i = 0; i < values->threads; i++)
                 free(values->value[i]);
+        free(values->value);
         free(values->pid);
         free(values->tid);
         free(values->counterrawid);