| Message ID | 20180615212131.28121-5-y.karadz@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | trace-filter: Detach trace-filter-hash from KS GUI. | expand |
On Sat, 16 Jun 2018 00:21:31 +0300 "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote: > The hashing function used in trace-filter-hash is changed. > The new hashing functions is based on the Donald E. Knuth's > Multiplicative hashing suggested in his book "The Art of > Computer Programming". This improves the performance, but > also removes the restrictions resulting from using the > Paul Hsieh's super fast hash, published under the terms of > the GPL 2.0 license. > > Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> > --- > kernel-shark/include/trace-filter-hash.h | 37 +++++++++++++++++++++++- > kernel-shark/trace-filter-hash.c | 6 ++-- > kernel-shark/trace-graph.c | 1 + > kernel-shark/trace-plot-cpu.c | 1 + > kernel-shark/trace-plot-task.c | 1 + > kernel-shark/trace-plot.c | 1 + > 6 files changed, 43 insertions(+), 4 deletions(-) > > diff --git a/kernel-shark/include/trace-filter-hash.h b/kernel-shark/include/trace-filter-hash.h > index 5cc39dc..98c9ab3 100644 > --- a/kernel-shark/include/trace-filter-hash.h > +++ b/kernel-shark/include/trace-filter-hash.h > @@ -20,7 +20,7 @@ > #ifndef _TRACE_FILTER_HASH_H > #define _TRACE_FILTER_HASH_H > > -#include "trace-hash-local.h" > +#include <stdint.h> > > diff --git a/kernel-shark/trace-graph.c b/kernel-shark/trace-graph.c > index b652297..1aba417 100644 > --- a/kernel-shark/trace-graph.c > +++ b/kernel-shark/trace-graph.c > @@ -33,6 +33,7 @@ > #include "trace-graph.h" > #include "trace-filter-hash.h" > #include "trace-filter.h" > +#include "trace-hash-local.h" > #include "trace-gui.h" > > #include "event-utils.h" > diff --git a/kernel-shark/trace-plot-cpu.c b/kernel-shark/trace-plot-cpu.c > index 8374809..d2a0523 100644 > --- a/kernel-shark/trace-plot-cpu.c > +++ b/kernel-shark/trace-plot-cpu.c > @@ -22,6 +22,7 @@ > > #include "trace-graph.h" > #include "trace-local.h" > +#include "trace-hash-local.h" > #include "cpu.h" > > struct cpu_plot_info { > diff --git a/kernel-shark/trace-plot-task.c b/kernel-shark/trace-plot-task.c > index 3b7e81f..c846221 100644 > --- a/kernel-shark/trace-plot-task.c > +++ b/kernel-shark/trace-plot-task.c > @@ -23,6 +23,7 @@ > #include "trace-graph.h" > #include "trace-filter.h" > #include "trace-local.h" > +#include "trace-hash-local.h" > > #define RED 0xff > #define GREEN (0xff<<16) > diff --git a/kernel-shark/trace-plot.c b/kernel-shark/trace-plot.c > index dc5b3af..bf2cec0 100644 > --- a/kernel-shark/trace-plot.c > +++ b/kernel-shark/trace-plot.c > @@ -21,6 +21,7 @@ > #include <string.h> > #include "trace-graph.h" > #include "trace-local.h" > +#include "trace-hash-local.h" The change log doesn't explain the header modifications needed here. Please include that. Thanks Yordan! -- Steve > > void trace_graph_plot_free(struct graph_info *ginfo) > {
diff --git a/kernel-shark/include/trace-filter-hash.h b/kernel-shark/include/trace-filter-hash.h index 5cc39dc..98c9ab3 100644 --- a/kernel-shark/include/trace-filter-hash.h +++ b/kernel-shark/include/trace-filter-hash.h @@ -20,7 +20,7 @@ #ifndef _TRACE_FILTER_HASH_H #define _TRACE_FILTER_HASH_H -#include "trace-hash-local.h" +#include <stdint.h> struct filter_id_item { struct filter_id_item *next; @@ -47,4 +47,39 @@ static inline int filter_task_count(struct filter_id *hash) return hash->count; } +/* + * Hashing functions, based on Donald E. Knuth's Multiplicative hashing. + * See The Art of Computer Programming (TAOCP). + */ + +static inline uint8_t knuth_hash8(uint32_t val) +{ + /* + * Multiplicative hashing function. + * Multiplication by the Prime number, closest to the golden + * ratio of 2^8. + */ + return UINT8_C(val) * UINT8_C(157); +} + +static inline uint16_t knuth_hash16(uint32_t val) +{ + /* + * Multiplicative hashing function. + * Multiplication by the Prime number, closest to the golden + * ratio of 2^16. + */ + return UINT16_C(val) * UINT16_C(40507); +} + +static inline uint32_t knuth_hash(uint32_t val) +{ + /* + * Multiplicative hashing function. + * Multiplication by the Prime number, closest to the golden + * ratio of 2^32. + */ + return val * UINT32_C(2654435761); +} + #endif /* _TRACE_FILTER_HASH_H */ diff --git a/kernel-shark/trace-filter-hash.c b/kernel-shark/trace-filter-hash.c index cf41250..703109c 100644 --- a/kernel-shark/trace-filter-hash.c +++ b/kernel-shark/trace-filter-hash.c @@ -30,7 +30,7 @@ struct filter_id_item * filter_id_find(struct filter_id *hash, int id) { - int key = trace_hash(id) % FILTER_HASH_SIZE; + int key = knuth_hash8(id); struct filter_id_item *item = hash->hash[key]; while (item) { @@ -44,7 +44,7 @@ filter_id_find(struct filter_id *hash, int id) void filter_id_add(struct filter_id *hash, int id) { - int key = trace_hash(id) % FILTER_HASH_SIZE; + int key = knuth_hash8(id); struct filter_id_item *item; item = calloc(1, sizeof(*item)); @@ -59,7 +59,7 @@ void filter_id_add(struct filter_id *hash, int id) void filter_id_remove(struct filter_id *hash, int id) { - int key = trace_hash(id) % FILTER_HASH_SIZE; + int key = knuth_hash8(id); struct filter_id_item **next = &hash->hash[key]; struct filter_id_item *item; diff --git a/kernel-shark/trace-graph.c b/kernel-shark/trace-graph.c index b652297..1aba417 100644 --- a/kernel-shark/trace-graph.c +++ b/kernel-shark/trace-graph.c @@ -33,6 +33,7 @@ #include "trace-graph.h" #include "trace-filter-hash.h" #include "trace-filter.h" +#include "trace-hash-local.h" #include "trace-gui.h" #include "event-utils.h" diff --git a/kernel-shark/trace-plot-cpu.c b/kernel-shark/trace-plot-cpu.c index 8374809..d2a0523 100644 --- a/kernel-shark/trace-plot-cpu.c +++ b/kernel-shark/trace-plot-cpu.c @@ -22,6 +22,7 @@ #include "trace-graph.h" #include "trace-local.h" +#include "trace-hash-local.h" #include "cpu.h" struct cpu_plot_info { diff --git a/kernel-shark/trace-plot-task.c b/kernel-shark/trace-plot-task.c index 3b7e81f..c846221 100644 --- a/kernel-shark/trace-plot-task.c +++ b/kernel-shark/trace-plot-task.c @@ -23,6 +23,7 @@ #include "trace-graph.h" #include "trace-filter.h" #include "trace-local.h" +#include "trace-hash-local.h" #define RED 0xff #define GREEN (0xff<<16) diff --git a/kernel-shark/trace-plot.c b/kernel-shark/trace-plot.c index dc5b3af..bf2cec0 100644 --- a/kernel-shark/trace-plot.c +++ b/kernel-shark/trace-plot.c @@ -21,6 +21,7 @@ #include <string.h> #include "trace-graph.h" #include "trace-local.h" +#include "trace-hash-local.h" void trace_graph_plot_free(struct graph_info *ginfo) {
The hashing function used in trace-filter-hash is changed. The new hashing functions is based on the Donald E. Knuth's Multiplicative hashing suggested in his book "The Art of Computer Programming". This improves the performance, but also removes the restrictions resulting from using the Paul Hsieh's super fast hash, published under the terms of the GPL 2.0 license. Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> --- kernel-shark/include/trace-filter-hash.h | 37 +++++++++++++++++++++++- kernel-shark/trace-filter-hash.c | 6 ++-- kernel-shark/trace-graph.c | 1 + kernel-shark/trace-plot-cpu.c | 1 + kernel-shark/trace-plot-task.c | 1 + kernel-shark/trace-plot.c | 1 + 6 files changed, 43 insertions(+), 4 deletions(-)