[PATCH v2 04/10] perf util: Add rbtree node_delete ops

Jin Yao
2017-11-27T06:14:04Z

In current stat-shadow.c, the rbtree deleting is ignored.

The patch reconstructs the code of rblist init/free, and adds
the implementation to node_delete method of rblist.

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
tools/perf/util/stat-shadow.c | 33 +++++++++++++++++++++++++++++----
tools/perf/util/stat.h | 3 +++
2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index c53b80d..0fdd2aa 100644
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -40,6 +40,7 @@ static struct stats runtime_aperf_stats[NUM_CTX][MAX_NR_CPUS];
static struct rblist runtime_saved_values;
static bool have_frontend_stalled;

+struct runtime_stat rt_stat;
struct stats walltime_nsecs_stats;

struct saved_value {
@@ -103,6 +104,18 @@ static struct rb_node *saved_value_new(struct rblist *rblist __maybe_unused,
return &nd->rb_node;
}

+static void saved_value_delete(struct rblist *rblist __maybe_unused,
+ struct rb_node *rb_node)
+{
+ struct saved_value *v;
+
+ BUG_ON(!rb_node);
+ v = container_of(rb_node,
+ struct saved_value,
+ rb_node);
+ free(v);
+}
+
static struct saved_value *saved_value_lookup(struct perf_evsel *evsel,
int cpu,
bool create)
@@ -124,13 +137,25 @@ static struct saved_value *saved_value_lookup(struct perf_evsel *evsel,
return NULL;
}

+void runtime_stat__init(struct runtime_stat *stat)
+{
+ struct rblist *rblist = &stat->value_list;
+
+ rblist__init(rblist);
+ rblist->node_cmp = saved_value_cmp;
+ rblist->node_new = saved_value_new;
+ rblist->node_delete = saved_value_delete;
+}
+
+void runtime_stat__free(struct runtime_stat *stat)
+{
+ rblist__reset(&stat->value_list);
+}
+
void perf_stat__init_shadow_stats(void)
{
have_frontend_stalled = pmu_have_event("cpu", "stalled-cycles-frontend");
- rblist__init(&runtime_saved_values);
- runtime_saved_values.node_cmp = saved_value_cmp;
- runtime_saved_values.node_new = saved_value_new;
- /* No delete for now */
+ runtime_stat__init(&rt_stat);
}

static int evsel_context(struct perf_evsel *evsel)
diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index 6ea173a..234e797 100644
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -120,12 +120,15 @@ bool __perf_evsel_stat__is(struct perf_evsel *evsel,

void perf_stat_evsel_id_init(struct perf_evsel *evsel);

+extern struct runtime_stat rt_stat;
extern struct stats walltime_nsecs_stats;

typedef void (*print_metric_t)(void *ctx, const char *color, const char *unit,
const char *fmt, double val);
typedef void (*new_line_t )(void *ctx);

+void runtime_stat__init(struct runtime_stat *stat);
+void runtime_stat__free(struct runtime_stat *stat);
void perf_stat__init_shadow_stats(void);
void perf_stat__reset_shadow_stats(void);
void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 count,
--
2.7.4