From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 26/64] perf auxtrace: Add a hashtable for caching
Date: Tue, 28 Apr 2015 10:30:18 -0300 [thread overview]
Message-ID: <1430227856-25825-27-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1430227856-25825-1-git-send-email-acme@kernel.org>
From: Adrian Hunter <adrian.hunter@intel.com>
Decoding AUX area data may involve walking object code. Rather than
repetitively decoding the same instructions, a cache can be used to
cache the results.
This patch implements a fairly generic hashtable with a 32-bit key that
could be used for other purposes as well.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1428594864-29309-15-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/auxtrace.c | 123 +++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/auxtrace.h | 14 ++++++
2 files changed, 137 insertions(+)
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index c4515e1a9d7f..3cd89eca1e88 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -40,6 +40,8 @@
#include "asm/bug.h"
#include "auxtrace.h"
+#include <linux/hash.h>
+
#include "event.h"
#include "session.h"
#include "debug.h"
@@ -944,3 +946,124 @@ int auxtrace_mmap__read(struct auxtrace_mmap *mm, struct auxtrace_record *itr,
return 1;
}
+
+/**
+ * struct auxtrace_cache - hash table to implement a cache
+ * @hashtable: the hashtable
+ * @sz: hashtable size (number of hlists)
+ * @entry_size: size of an entry
+ * @limit: limit the number of entries to this maximum, when reached the cache
+ * is dropped and caching begins again with an empty cache
+ * @cnt: current number of entries
+ * @bits: hashtable size (@sz = 2^@bits)
+ */
+struct auxtrace_cache {
+ struct hlist_head *hashtable;
+ size_t sz;
+ size_t entry_size;
+ size_t limit;
+ size_t cnt;
+ unsigned int bits;
+};
+
+struct auxtrace_cache *auxtrace_cache__new(unsigned int bits, size_t entry_size,
+ unsigned int limit_percent)
+{
+ struct auxtrace_cache *c;
+ struct hlist_head *ht;
+ size_t sz, i;
+
+ c = zalloc(sizeof(struct auxtrace_cache));
+ if (!c)
+ return NULL;
+
+ sz = 1UL << bits;
+
+ ht = calloc(sz, sizeof(struct hlist_head));
+ if (!ht)
+ goto out_free;
+
+ for (i = 0; i < sz; i++)
+ INIT_HLIST_HEAD(&ht[i]);
+
+ c->hashtable = ht;
+ c->sz = sz;
+ c->entry_size = entry_size;
+ c->limit = (c->sz * limit_percent) / 100;
+ c->bits = bits;
+
+ return c;
+
+out_free:
+ free(c);
+ return NULL;
+}
+
+static void auxtrace_cache__drop(struct auxtrace_cache *c)
+{
+ struct auxtrace_cache_entry *entry;
+ struct hlist_node *tmp;
+ size_t i;
+
+ if (!c)
+ return;
+
+ for (i = 0; i < c->sz; i++) {
+ hlist_for_each_entry_safe(entry, tmp, &c->hashtable[i], hash) {
+ hlist_del(&entry->hash);
+ auxtrace_cache__free_entry(c, entry);
+ }
+ }
+
+ c->cnt = 0;
+}
+
+void auxtrace_cache__free(struct auxtrace_cache *c)
+{
+ if (!c)
+ return;
+
+ auxtrace_cache__drop(c);
+ free(c->hashtable);
+ free(c);
+}
+
+void *auxtrace_cache__alloc_entry(struct auxtrace_cache *c)
+{
+ return malloc(c->entry_size);
+}
+
+void auxtrace_cache__free_entry(struct auxtrace_cache *c __maybe_unused,
+ void *entry)
+{
+ free(entry);
+}
+
+int auxtrace_cache__add(struct auxtrace_cache *c, u32 key,
+ struct auxtrace_cache_entry *entry)
+{
+ if (c->limit && ++c->cnt > c->limit)
+ auxtrace_cache__drop(c);
+
+ entry->key = key;
+ hlist_add_head(&entry->hash, &c->hashtable[hash_32(key, c->bits)]);
+
+ return 0;
+}
+
+void *auxtrace_cache__lookup(struct auxtrace_cache *c, u32 key)
+{
+ struct auxtrace_cache_entry *entry;
+ struct hlist_head *hlist;
+
+ if (!c)
+ return NULL;
+
+ hlist = &c->hashtable[hash_32(key, c->bits)];
+ hlist_for_each_entry(entry, hlist, hash) {
+ if (entry->key == key)
+ return entry;
+ }
+
+ return NULL;
+}
diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h
index ba78d825bf73..53b60a64a693 100644
--- a/tools/perf/util/auxtrace.h
+++ b/tools/perf/util/auxtrace.h
@@ -333,6 +333,20 @@ int auxtrace_heap__add(struct auxtrace_heap *heap, unsigned int queue_nr,
void auxtrace_heap__pop(struct auxtrace_heap *heap);
void auxtrace_heap__free(struct auxtrace_heap *heap);
+struct auxtrace_cache_entry {
+ struct hlist_node hash;
+ u32 key;
+};
+
+struct auxtrace_cache *auxtrace_cache__new(unsigned int bits, size_t entry_size,
+ unsigned int limit_percent);
+void auxtrace_cache__free(struct auxtrace_cache *auxtrace_cache);
+void *auxtrace_cache__alloc_entry(struct auxtrace_cache *c);
+void auxtrace_cache__free_entry(struct auxtrace_cache *c, void *entry);
+int auxtrace_cache__add(struct auxtrace_cache *c, u32 key,
+ struct auxtrace_cache_entry *entry);
+void *auxtrace_cache__lookup(struct auxtrace_cache *c, u32 key);
+
struct auxtrace_record *auxtrace_record__init(struct perf_evlist *evlist,
int *err);
--
1.9.3
next prev parent reply other threads:[~2015-04-28 13:46 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-28 13:29 [GIT PULL 00/64] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-04-28 13:29 ` [PATCH 01/64] perf hists: Get rid of position field from struct hist_entry Arnaldo Carvalho de Melo
2015-04-28 13:29 ` [PATCH 02/64] perf diff: Make hist_entry_diff fields union Arnaldo Carvalho de Melo
2015-04-28 13:29 ` [PATCH 03/64] perf data: Show error message when conversion failed Arnaldo Carvalho de Melo
2015-04-28 13:29 ` [PATCH 04/64] tools lib traceevent: Add alias field to struct format_field Arnaldo Carvalho de Melo
2015-04-28 13:29 ` [PATCH 05/64] tools build: No need to make libapi for perf explicitly Arnaldo Carvalho de Melo
2015-04-28 13:29 ` [PATCH 06/64] tools build: Fix Makefile(s) to properly invoke tools build Arnaldo Carvalho de Melo
2015-04-28 13:29 ` [PATCH 07/64] perf tests: Add build tests for building perf from kernel source root and tools Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 08/64] perf data: Switch to multiple cpu stream files Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 09/64] perf data: Enable stream flush within processing Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 10/64] perf data: Add support for setting ordered_events queue size Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 11/64] perf data: Fix duplicate field names and avoid reserved keywords Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 12/64] perf data: Fix signedness of value Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 13/64] perf header: Add AUX area tracing feature Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 14/64] perf evlist: Add support for mmapping an AUX area buffer Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 15/64] perf tools: Add user events for AUX area tracing Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 16/64] perf auxtrace: Add support for AUX area recording Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 17/64] perf record: Add basic AUX area tracing support Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 18/64] perf record: Extend -m option for AUX area tracing mmap pages Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 19/64] perf tools: Add a user event for AUX area tracing errors Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 20/64] perf session: Add hooks to allow transparent decoding of AUX area tracing data Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 21/64] perf session: Add instruction tracing options Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 22/64] perf auxtrace: Add helpers for AUX area tracing errors Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 23/64] perf auxtrace: Add helpers for queuing AUX area tracing data Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 24/64] perf auxtrace: Add a heap for sorting AUX area tracing queues Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 25/64] perf auxtrace: Add processing for AUX area tracing events Arnaldo Carvalho de Melo
2015-04-28 13:30 ` Arnaldo Carvalho de Melo [this message]
2015-04-28 13:30 ` [PATCH 27/64] perf tools: Add member to struct dso for an instruction cache Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 28/64] perf script: Add Instruction Tracing support Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 29/64] perf inject: Re-pipe AUX area tracing events Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 30/64] perf inject: Add Instruction Tracing support Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 31/64] perf script: Add field option 'flags' to print sample flags Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 32/64] perf tools: Add aux_watermark member of struct perf_event_attr Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 33/64] perf tools: Add parse_events_error interface Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 34/64] perf tools: Add flex support for parse_events_error Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 35/64] perf tools: Always bail out when config_attr function fails Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 36/64] perf tools: Change parse_events_add_pmu interface Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 37/64] perf tools: Add location to pmu event terms Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 38/64] perf tools: Add term support for parse_events_error Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 39/64] perf tools: Add static terms " Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 40/64] perf tools: Add tracepoint " Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 41/64] perf tools: Add symbolic events " Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 42/64] perf probe: Make --funcs option exclusive Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 43/64] perf probe: Remove all probes matches given pattern at once Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 44/64] perf trace: Fix --filter-pids OPTION description Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 45/64] perf trace: Clarify that -e is about syscalls, not perf events in general Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 46/64] perf stat: Fix metrics calculation with event qualifiers Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 47/64] perf stat: Change metrics context calculation Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 48/64] perf stat: Add metrics support for exclude_hv Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 49/64] perf stat: Add metrics support for exclude_(host|guest) Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 50/64] perf stat: Add metrics support for exclude_idle Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 51/64] perf tools: Document --children option in more detail Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 52/64] perf tools: Move TUI-specific fields into unnamed union Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 53/64] perf tools: Move init_have_children field to the " Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 54/64] perf hists browser: Fix possible memory leak Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 55/64] perf hists browser: Save hist_browser_timer pointer in hist_browser Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 56/64] perf hists browser: Save pstack in the hist_browser Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 57/64] perf hists browser: Save perf_session_env " Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 58/64] perf hists browser: Split popup menu actions Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 59/64] perf hists browser: Split popup menu actions - part 2 Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 60/64] perf tools: Introduce pstack_peek() Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 61/64] perf hists browser: Simplify zooming code using pstack_peek() Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 62/64] perf tools: Move TUI-specific fields out of map_symbol Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 63/64] perf tools: Use getconf to determine number of online CPUs Arnaldo Carvalho de Melo
2015-04-28 13:30 ` [PATCH 64/64] perf bench numa: Show more stats of particular threads in verbose mode Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430227856-25825-27-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@gmail.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome