Skip to contentSkip to conversation

perf trace: Add --summary-mode option

PATCH Superseded Namhyung Kim 3 participants 16 messages Jan 30, 2025 – Feb 8, 2025 perf events

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

v2 cover perf trace: Add --summary-mode option

Hello,

I've realized that perf trace shows system call summary at the end for each thread. But sometimes users want to see the global whole system summary or statistics instead.

So I've added --summary-mode option like below:

    $ sudo ./perf trace -as --summary-mode=total sleep 1
     Summary of events:

     total, 21580 events

       syscall            calls  errors  total       min       avg       max       stddev
                                         (msec)    (msec)    (msec)    (msec)        (%)
       --------------- --------  ------ -------- --------- --------- ---------     ------
       epoll_wait          1305      0 14716.712     0.000    11.277   551.529      8.87%
       futex               1256     89 13331.197     0.000    10.614   733.722     15.49%
       poll                 669      0  6806.618     0.000    10.174   459.316     11.77%
       ppoll                220      0  3968.797     0.000    18.040   516.775     25.35%
       clock_nanosleep        1      0  1000.027  1000.027  1000.027  1000.027      0.00%
       epoll_pwait           21      0   592.783     0.000    28.228   522.293     88.29%
       nanosleep             16      0    60.515     0.000     3.782    10.123     33.33%
       ioctl                510      0     4.284     0.001     0.008     0.182      8.84%
       recvmsg             1434    775     3.497     0.001     0.002     0.174      6.37%
       write               1393      0     2.854     0.001     0.002     0.017      1.79%
       read                1063    100     2.236     0.000     0.002     0.083      5.11%
       ...

Also it changes internal data structure to hash table to track statistics of syscalls. And removes the rb_resort code.

v2 changes)
* Rebase to current perf-tools-next
* Fix some style issues (Howard)
* Rename to --summary-mode (Howard)

Thanks,
Namhyung

Namhyung Kim (4):
perf trace: Allocate syscall stats only if summary is on perf trace: Convert syscall_stats to hashmap perf tools: Get rid of now-unused rb_resort.h perf trace: Add --summary-mode option

 tools/perf/Documentation/perf-trace.txt |   4 +
 tools/perf/builtin-trace.c              | 252 +++++++++++++++++++-----
 tools/perf/util/rb_resort.h             | 146 --------------
 3 files changed, 208 insertions(+), 194 deletions(-)
 delete mode 100644 tools/perf/util/rb_resort.h
Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
author maintainer
#1 lore raw

PATCH v2 1/4 perf trace: Allocate syscall stats only if summary is on

The syscall stats are used only when summary is requested. Let's avoid unnecessary operations. Pass 'trace' pointer to check summary and give output file together.

---
 tools/perf/builtin-trace.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
tools/perf/builtin-trace.c +11 -10
index ac97632f13dc8f7c..7e0324a2e9182088 100644
@@ -1522,13 +1522,14 @@ struct thread_trace {
 	struct intlist *syscall_stats;
 };
 
-static struct thread_trace *thread_trace__new(void)
+static struct thread_trace *thread_trace__new(struct trace *trace)
 {
 	struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));
 
 	if (ttrace) {
 		ttrace->files.max = -1;
-		ttrace->syscall_stats = intlist__new(NULL);
+		if (trace->summary)
+			ttrace->syscall_stats = intlist__new(NULL);
 	}
 
 	return ttrace;
@@ -1550,7 +1551,7 @@ static void thread_trace__delete(void *pttrace)
 	free(ttrace);
 }
 
-static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
+static struct thread_trace *thread__trace(struct thread *thread, struct trace *trace)
 {
 	struct thread_trace *ttrace;
 
@@ -1558,7 +1559,7 @@ static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
 		goto fail;
 
 	if (thread__priv(thread) == NULL)
-		thread__set_priv(thread, thread_trace__new());
+		thread__set_priv(thread, thread_trace__new(trace));
 
 	if (thread__priv(thread) == NULL)
 		goto fail;
@@ -1568,7 +1569,7 @@ static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
 
 	return ttrace;
 fail:
-	color_fprintf(fp, PERF_COLOR_RED,
+	color_fprintf(trace->output, PERF_COLOR_RED,
 		      "WARNING: not enough memory, dropping samples!\n");
 	return NULL;
 }
@@ -2622,7 +2623,7 @@ static int trace__sys_enter(struct trace *trace, struct evsel *evsel,
 		return -1;
 
 	thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
-	ttrace = thread__trace(thread, trace->output);
+	ttrace = thread__trace(thread, trace);
 	if (ttrace == NULL)
 		goto out_put;
 
@@ -2699,7 +2700,7 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel,
 		return -1;
 
 	thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
-	ttrace = thread__trace(thread, trace->output);
+	ttrace = thread__trace(thread, trace);
 	/*
 	 * We need to get ttrace just to make sure it is there when syscall__scnprintf_args()
 	 * and the rest of the beautifiers accessing it via struct syscall_arg touches it.
@@ -2771,7 +2772,7 @@ static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
 		return -1;
 
 	thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
-	ttrace = thread__trace(thread, trace->output);
+	ttrace = thread__trace(thread, trace);
 	if (ttrace == NULL)
 		goto out_put;
 
@@ -2960,7 +2961,7 @@ static int trace__sched_stat_runtime(struct trace *trace, struct evsel *evsel,
 	struct thread *thread = machine__findnew_thread(trace->host,
 							sample->pid,
 							sample->tid);
-	struct thread_trace *ttrace = thread__trace(thread, trace->output);
+	struct thread_trace *ttrace = thread__trace(thread, trace);
 
 	if (ttrace == NULL)
 		goto out_dump;
@@ -3214,7 +3215,7 @@ static int trace__pgfault(struct trace *trace,
 		}
 	}
 
-	ttrace = thread__trace(thread, trace->output);
+	ttrace = thread__trace(thread, trace);
 	if (ttrace == NULL)
 		goto out_put;
 
Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
reviewer
#2 lore raw

Re: [PATCH v2 1/4] perf trace: Allocate syscall stats only if summary is on

Quoted 4 lines · Namhyung Kim

The syscall stats are used only when summary is requested. Let's avoid unnecessary operations. Pass 'trace' pointer to check summary and give output file together.

I don't think this last sentence makes sense.

Thanks,
Ian

Quoted 101 lines
---
 tools/perf/builtin-trace.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
tools/perf/builtin-trace.c +11 -11
index ac97632f13dc8f7c..7e0324a2e9182088 100644
@@ -1522,13 +1522,14 @@ struct thread_trace {
        struct intlist *syscall_stats;
 };
 
-static struct thread_trace *thread_trace__new(void)
+static struct thread_trace *thread_trace__new(struct trace *trace)
 {
        struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));
 
        if (ttrace) {
                ttrace->files.max = -1;
-               ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary)
+                       ttrace->syscall_stats = intlist__new(NULL);
        }
 
        return ttrace;
@@ -1550,7 +1551,7 @@ static void thread_trace__delete(void *pttrace)
        free(ttrace);
 }
 
-static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
+static struct thread_trace *thread__trace(struct thread *thread, struct trace *trace)
 {
        struct thread_trace *ttrace;
 
@@ -1558,7 +1559,7 @@ static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
                goto fail;
 
        if (thread__priv(thread) == NULL)
-               thread__set_priv(thread, thread_trace__new());
+               thread__set_priv(thread, thread_trace__new(trace));
 
        if (thread__priv(thread) == NULL)
                goto fail;
@@ -1568,7 +1569,7 @@ static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
 
        return ttrace;
 fail:
-       color_fprintf(fp, PERF_COLOR_RED,
+       color_fprintf(trace->output, PERF_COLOR_RED,
                      "WARNING: not enough memory, dropping samples!\n");
        return NULL;
 }
@@ -2622,7 +2623,7 @@ static int trace__sys_enter(struct trace *trace, struct evsel *evsel,
                return -1;
 
        thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
-       ttrace = thread__trace(thread, trace->output);
+       ttrace = thread__trace(thread, trace);
        if (ttrace == NULL)
                goto out_put;
 
@@ -2699,7 +2700,7 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel,
                return -1;
 
        thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
-       ttrace = thread__trace(thread, trace->output);
+       ttrace = thread__trace(thread, trace);
        /*
         * We need to get ttrace just to make sure it is there when syscall__scnprintf_args()
         * and the rest of the beautifiers accessing it via struct syscall_arg touches it.
@@ -2771,7 +2772,7 @@ static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
                return -1;
 
        thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
-       ttrace = thread__trace(thread, trace->output);
+       ttrace = thread__trace(thread, trace);
        if (ttrace == NULL)
                goto out_put;
 
@@ -2960,7 +2961,7 @@ static int trace__sched_stat_runtime(struct trace *trace, struct evsel *evsel,
        struct thread *thread = machine__findnew_thread(trace->host,
                                                        sample->pid,
                                                        sample->tid);
-       struct thread_trace *ttrace = thread__trace(thread, trace->output);
+       struct thread_trace *ttrace = thread__trace(thread, trace);
 
        if (ttrace == NULL)
                goto out_dump;
@@ -3214,7 +3215,7 @@ static int trace__pgfault(struct trace *trace,
                }
        }
 
-       ttrace = thread__trace(thread, trace->output);
+       ttrace = thread__trace(thread, trace);
        if (ttrace == NULL)
                goto out_put;
 
--

2.48.1.262.g85cc9f2d1e-goog

author maintainer
#3 lore raw

Re: [PATCH v2 1/4] perf trace: Allocate syscall stats only if summary is on

Quoted 7 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim

The syscall stats are used only when summary is requested. Let's avoid unnecessary operations. Pass 'trace' pointer to check summary and give output file together.

I don't think this last sentence makes sense.

Thanks for your review. I'd say: Pass 'trace' pointer instead of doing 'summary' option and 'output' file pointer separately.

Thanks,
Namhyung

reviewer
#4 lore raw

Re: [PATCH v2 1/4] perf trace: Allocate syscall stats only if summary is on

Quoted 4 lines · Namhyung Kim
Quoted 2 lines · Ian Rogers
Quoted 1 line · Namhyung Kim
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

The syscall stats are used only when summary is requested. Let's avoid unnecessary operations. Pass 'trace' pointer to check summary and give output file together.

I don't think this last sentence makes sense.

Thanks for your review. I'd say: Pass 'trace' pointer instead of doing 'summary' option and 'output' file pointer separately.

This still doesn't make sense. There is lazier initialization:

```
-               ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary)
+                       ttrace->syscall_stats = intlist__new(NULL);
```
and there are functions that take a FILE* but now we're going to use
the one in trace instead:
```
@@ -1568,7 +1569,7 @@ static struct thread_trace *thread__trace(struct
thread *thread, FILE *fp)

        return ttrace;
 fail:
-       color_fprintf(fp, PERF_COLOR_RED,
+       color_fprintf(trace->output, PERF_COLOR_RED,
                      "WARNING: not enough memory, dropping samples!\n");
        return NULL;
```

So why does the one passed to trace still exist? Unfortunately names like "fp" and "output" are not intention revealing.

Anyway, from the commit message and the code I don't understand what this change is trying to do.

Thanks,
Ian

author maintainer
#5 lore raw

Re: [PATCH v2 1/4] perf trace: Allocate syscall stats only if summary is on

Quoted 19 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim
Quoted 2 lines · Ian Rogers
Quoted 1 line · Namhyung Kim
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

The syscall stats are used only when summary is requested. Let's avoid unnecessary operations. Pass 'trace' pointer to check summary and give output file together.

I don't think this last sentence makes sense.

Thanks for your review. I'd say: Pass 'trace' pointer instead of doing 'summary' option and 'output' file pointer separately.

This still doesn't make sense. There is lazier initialization:
```

tools/perf/builtin-trace.c +2 -1
-               ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary)
+                       ttrace->syscall_stats = intlist__new(NULL);
Quoted 3 lines

```
and there are functions that take a FILE* but now we're going to use the one in trace instead:

Yep, those FILE* (fp) was from trace->output.

Quoted 10 lines

```

tools/perf/builtin-trace.c +1 -1
@@ -1568,7 +1569,7 @@ static struct thread_trace *thread__trace(struct
 thread *thread, FILE *fp)
 
        return ttrace;
 fail:
-       color_fprintf(fp, PERF_COLOR_RED,
+       color_fprintf(trace->output, PERF_COLOR_RED,
                      "WARNING: not enough memory, dropping samples!\n");
        return NULL;
Quoted 3 lines

```
So why does the one passed to trace still exist? Unfortunately names like "fp" and "output" are not intention revealing.

I think "fp" is a conventional name for file pointers (probably from K&R?).

Quoted 3 lines

Anyway, from the commit message and the code I don't understand what this change is trying to do.

I don't know where you didn't get it. Apparently my English is not good enough. So this commit does two things.

1. check trace->summary before allocating syscall_stats
2. change signature of thread__trace from (thread, fp) to (thread, trace) so that it can use trace->output (fp) and trace->summary.

I thought the change #2 is trivial enough to be in the same commit. But I can split that if you want.

Thanks,
Namhyung

reviewer
#6 lore raw

Re: [PATCH v2 1/4] perf trace: Allocate syscall stats only if summary is on

Quoted 52 lines · Namhyung Kim
Quoted 19 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim
Quoted 2 lines · Ian Rogers
Quoted 1 line · Namhyung Kim
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

The syscall stats are used only when summary is requested. Let's avoid unnecessary operations. Pass 'trace' pointer to check summary and give output file together.

I don't think this last sentence makes sense.

Thanks for your review. I'd say: Pass 'trace' pointer instead of doing 'summary' option and 'output' file pointer separately.

This still doesn't make sense. There is lazier initialization:
```

tools/perf/builtin-trace.c +2 -1
-               ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary)
+                       ttrace->syscall_stats = intlist__new(NULL);
Quoted 3 lines

```
and there are functions that take a FILE* but now we're going to use the one in trace instead:

Yep, those FILE* (fp) was from trace->output.

Quoted 10 lines

```

tools/perf/builtin-trace.c +1 -1
@@ -1568,7 +1569,7 @@ static struct thread_trace *thread__trace(struct
 thread *thread, FILE *fp)
 
        return ttrace;
 fail:
-       color_fprintf(fp, PERF_COLOR_RED,
+       color_fprintf(trace->output, PERF_COLOR_RED,
                      "WARNING: not enough memory, dropping samples!\n");
        return NULL;
Quoted 3 lines

```
So why does the one passed to trace still exist? Unfortunately names like "fp" and "output" are not intention revealing.

I think "fp" is a conventional name for file pointers (probably from K&R?).

Quoted 3 lines

Anyway, from the commit message and the code I don't understand what this change is trying to do.

I don't know where you didn't get it. Apparently my English is not good enough. So this commit does two things.

Quoted 6 lines

1. check trace->summary before allocating syscall_stats
2. change signature of thread__trace from (thread, fp) to (thread, trace) so that it can use trace->output (fp) and trace->summary.

I thought the change #2 is trivial enough to be in the same commit. But I can split that if you want.

Ah, the diff was showing the function signature still taking fp which was confusing me. Looking above I see:

```
-static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
+static struct thread_trace *thread__trace(struct thread *thread,
struct trace *trace)
```

Keeping the context in trace and not splitting the patch both make sense to me. It'd be nice to capture your more verbose description in the commit message.

Thanks,
Ian

#7 lore raw

Re: [PATCH v2 1/4] perf trace: Allocate syscall stats only if summary is on

In reply to Namhyung Kim

Hello Namhyung,

Quoted 46 lines · Namhyung Kim
Quoted 19 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim
Quoted 2 lines · Ian Rogers
Quoted 1 line · Namhyung Kim
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

The syscall stats are used only when summary is requested. Let's avoid unnecessary operations. Pass 'trace' pointer to check summary and give output file together.

I don't think this last sentence makes sense.

Thanks for your review. I'd say: Pass 'trace' pointer instead of doing 'summary' option and 'output' file pointer separately.

This still doesn't make sense. There is lazier initialization:
```

tools/perf/builtin-trace.c +2 -1
-               ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary)
+                       ttrace->syscall_stats = intlist__new(NULL);
Quoted 3 lines

```
and there are functions that take a FILE* but now we're going to use the one in trace instead:

Yep, those FILE* (fp) was from trace->output.

Quoted 10 lines

```

tools/perf/builtin-trace.c +1 -1
@@ -1568,7 +1569,7 @@ static struct thread_trace *thread__trace(struct
 thread *thread, FILE *fp)
 
        return ttrace;
 fail:
-       color_fprintf(fp, PERF_COLOR_RED,
+       color_fprintf(trace->output, PERF_COLOR_RED,
                      "WARNING: not enough memory, dropping samples!\n");
        return NULL;
Quoted 3 lines

```
So why does the one passed to trace still exist? Unfortunately names like "fp" and "output" are not intention revealing.

I think "fp" is a conventional name for file pointers (probably from K&R?).

Quoted 1 line
Quoted 5 lines
Quoted 2 lines

Anyway, from the commit message and the code I don't understand what this change is trying to do.

I don't know where you didn't get it. Apparently my English is not good enough. So this commit does two things.

I don't think so. Please don't say that to yourself. :)

Thanks,
Howard

author maintainer
#8 lore raw

PATCH v2 2/4 perf trace: Convert syscall_stats to hashmap

In reply to Namhyung Kim

It was using a RBtree-based int-list as a hash and a custome resort logic for that. As we have hashmap, let's convert to it and add a sorting function using an array. It's also to prepare supporting system-wide syscall stats.

No functional changes intended.

---
 tools/perf/builtin-trace.c | 122 ++++++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 29 deletions(-)
tools/perf/builtin-trace.c +93 -29
index 7e0324a2e9182088..1d32ef2b05ae8c1c 100644
@@ -39,6 +39,7 @@
 #include "util/synthetic-events.h"
 #include "util/evlist.h"
 #include "util/evswitch.h"
+#include "util/hashmap.h"
 #include "util/mmap.h"
 #include <subcmd/pager.h>
 #include <subcmd/exec-cmd.h>
@@ -63,7 +64,6 @@
 #include "print_binary.h"
 #include "string2.h"
 #include "syscalltbl.h"
-#include "rb_resort.h"
 #include "../perf.h"
 #include "trace_augment.h"
 
@@ -1519,17 +1519,55 @@ struct thread_trace {
 		struct file   *table;
 	} files;
 
-	struct intlist *syscall_stats;
+	struct hashmap *syscall_stats;
 };
 
+static size_t id_hash(long key, void *ctx __maybe_unused)
+{
+	return key;
+}
+
+static bool id_equal(long key1, long key2, void *ctx __maybe_unused)
+{
+	return key1 == key2;
+}
+
+static struct hashmap *alloc_syscall_stats(void)
+{
+	struct hashmap *stats = hashmap__new(id_hash, id_equal, NULL);
+
+	/* just for simpler error check */
+	if (IS_ERR(stats))
+		stats = NULL;
+	return stats;
+}
+
+static void delete_syscall_stats(struct hashmap *syscall_stats)
+{
+	struct hashmap_entry *pos;
+	size_t bkt;
+
+	if (syscall_stats == NULL)
+		return;
+
+	hashmap__for_each_entry(syscall_stats, pos, bkt)
+		free(pos->pvalue);
+	hashmap__free(syscall_stats);
+}
+
 static struct thread_trace *thread_trace__new(struct trace *trace)
 {
 	struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));
 
 	if (ttrace) {
 		ttrace->files.max = -1;
-		if (trace->summary)
-			ttrace->syscall_stats = intlist__new(NULL);
+		if (trace->summary) {
+			ttrace->syscall_stats = alloc_syscall_stats();
+			if (ttrace->syscall_stats == NULL) {
+				free(ttrace);
+				ttrace = NULL;
+			}
+		}
 	}
 
 	return ttrace;
@@ -1544,7 +1582,7 @@ static void thread_trace__delete(void *pttrace)
 	if (!ttrace)
 		return;
 
-	intlist__delete(ttrace->syscall_stats);
+	delete_syscall_stats(ttrace->syscall_stats);
 	ttrace->syscall_stats = NULL;
 	thread_trace__free_files(ttrace);
 	zfree(&ttrace->entry_str);
@@ -2463,22 +2501,19 @@ struct syscall_stats {
 static void thread__update_stats(struct thread *thread, struct thread_trace *ttrace,
 				 int id, struct perf_sample *sample, long err, bool errno_summary)
 {
-	struct int_node *inode;
-	struct syscall_stats *stats;
+	struct syscall_stats *stats = NULL;
 	u64 duration = 0;
 
-	inode = intlist__findnew(ttrace->syscall_stats, id);
-	if (inode == NULL)
-		return;
-
-	stats = inode->priv;
-	if (stats == NULL) {
+	if (!hashmap__find(ttrace->syscall_stats, id, &stats)) {
 		stats = zalloc(sizeof(*stats));
 		if (stats == NULL)
 			return;
 
 		init_stats(&stats->stats);
-		inode->priv = stats;
+		if (hashmap__add(ttrace->syscall_stats, id, stats) < 0) {
+			free(stats);
+			return;
+		}
 	}
 
 	if (ttrace->entry_time && sample->time > ttrace->entry_time)
@@ -4617,18 +4652,45 @@ static size_t trace__fprintf_threads_header(FILE *fp)
 	return printed;
 }
 
-DEFINE_RESORT_RB(syscall_stats, a->msecs > b->msecs,
+struct syscall_entry {
 	struct syscall_stats *stats;
 	double		     msecs;
 	int		     syscall;
-)
+};
+
+static int entry_cmp(const void *e1, const void *e2)
 {
-	struct int_node *source = rb_entry(nd, struct int_node, rb_node);
-	struct syscall_stats *stats = source->priv;
+	const struct syscall_entry *entry1 = e1;
+	const struct syscall_entry *entry2 = e2;
 
-	entry->syscall = source->i;
-	entry->stats   = stats;
-	entry->msecs   = stats ? (u64)stats->stats.n * (avg_stats(&stats->stats) / NSEC_PER_MSEC) : 0;
+	return entry1->msecs > entry2->msecs ? -1 : 1;
+}
+
+static struct syscall_entry *thread__sort_stats(struct thread_trace *ttrace)
+{
+	struct syscall_entry *entry;
+	struct hashmap_entry *pos;
+	unsigned bkt, i, nr;
+
+	nr = ttrace->syscall_stats->sz;
+	entry = malloc(nr * sizeof(*entry));
+	if (entry == NULL)
+		return NULL;
+
+	i = 0;
+	hashmap__for_each_entry(ttrace->syscall_stats, pos, bkt) {
+		struct syscall_stats *ss = pos->pvalue;
+		struct stats *st = &ss->stats;
+
+		entry[i].stats = ss;
+		entry[i].msecs = (u64)st->n * (avg_stats(st) / NSEC_PER_MSEC);
+		entry[i].syscall = pos->key;
+		i++;
+	}
+	assert(i == nr);
+
+	qsort(entry, nr, sizeof(*entry), entry_cmp);
+	return entry;
 }
 
 static size_t thread__dump_stats(struct thread_trace *ttrace,
@@ -4636,10 +4698,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 {
 	size_t printed = 0;
 	struct syscall *sc;
-	struct rb_node *nd;
-	DECLARE_RESORT_RB_INTLIST(syscall_stats, ttrace->syscall_stats);
+	struct syscall_entry *entries;
 
-	if (syscall_stats == NULL)
+	entries = thread__sort_stats(ttrace);
+	if (entries == NULL)
 		return 0;
 
 	printed += fprintf(fp, "\n");
@@ -4648,8 +4710,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 	printed += fprintf(fp, "                                     (msec)    (msec)    (msec)    (msec)        (%%)\n");
 	printed += fprintf(fp, "   --------------- --------  ------ -------- --------- --------- ---------     ------\n");
 
-	resort_rb__for_each_entry(nd, syscall_stats) {
-		struct syscall_stats *stats = syscall_stats_entry->stats;
+	for (size_t i = 0; i < ttrace->syscall_stats->sz; i++) {
+		struct syscall_entry *entry = &entries[i];
+		struct syscall_stats *stats = entry->stats;
+
 		if (stats) {
 			double min = (double)(stats->stats.min) / NSEC_PER_MSEC;
 			double max = (double)(stats->stats.max) / NSEC_PER_MSEC;
@@ -4660,10 +4724,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 			pct = avg ? 100.0 * stddev_stats(&stats->stats) / avg : 0.0;
 			avg /= NSEC_PER_MSEC;
 
-			sc = &trace->syscalls.table[syscall_stats_entry->syscall];
+			sc = &trace->syscalls.table[entry->syscall];
 			printed += fprintf(fp, "   %-15s", sc->name);
 			printed += fprintf(fp, " %8" PRIu64 " %6" PRIu64 " %9.3f %9.3f %9.3f",
-					   n, stats->nr_failures, syscall_stats_entry->msecs, min, avg);
+					   n, stats->nr_failures, entry->msecs, min, avg);
 			printed += fprintf(fp, " %9.3f %9.2f%%\n", max, pct);
 
 			if (trace->errno_summary && stats->nr_failures) {
@@ -4677,7 +4741,7 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 		}
 	}
 
-	resort_rb__delete(syscall_stats);
+	free(entries);
 	printed += fprintf(fp, "\n\n");
 
 	return printed;
Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
reviewer
#9 lore raw

Re: [PATCH v2 2/4] perf trace: Convert syscall_stats to hashmap

Quoted 4 lines · Namhyung Kim

It was using a RBtree-based int-list as a hash and a custome resort logic for that. As we have hashmap, let's convert to it and add a sorting function using an array.

How is a hashmap connected to a sorting function of an array?

Quoted 31 lines

It's also to prepare supporting
system-wide syscall stats.

No functional changes intended.

---
 tools/perf/builtin-trace.c | 122 ++++++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 29 deletions(-)
tools/perf/builtin-trace.c +1 -1
index 7e0324a2e9182088..1d32ef2b05ae8c1c 100644
@@ -39,6 +39,7 @@
 #include "util/synthetic-events.h"
 #include "util/evlist.h"
 #include "util/evswitch.h"
+#include "util/hashmap.h"
 #include "util/mmap.h"
 #include <subcmd/pager.h>
 #include <subcmd/exec-cmd.h>
@@ -63,7 +64,6 @@
 #include "print_binary.h"
 #include "string2.h"
 #include "syscalltbl.h"
-#include "rb_resort.h"
 #include "../perf.h"
 #include "trace_augment.h"
 

tools/perf/builtin-trace.c struct thread_trace { · line 1525

Quoted 8 lines
tools/perf/builtin-trace.c +2 -1
@@ -1519,17 +1519,55 @@ struct thread_trace {
                struct file   *table;
        } files;
 
-       struct intlist *syscall_stats;
+       struct hashmap *syscall_stats;
 };
 
+static size_t id_hash(long key, void *ctx __maybe_unused)

I find the use of "id" in this code confusing - it is a pre-existing problem, but you add to it here. I think a more intention revealing name would be something like system_call_number_hash.

Quoted 4 lines
tools/perf/builtin-trace.c +4 -0
+{
+       return key;
+}
+

tools/perf/builtin-trace.c struct thread_trace { · line 1539

Quoted 10 lines
tools/perf/builtin-trace.c +10 -0
+static bool id_equal(long key1, long key2, void *ctx __maybe_unused)
+{
+       return key1 == key2;
+}
+
+static struct hashmap *alloc_syscall_stats(void)
+{
+       struct hashmap *stats = hashmap__new(id_hash, id_equal, NULL);
+
+       /* just for simpler error check */

What is "just for simpler error check" ?

Quoted 21 lines
tools/perf/builtin-trace.c +18 -0
+       if (IS_ERR(stats))
+               stats = NULL;
+       return stats;
+}
+
+static void delete_syscall_stats(struct hashmap *syscall_stats)
+{
+       struct hashmap_entry *pos;
+       size_t bkt;
+
+       if (syscall_stats == NULL)
+               return;
+
+       hashmap__for_each_entry(syscall_stats, pos, bkt)
+               free(pos->pvalue);
+       hashmap__free(syscall_stats);
+}
+
 static struct thread_trace *thread_trace__new(struct trace *trace)
 {
        struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));

tools/perf/builtin-trace.c struct thread_trace { · line 1568

Quoted 10 lines
tools/perf/builtin-trace.c +5 -2
 
        if (ttrace) {
                ttrace->files.max = -1;
-               if (trace->summary)
-                       ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary) {
+                       ttrace->syscall_stats = alloc_syscall_stats();
+                       if (ttrace->syscall_stats == NULL) {
+                               free(ttrace);
+                               ttrace = NULL;

This looks overly indented.

Thanks,
Ian

Quoted 148 lines
tools/perf/builtin-trace.c +53 -26
+                       }
+               }
        }
 
        return ttrace;
@@ -1544,7 +1582,7 @@ static void thread_trace__delete(void *pttrace)
        if (!ttrace)
                return;
 
-       intlist__delete(ttrace->syscall_stats);
+       delete_syscall_stats(ttrace->syscall_stats);
        ttrace->syscall_stats = NULL;
        thread_trace__free_files(ttrace);
        zfree(&ttrace->entry_str);
@@ -2463,22 +2501,19 @@ struct syscall_stats {
 static void thread__update_stats(struct thread *thread, struct thread_trace *ttrace,
                                 int id, struct perf_sample *sample, long err, bool errno_summary)
 {
-       struct int_node *inode;
-       struct syscall_stats *stats;
+       struct syscall_stats *stats = NULL;
        u64 duration = 0;
 
-       inode = intlist__findnew(ttrace->syscall_stats, id);
-       if (inode == NULL)
-               return;
-
-       stats = inode->priv;
-       if (stats == NULL) {
+       if (!hashmap__find(ttrace->syscall_stats, id, &stats)) {
                stats = zalloc(sizeof(*stats));
                if (stats == NULL)
                        return;
 
                init_stats(&stats->stats);
-               inode->priv = stats;
+               if (hashmap__add(ttrace->syscall_stats, id, stats) < 0) {
+                       free(stats);
+                       return;
+               }
        }
 
        if (ttrace->entry_time && sample->time > ttrace->entry_time)
@@ -4617,18 +4652,45 @@ static size_t trace__fprintf_threads_header(FILE *fp)
        return printed;
 }
 
-DEFINE_RESORT_RB(syscall_stats, a->msecs > b->msecs,
+struct syscall_entry {
        struct syscall_stats *stats;
        double               msecs;
        int                  syscall;
-)
+};
+
+static int entry_cmp(const void *e1, const void *e2)
 {
-       struct int_node *source = rb_entry(nd, struct int_node, rb_node);
-       struct syscall_stats *stats = source->priv;
+       const struct syscall_entry *entry1 = e1;
+       const struct syscall_entry *entry2 = e2;
 
-       entry->syscall = source->i;
-       entry->stats   = stats;
-       entry->msecs   = stats ? (u64)stats->stats.n * (avg_stats(&stats->stats) / NSEC_PER_MSEC) : 0;
+       return entry1->msecs > entry2->msecs ? -1 : 1;
+}
+
+static struct syscall_entry *thread__sort_stats(struct thread_trace *ttrace)
+{
+       struct syscall_entry *entry;
+       struct hashmap_entry *pos;
+       unsigned bkt, i, nr;
+
+       nr = ttrace->syscall_stats->sz;
+       entry = malloc(nr * sizeof(*entry));
+       if (entry == NULL)
+               return NULL;
+
+       i = 0;
+       hashmap__for_each_entry(ttrace->syscall_stats, pos, bkt) {
+               struct syscall_stats *ss = pos->pvalue;
+               struct stats *st = &ss->stats;
+
+               entry[i].stats = ss;
+               entry[i].msecs = (u64)st->n * (avg_stats(st) / NSEC_PER_MSEC);
+               entry[i].syscall = pos->key;
+               i++;
+       }
+       assert(i == nr);
+
+       qsort(entry, nr, sizeof(*entry), entry_cmp);
+       return entry;
 }
 
 static size_t thread__dump_stats(struct thread_trace *ttrace,
@@ -4636,10 +4698,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 {
        size_t printed = 0;
        struct syscall *sc;
-       struct rb_node *nd;
-       DECLARE_RESORT_RB_INTLIST(syscall_stats, ttrace->syscall_stats);
+       struct syscall_entry *entries;
 
-       if (syscall_stats == NULL)
+       entries = thread__sort_stats(ttrace);
+       if (entries == NULL)
                return 0;
 
        printed += fprintf(fp, "\n");
@@ -4648,8 +4710,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
        printed += fprintf(fp, "                                     (msec)    (msec)    (msec)    (msec)        (%%)\n");
        printed += fprintf(fp, "   --------------- --------  ------ -------- --------- --------- ---------     ------\n");
 
-       resort_rb__for_each_entry(nd, syscall_stats) {
-               struct syscall_stats *stats = syscall_stats_entry->stats;
+       for (size_t i = 0; i < ttrace->syscall_stats->sz; i++) {
+               struct syscall_entry *entry = &entries[i];
+               struct syscall_stats *stats = entry->stats;
+
                if (stats) {
                        double min = (double)(stats->stats.min) / NSEC_PER_MSEC;
                        double max = (double)(stats->stats.max) / NSEC_PER_MSEC;
@@ -4660,10 +4724,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                        pct = avg ? 100.0 * stddev_stats(&stats->stats) / avg : 0.0;
                        avg /= NSEC_PER_MSEC;
 
-                       sc = &trace->syscalls.table[syscall_stats_entry->syscall];
+                       sc = &trace->syscalls.table[entry->syscall];
                        printed += fprintf(fp, "   %-15s", sc->name);
                        printed += fprintf(fp, " %8" PRIu64 " %6" PRIu64 " %9.3f %9.3f %9.3f",
-                                          n, stats->nr_failures, syscall_stats_entry->msecs, min, avg);
+                                          n, stats->nr_failures, entry->msecs, min, avg);
                        printed += fprintf(fp, " %9.3f %9.2f%%\n", max, pct);
 
                        if (trace->errno_summary && stats->nr_failures) {
@@ -4677,7 +4741,7 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                }
        }
 
-       resort_rb__delete(syscall_stats);
+       free(entries);
        printed += fprintf(fp, "\n\n");
 
        return printed;
--

2.48.1.262.g85cc9f2d1e-goog

author maintainer
#10 lore raw

Re: [PATCH v2 2/4] perf trace: Convert syscall_stats to hashmap

Quoted 7 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim

It was using a RBtree-based int-list as a hash and a custome resort logic for that. As we have hashmap, let's convert to it and add a sorting function using an array.

How is a hashmap connected to a sorting function of an array?

By not using the int-list (and rb_resort code), it needs a new (re)sort function. So I added one by copying pointers to hashmap entries to an array and calling qsort(3). Anyway, I'll update the description.

Quoted 39 lines
Quoted 39 lines

It's also to prepare supporting
system-wide syscall stats.

No functional changes intended.

---
 tools/perf/builtin-trace.c | 122 ++++++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 29 deletions(-)
tools/perf/builtin-trace.c +2 -2
index 7e0324a2e9182088..1d32ef2b05ae8c1c 100644
@@ -39,6 +39,7 @@
 #include "util/synthetic-events.h"
 #include "util/evlist.h"
 #include "util/evswitch.h"
+#include "util/hashmap.h"
 #include "util/mmap.h"
 #include <subcmd/pager.h>
 #include <subcmd/exec-cmd.h>
@@ -63,7 +64,6 @@
 #include "print_binary.h"
 #include "string2.h"
 #include "syscalltbl.h"
-#include "rb_resort.h"
 #include "../perf.h"
 #include "trace_augment.h"
 
@@ -1519,17 +1519,55 @@ struct thread_trace {
                struct file   *table;
        } files;
 
-       struct intlist *syscall_stats;
+       struct hashmap *syscall_stats;
 };
 
Quoted 5 lines

tools/perf/builtin-trace.c struct thread_trace { · line 1525

Quoted 1 line
tools/perf/builtin-trace.c +1 -0
+static size_t id_hash(long key, void *ctx __maybe_unused)

I find the use of "id" in this code confusing - it is a pre-existing problem, but you add to it here. I think a more intention revealing name would be something like system_call_number_hash.

Yep, probably 'syscall_id_hash'.

Quoted 17 lines
Quoted 5 lines
tools/perf/builtin-trace.c +4 -0
+{
+       return key;
+}
+

tools/perf/builtin-trace.c struct thread_trace { · line 1539

Quoted 10 lines
tools/perf/builtin-trace.c +10 -0
+static bool id_equal(long key1, long key2, void *ctx __maybe_unused)
+{
+       return key1 == key2;
+}
+
+static struct hashmap *alloc_syscall_stats(void)
+{
+       struct hashmap *stats = hashmap__new(id_hash, id_equal, NULL);
+
+       /* just for simpler error check */

What is "just for simpler error check" ?

Probably it can go away. hashmap__new() returns a pointer or an error. But normally allocation functions tend to return NULL in error cases. So I changed it.

Quoted 23 lines
Quoted 23 lines
tools/perf/builtin-trace.c +18 -0
+       if (IS_ERR(stats))
+               stats = NULL;
+       return stats;
+}
+
+static void delete_syscall_stats(struct hashmap *syscall_stats)
+{
+       struct hashmap_entry *pos;
+       size_t bkt;
+
+       if (syscall_stats == NULL)
+               return;
+
+       hashmap__for_each_entry(syscall_stats, pos, bkt)
+               free(pos->pvalue);
+       hashmap__free(syscall_stats);
+}
+
 static struct thread_trace *thread_trace__new(struct trace *trace)
 {
        struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));
 
Quoted 11 lines

tools/perf/builtin-trace.c struct thread_trace { · line 1568

Quoted 9 lines
tools/perf/builtin-trace.c +5 -2
        if (ttrace) {
                ttrace->files.max = -1;
-               if (trace->summary)
-                       ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary) {
+                       ttrace->syscall_stats = alloc_syscall_stats();
+                       if (ttrace->syscall_stats == NULL) {
+                               free(ttrace);
+                               ttrace = NULL;

This looks overly indented.

I'm not sure. Maybe we can change the code to return early if some more logic would be added. But I didn't feel the strong needs for that.

Thanks,
Namhyung

Quoted 148 lines
Quoted 148 lines
tools/perf/builtin-trace.c +53 -26
+                       }
+               }
        }
 
        return ttrace;
@@ -1544,7 +1582,7 @@ static void thread_trace__delete(void *pttrace)
        if (!ttrace)
                return;
 
-       intlist__delete(ttrace->syscall_stats);
+       delete_syscall_stats(ttrace->syscall_stats);
        ttrace->syscall_stats = NULL;
        thread_trace__free_files(ttrace);
        zfree(&ttrace->entry_str);
@@ -2463,22 +2501,19 @@ struct syscall_stats {
 static void thread__update_stats(struct thread *thread, struct thread_trace *ttrace,
                                 int id, struct perf_sample *sample, long err, bool errno_summary)
 {
-       struct int_node *inode;
-       struct syscall_stats *stats;
+       struct syscall_stats *stats = NULL;
        u64 duration = 0;
 
-       inode = intlist__findnew(ttrace->syscall_stats, id);
-       if (inode == NULL)
-               return;
-
-       stats = inode->priv;
-       if (stats == NULL) {
+       if (!hashmap__find(ttrace->syscall_stats, id, &stats)) {
                stats = zalloc(sizeof(*stats));
                if (stats == NULL)
                        return;
 
                init_stats(&stats->stats);
-               inode->priv = stats;
+               if (hashmap__add(ttrace->syscall_stats, id, stats) < 0) {
+                       free(stats);
+                       return;
+               }
        }
 
        if (ttrace->entry_time && sample->time > ttrace->entry_time)
@@ -4617,18 +4652,45 @@ static size_t trace__fprintf_threads_header(FILE *fp)
        return printed;
 }
 
-DEFINE_RESORT_RB(syscall_stats, a->msecs > b->msecs,
+struct syscall_entry {
        struct syscall_stats *stats;
        double               msecs;
        int                  syscall;
-)
+};
+
+static int entry_cmp(const void *e1, const void *e2)
 {
-       struct int_node *source = rb_entry(nd, struct int_node, rb_node);
-       struct syscall_stats *stats = source->priv;
+       const struct syscall_entry *entry1 = e1;
+       const struct syscall_entry *entry2 = e2;
 
-       entry->syscall = source->i;
-       entry->stats   = stats;
-       entry->msecs   = stats ? (u64)stats->stats.n * (avg_stats(&stats->stats) / NSEC_PER_MSEC) : 0;
+       return entry1->msecs > entry2->msecs ? -1 : 1;
+}
+
+static struct syscall_entry *thread__sort_stats(struct thread_trace *ttrace)
+{
+       struct syscall_entry *entry;
+       struct hashmap_entry *pos;
+       unsigned bkt, i, nr;
+
+       nr = ttrace->syscall_stats->sz;
+       entry = malloc(nr * sizeof(*entry));
+       if (entry == NULL)
+               return NULL;
+
+       i = 0;
+       hashmap__for_each_entry(ttrace->syscall_stats, pos, bkt) {
+               struct syscall_stats *ss = pos->pvalue;
+               struct stats *st = &ss->stats;
+
+               entry[i].stats = ss;
+               entry[i].msecs = (u64)st->n * (avg_stats(st) / NSEC_PER_MSEC);
+               entry[i].syscall = pos->key;
+               i++;
+       }
+       assert(i == nr);
+
+       qsort(entry, nr, sizeof(*entry), entry_cmp);
+       return entry;
 }
 
 static size_t thread__dump_stats(struct thread_trace *ttrace,
@@ -4636,10 +4698,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 {
        size_t printed = 0;
        struct syscall *sc;
-       struct rb_node *nd;
-       DECLARE_RESORT_RB_INTLIST(syscall_stats, ttrace->syscall_stats);
+       struct syscall_entry *entries;
 
-       if (syscall_stats == NULL)
+       entries = thread__sort_stats(ttrace);
+       if (entries == NULL)
                return 0;
 
        printed += fprintf(fp, "\n");
@@ -4648,8 +4710,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
        printed += fprintf(fp, "                                     (msec)    (msec)    (msec)    (msec)        (%%)\n");
        printed += fprintf(fp, "   --------------- --------  ------ -------- --------- --------- ---------     ------\n");
 
-       resort_rb__for_each_entry(nd, syscall_stats) {
-               struct syscall_stats *stats = syscall_stats_entry->stats;
+       for (size_t i = 0; i < ttrace->syscall_stats->sz; i++) {
+               struct syscall_entry *entry = &entries[i];
+               struct syscall_stats *stats = entry->stats;
+
                if (stats) {
                        double min = (double)(stats->stats.min) / NSEC_PER_MSEC;
                        double max = (double)(stats->stats.max) / NSEC_PER_MSEC;
@@ -4660,10 +4724,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                        pct = avg ? 100.0 * stddev_stats(&stats->stats) / avg : 0.0;
                        avg /= NSEC_PER_MSEC;
 
-                       sc = &trace->syscalls.table[syscall_stats_entry->syscall];
+                       sc = &trace->syscalls.table[entry->syscall];
                        printed += fprintf(fp, "   %-15s", sc->name);
                        printed += fprintf(fp, " %8" PRIu64 " %6" PRIu64 " %9.3f %9.3f %9.3f",
-                                          n, stats->nr_failures, syscall_stats_entry->msecs, min, avg);
+                                          n, stats->nr_failures, entry->msecs, min, avg);
                        printed += fprintf(fp, " %9.3f %9.2f%%\n", max, pct);
 
                        if (trace->errno_summary && stats->nr_failures) {
@@ -4677,7 +4741,7 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                }
        }
 
-       resort_rb__delete(syscall_stats);
+       free(entries);
        printed += fprintf(fp, "\n\n");
 
        return printed;
--

2.48.1.262.g85cc9f2d1e-goog

reviewer
#11 lore raw

Re: [PATCH v2 2/4] perf trace: Convert syscall_stats to hashmap

Quoted 8 lines · Namhyung Kim
Quoted 6 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim

It was using a RBtree-based int-list as a hash and a custome resort logic for that. As we have hashmap, let's convert to it and add a sorting function using an array.

Quoted 5 lines
Quoted 1 line

How is a hashmap connected to a sorting function of an array?

By not using the int-list (and rb_resort code), it needs a new (re)sort function. So I added one by copying pointers to hashmap entries to an array and calling qsort(3). Anyway, I'll update the description.

Wouldn't pointers to entries be broken by rehashing?

Quoted 39 lines
Quoted 39 lines
Quoted 39 lines

It's also to prepare supporting
system-wide syscall stats.

No functional changes intended.

---
 tools/perf/builtin-trace.c | 122 ++++++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 29 deletions(-)
tools/perf/builtin-trace.c +2 -2
index 7e0324a2e9182088..1d32ef2b05ae8c1c 100644
@@ -39,6 +39,7 @@
 #include "util/synthetic-events.h"
 #include "util/evlist.h"
 #include "util/evswitch.h"
+#include "util/hashmap.h"
 #include "util/mmap.h"
 #include <subcmd/pager.h>
 #include <subcmd/exec-cmd.h>
@@ -63,7 +64,6 @@
 #include "print_binary.h"
 #include "string2.h"
 #include "syscalltbl.h"
-#include "rb_resort.h"
 #include "../perf.h"
 #include "trace_augment.h"
 
@@ -1519,17 +1519,55 @@ struct thread_trace {
                struct file   *table;
        } files;
 
-       struct intlist *syscall_stats;
+       struct hashmap *syscall_stats;
 };
 
Quoted 7 lines
Quoted 5 lines

tools/perf/builtin-trace.c struct thread_trace { · line 1525

Quoted 1 line
tools/perf/builtin-trace.c +1 -0
+static size_t id_hash(long key, void *ctx __maybe_unused)

I find the use of "id" in this code confusing - it is a pre-existing problem, but you add to it here. I think a more intention revealing name would be something like system_call_number_hash.

Yep, probably 'syscall_id_hash'.

What is with "id"? man syscall calls them numbers. Calling the ids makes me think they have a value other than the system call number.

Quoted 18 lines
Quoted 17 lines
Quoted 5 lines
tools/perf/builtin-trace.c +4 -0
+{
+       return key;
+}
+

tools/perf/builtin-trace.c struct thread_trace { · line 1539

Quoted 10 lines
tools/perf/builtin-trace.c +10 -0
+static bool id_equal(long key1, long key2, void *ctx __maybe_unused)
+{
+       return key1 == key2;
+}
+
+static struct hashmap *alloc_syscall_stats(void)
+{
+       struct hashmap *stats = hashmap__new(id_hash, id_equal, NULL);
+
+       /* just for simpler error check */

What is "just for simpler error check" ?

Quoted 3 lines

Probably it can go away. hashmap__new() returns a pointer or an error. But normally allocation functions tend to return NULL in error cases. So I changed it.

It would be easier to read something like ",If error is returned change to NULL for a simpler error checking by callers. "

Thanks,
Ian

Quoted 190 lines
Quoted 23 lines
Quoted 23 lines
tools/perf/builtin-trace.c +18 -0
+       if (IS_ERR(stats))
+               stats = NULL;
+       return stats;
+}
+
+static void delete_syscall_stats(struct hashmap *syscall_stats)
+{
+       struct hashmap_entry *pos;
+       size_t bkt;
+
+       if (syscall_stats == NULL)
+               return;
+
+       hashmap__for_each_entry(syscall_stats, pos, bkt)
+               free(pos->pvalue);
+       hashmap__free(syscall_stats);
+}
+
 static struct thread_trace *thread_trace__new(struct trace *trace)
 {
        struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));
 
Quoted 11 lines

tools/perf/builtin-trace.c struct thread_trace { · line 1568

Quoted 9 lines
tools/perf/builtin-trace.c +5 -2
        if (ttrace) {
                ttrace->files.max = -1;
-               if (trace->summary)
-                       ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary) {
+                       ttrace->syscall_stats = alloc_syscall_stats();
+                       if (ttrace->syscall_stats == NULL) {
+                               free(ttrace);
+                               ttrace = NULL;

This looks overly indented.

I'm not sure. Maybe we can change the code to return early if some more logic would be added. But I didn't feel the strong needs for that.

Thanks,
Namhyung

Quoted 148 lines
Quoted 148 lines
tools/perf/builtin-trace.c +53 -26
+                       }
+               }
        }
 
        return ttrace;
@@ -1544,7 +1582,7 @@ static void thread_trace__delete(void *pttrace)
        if (!ttrace)
                return;
 
-       intlist__delete(ttrace->syscall_stats);
+       delete_syscall_stats(ttrace->syscall_stats);
        ttrace->syscall_stats = NULL;
        thread_trace__free_files(ttrace);
        zfree(&ttrace->entry_str);
@@ -2463,22 +2501,19 @@ struct syscall_stats {
 static void thread__update_stats(struct thread *thread, struct thread_trace *ttrace,
                                 int id, struct perf_sample *sample, long err, bool errno_summary)
 {
-       struct int_node *inode;
-       struct syscall_stats *stats;
+       struct syscall_stats *stats = NULL;
        u64 duration = 0;
 
-       inode = intlist__findnew(ttrace->syscall_stats, id);
-       if (inode == NULL)
-               return;
-
-       stats = inode->priv;
-       if (stats == NULL) {
+       if (!hashmap__find(ttrace->syscall_stats, id, &stats)) {
                stats = zalloc(sizeof(*stats));
                if (stats == NULL)
                        return;
 
                init_stats(&stats->stats);
-               inode->priv = stats;
+               if (hashmap__add(ttrace->syscall_stats, id, stats) < 0) {
+                       free(stats);
+                       return;
+               }
        }
 
        if (ttrace->entry_time && sample->time > ttrace->entry_time)
@@ -4617,18 +4652,45 @@ static size_t trace__fprintf_threads_header(FILE *fp)
        return printed;
 }
 
-DEFINE_RESORT_RB(syscall_stats, a->msecs > b->msecs,
+struct syscall_entry {
        struct syscall_stats *stats;
        double               msecs;
        int                  syscall;
-)
+};
+
+static int entry_cmp(const void *e1, const void *e2)
 {
-       struct int_node *source = rb_entry(nd, struct int_node, rb_node);
-       struct syscall_stats *stats = source->priv;
+       const struct syscall_entry *entry1 = e1;
+       const struct syscall_entry *entry2 = e2;
 
-       entry->syscall = source->i;
-       entry->stats   = stats;
-       entry->msecs   = stats ? (u64)stats->stats.n * (avg_stats(&stats->stats) / NSEC_PER_MSEC) : 0;
+       return entry1->msecs > entry2->msecs ? -1 : 1;
+}
+
+static struct syscall_entry *thread__sort_stats(struct thread_trace *ttrace)
+{
+       struct syscall_entry *entry;
+       struct hashmap_entry *pos;
+       unsigned bkt, i, nr;
+
+       nr = ttrace->syscall_stats->sz;
+       entry = malloc(nr * sizeof(*entry));
+       if (entry == NULL)
+               return NULL;
+
+       i = 0;
+       hashmap__for_each_entry(ttrace->syscall_stats, pos, bkt) {
+               struct syscall_stats *ss = pos->pvalue;
+               struct stats *st = &ss->stats;
+
+               entry[i].stats = ss;
+               entry[i].msecs = (u64)st->n * (avg_stats(st) / NSEC_PER_MSEC);
+               entry[i].syscall = pos->key;
+               i++;
+       }
+       assert(i == nr);
+
+       qsort(entry, nr, sizeof(*entry), entry_cmp);
+       return entry;
 }
 
 static size_t thread__dump_stats(struct thread_trace *ttrace,
@@ -4636,10 +4698,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 {
        size_t printed = 0;
        struct syscall *sc;
-       struct rb_node *nd;
-       DECLARE_RESORT_RB_INTLIST(syscall_stats, ttrace->syscall_stats);
+       struct syscall_entry *entries;
 
-       if (syscall_stats == NULL)
+       entries = thread__sort_stats(ttrace);
+       if (entries == NULL)
                return 0;
 
        printed += fprintf(fp, "\n");
@@ -4648,8 +4710,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
        printed += fprintf(fp, "                                     (msec)    (msec)    (msec)    (msec)        (%%)\n");
        printed += fprintf(fp, "   --------------- --------  ------ -------- --------- --------- ---------     ------\n");
 
-       resort_rb__for_each_entry(nd, syscall_stats) {
-               struct syscall_stats *stats = syscall_stats_entry->stats;
+       for (size_t i = 0; i < ttrace->syscall_stats->sz; i++) {
+               struct syscall_entry *entry = &entries[i];
+               struct syscall_stats *stats = entry->stats;
+
                if (stats) {
                        double min = (double)(stats->stats.min) / NSEC_PER_MSEC;
                        double max = (double)(stats->stats.max) / NSEC_PER_MSEC;
@@ -4660,10 +4724,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                        pct = avg ? 100.0 * stddev_stats(&stats->stats) / avg : 0.0;
                        avg /= NSEC_PER_MSEC;
 
-                       sc = &trace->syscalls.table[syscall_stats_entry->syscall];
+                       sc = &trace->syscalls.table[entry->syscall];
                        printed += fprintf(fp, "   %-15s", sc->name);
                        printed += fprintf(fp, " %8" PRIu64 " %6" PRIu64 " %9.3f %9.3f %9.3f",
-                                          n, stats->nr_failures, syscall_stats_entry->msecs, min, avg);
+                                          n, stats->nr_failures, entry->msecs, min, avg);
                        printed += fprintf(fp, " %9.3f %9.2f%%\n", max, pct);
 
                        if (trace->errno_summary && stats->nr_failures) {
@@ -4677,7 +4741,7 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                }
        }
 
-       resort_rb__delete(syscall_stats);
+       free(entries);
        printed += fprintf(fp, "\n\n");
 
        return printed;
--

2.48.1.262.g85cc9f2d1e-goog

author maintainer
#12 lore raw

Re: [PATCH v2 2/4] perf trace: Convert syscall_stats to hashmap

Quoted 9 lines · Ian Rogers
Quoted 8 lines · Namhyung Kim
Quoted 6 lines · Ian Rogers
Quoted 4 lines · Namhyung Kim

It was using a RBtree-based int-list as a hash and a custome resort logic for that. As we have hashmap, let's convert to it and add a sorting function using an array.

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

How is a hashmap connected to a sorting function of an array?

By not using the int-list (and rb_resort code), it needs a new (re)sort function. So I added one by copying pointers to hashmap entries to an array and calling qsort(3). Anyway, I'll update the description.

Wouldn't pointers to entries be broken by rehashing?

I think it's ok since the hashmap uses dynamically allocated entries. But the hashmap is fixed at this point because it's called after finishing the trace. So it should be fine anyway.

Quoted 46 lines
Quoted 46 lines
Quoted 45 lines
Quoted 33 lines

It's also to prepare supporting
system-wide syscall stats.

No functional changes intended.

---
 tools/perf/builtin-trace.c | 122 ++++++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 29 deletions(-)
tools/perf/builtin-trace.c +1 -1
index 7e0324a2e9182088..1d32ef2b05ae8c1c 100644
@@ -39,6 +39,7 @@
 #include "util/synthetic-events.h"
 #include "util/evlist.h"
 #include "util/evswitch.h"
+#include "util/hashmap.h"
 #include "util/mmap.h"
 #include <subcmd/pager.h>
 #include <subcmd/exec-cmd.h>
@@ -63,7 +64,6 @@
 #include "print_binary.h"
 #include "string2.h"
 #include "syscalltbl.h"
-#include "rb_resort.h"
 #include "../perf.h"
 #include "trace_augment.h"
 

tools/perf/builtin-trace.c struct thread_trace { · line 1525

Quoted 8 lines
tools/perf/builtin-trace.c +2 -1
@@ -1519,17 +1519,55 @@ struct thread_trace {
                struct file   *table;
        } files;
 
-       struct intlist *syscall_stats;
+       struct hashmap *syscall_stats;
 };
 
+static size_t id_hash(long key, void *ctx __maybe_unused)

I find the use of "id" in this code confusing - it is a pre-existing problem, but you add to it here. I think a more intention revealing name would be something like system_call_number_hash.

Quoted 4 lines
Quoted 1 line

Yep, probably 'syscall_id_hash'.

What is with "id"? man syscall calls them numbers. Calling the ids makes me think they have a value other than the system call number.

But it's already used in this code widely so renaming it now may bring another confusion.

Quoted 19 lines
Quoted 19 lines
Quoted 18 lines
Quoted 6 lines
tools/perf/builtin-trace.c +4 -0
+{
+       return key;
+}
+

tools/perf/builtin-trace.c struct thread_trace { · line 1539

Quoted 10 lines
tools/perf/builtin-trace.c +10 -0
+static bool id_equal(long key1, long key2, void *ctx __maybe_unused)
+{
+       return key1 == key2;
+}
+
+static struct hashmap *alloc_syscall_stats(void)
+{
+       struct hashmap *stats = hashmap__new(id_hash, id_equal, NULL);
+
+       /* just for simpler error check */

What is "just for simpler error check" ?

Quoted 7 lines
Quoted 3 lines

Probably it can go away. hashmap__new() returns a pointer or an error. But normally allocation functions tend to return NULL in error cases. So I changed it.

It would be easier to read something like ",If error is returned change to NULL for a simpler error checking by callers. "

Thanks for the suggestion, but I think I'll remove the part.

Thanks,
Namhyung

Quoted 191 lines
Quoted 191 lines
Quoted 24 lines
Quoted 24 lines
tools/perf/builtin-trace.c +18 -0
+       if (IS_ERR(stats))
+               stats = NULL;
+       return stats;
+}
+
+static void delete_syscall_stats(struct hashmap *syscall_stats)
+{
+       struct hashmap_entry *pos;
+       size_t bkt;
+
+       if (syscall_stats == NULL)
+               return;
+
+       hashmap__for_each_entry(syscall_stats, pos, bkt)
+               free(pos->pvalue);
+       hashmap__free(syscall_stats);
+}
+
 static struct thread_trace *thread_trace__new(struct trace *trace)
 {
        struct thread_trace *ttrace =  zalloc(sizeof(struct thread_trace));
 
Quoted 11 lines

tools/perf/builtin-trace.c struct thread_trace { · line 1568

Quoted 9 lines
tools/perf/builtin-trace.c +5 -2
        if (ttrace) {
                ttrace->files.max = -1;
-               if (trace->summary)
-                       ttrace->syscall_stats = intlist__new(NULL);
+               if (trace->summary) {
+                       ttrace->syscall_stats = alloc_syscall_stats();
+                       if (ttrace->syscall_stats == NULL) {
+                               free(ttrace);
+                               ttrace = NULL;

This looks overly indented.

I'm not sure. Maybe we can change the code to return early if some more logic would be added. But I didn't feel the strong needs for that.

Thanks,
Namhyung

Quoted 148 lines
Quoted 148 lines
tools/perf/builtin-trace.c +53 -26
+                       }
+               }
        }
 
        return ttrace;
@@ -1544,7 +1582,7 @@ static void thread_trace__delete(void *pttrace)
        if (!ttrace)
                return;
 
-       intlist__delete(ttrace->syscall_stats);
+       delete_syscall_stats(ttrace->syscall_stats);
        ttrace->syscall_stats = NULL;
        thread_trace__free_files(ttrace);
        zfree(&ttrace->entry_str);
@@ -2463,22 +2501,19 @@ struct syscall_stats {
 static void thread__update_stats(struct thread *thread, struct thread_trace *ttrace,
                                 int id, struct perf_sample *sample, long err, bool errno_summary)
 {
-       struct int_node *inode;
-       struct syscall_stats *stats;
+       struct syscall_stats *stats = NULL;
        u64 duration = 0;
 
-       inode = intlist__findnew(ttrace->syscall_stats, id);
-       if (inode == NULL)
-               return;
-
-       stats = inode->priv;
-       if (stats == NULL) {
+       if (!hashmap__find(ttrace->syscall_stats, id, &stats)) {
                stats = zalloc(sizeof(*stats));
                if (stats == NULL)
                        return;
 
                init_stats(&stats->stats);
-               inode->priv = stats;
+               if (hashmap__add(ttrace->syscall_stats, id, stats) < 0) {
+                       free(stats);
+                       return;
+               }
        }
 
        if (ttrace->entry_time && sample->time > ttrace->entry_time)
@@ -4617,18 +4652,45 @@ static size_t trace__fprintf_threads_header(FILE *fp)
        return printed;
 }
 
-DEFINE_RESORT_RB(syscall_stats, a->msecs > b->msecs,
+struct syscall_entry {
        struct syscall_stats *stats;
        double               msecs;
        int                  syscall;
-)
+};
+
+static int entry_cmp(const void *e1, const void *e2)
 {
-       struct int_node *source = rb_entry(nd, struct int_node, rb_node);
-       struct syscall_stats *stats = source->priv;
+       const struct syscall_entry *entry1 = e1;
+       const struct syscall_entry *entry2 = e2;
 
-       entry->syscall = source->i;
-       entry->stats   = stats;
-       entry->msecs   = stats ? (u64)stats->stats.n * (avg_stats(&stats->stats) / NSEC_PER_MSEC) : 0;
+       return entry1->msecs > entry2->msecs ? -1 : 1;
+}
+
+static struct syscall_entry *thread__sort_stats(struct thread_trace *ttrace)
+{
+       struct syscall_entry *entry;
+       struct hashmap_entry *pos;
+       unsigned bkt, i, nr;
+
+       nr = ttrace->syscall_stats->sz;
+       entry = malloc(nr * sizeof(*entry));
+       if (entry == NULL)
+               return NULL;
+
+       i = 0;
+       hashmap__for_each_entry(ttrace->syscall_stats, pos, bkt) {
+               struct syscall_stats *ss = pos->pvalue;
+               struct stats *st = &ss->stats;
+
+               entry[i].stats = ss;
+               entry[i].msecs = (u64)st->n * (avg_stats(st) / NSEC_PER_MSEC);
+               entry[i].syscall = pos->key;
+               i++;
+       }
+       assert(i == nr);
+
+       qsort(entry, nr, sizeof(*entry), entry_cmp);
+       return entry;
 }
 
 static size_t thread__dump_stats(struct thread_trace *ttrace,
@@ -4636,10 +4698,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
 {
        size_t printed = 0;
        struct syscall *sc;
-       struct rb_node *nd;
-       DECLARE_RESORT_RB_INTLIST(syscall_stats, ttrace->syscall_stats);
+       struct syscall_entry *entries;
 
-       if (syscall_stats == NULL)
+       entries = thread__sort_stats(ttrace);
+       if (entries == NULL)
                return 0;
 
        printed += fprintf(fp, "\n");
@@ -4648,8 +4710,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
        printed += fprintf(fp, "                                     (msec)    (msec)    (msec)    (msec)        (%%)\n");
        printed += fprintf(fp, "   --------------- --------  ------ -------- --------- --------- ---------     ------\n");
 
-       resort_rb__for_each_entry(nd, syscall_stats) {
-               struct syscall_stats *stats = syscall_stats_entry->stats;
+       for (size_t i = 0; i < ttrace->syscall_stats->sz; i++) {
+               struct syscall_entry *entry = &entries[i];
+               struct syscall_stats *stats = entry->stats;
+
                if (stats) {
                        double min = (double)(stats->stats.min) / NSEC_PER_MSEC;
                        double max = (double)(stats->stats.max) / NSEC_PER_MSEC;
@@ -4660,10 +4724,10 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                        pct = avg ? 100.0 * stddev_stats(&stats->stats) / avg : 0.0;
                        avg /= NSEC_PER_MSEC;
 
-                       sc = &trace->syscalls.table[syscall_stats_entry->syscall];
+                       sc = &trace->syscalls.table[entry->syscall];
                        printed += fprintf(fp, "   %-15s", sc->name);
                        printed += fprintf(fp, " %8" PRIu64 " %6" PRIu64 " %9.3f %9.3f %9.3f",
-                                          n, stats->nr_failures, syscall_stats_entry->msecs, min, avg);
+                                          n, stats->nr_failures, entry->msecs, min, avg);
                        printed += fprintf(fp, " %9.3f %9.2f%%\n", max, pct);
 
                        if (trace->errno_summary && stats->nr_failures) {
@@ -4677,7 +4741,7 @@ static size_t thread__dump_stats(struct thread_trace *ttrace,
                }
        }
 
-       resort_rb__delete(syscall_stats);
+       free(entries);
        printed += fprintf(fp, "\n\n");
 
        return printed;
--

2.48.1.262.g85cc9f2d1e-goog

author maintainer
#13 lore raw

PATCH v2 3/4 perf tools: Get rid of now-unused rb_resort.h

In reply to Namhyung Kim

It was only used in perf trace and it switched to use hashmap instead. Let's delete the code.

---
 tools/perf/util/rb_resort.h | 146 ------------------------------------
 1 file changed, 146 deletions(-)
 delete mode 100644 tools/perf/util/rb_resort.h
tools/perf/util/rb_resort.h deleted +0 -146
deleted file mode 100644
index d927a0d250528505..0000000000000000
@@ -1,146 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _PERF_RESORT_RB_H_
-#define _PERF_RESORT_RB_H_
-/*
- * Template for creating a class to resort an existing rb_tree according to
- * a new sort criteria, that must be present in the entries of the source
- * rb_tree.
- *
- * (c) 2016 Arnaldo Carvalho de Melo <[email protected]>
- *
- * Quick example, resorting threads by its shortname:
- *
- * First define the prefix (threads) to be used for the functions and data
- * structures created, and provide an expression for the sorting, then the
- * fields to be present in each of the entries in the new, sorted, rb_tree.
- *
- * The body of the init function should collect the fields, maybe
- * pre-calculating them from multiple entries in the original 'entry' from
- * the rb_tree used as a source for the entries to be sorted:
-
-DEFINE_RB_RESORT_RB(threads, strcmp(a->thread->shortname,
-				    b->thread->shortname) < 0,
-	struct thread *thread;
-)
-{
-	entry->thread = rb_entry(nd, struct thread, rb_node);
-}
-
- * After this it is just a matter of instantiating it and iterating it,
- * for a few data structures with existing rb_trees, such as 'struct machine',
- * helpers are available to get the rb_root and the nr_entries:
-
-	DECLARE_RESORT_RB_MACHINE_THREADS(threads, machine_ptr);
-
- * This will instantiate the new rb_tree and a cursor for it, that can be used as:
-
-	struct rb_node *nd;
-
-	resort_rb__for_each_entry(nd, threads) {
-		struct thread *t = threads_entry;
-		printf("%s: %d\n", t->shortname, t->tid);
-	}
-
- * Then delete it:
-
-	resort_rb__delete(threads);
-
- * The name of the data structures and functions will have a _sorted suffix
- * right before the method names, i.e. will look like:
- *
- * 	struct threads_sorted_entry {}
- * 	threads_sorted__insert()
- */
-
-#define DEFINE_RESORT_RB(__name, __comp, ...)					\
-struct __name##_sorted_entry {							\
-	struct rb_node	rb_node;						\
-	__VA_ARGS__								\
-};										\
-static void __name##_sorted__init_entry(struct rb_node *nd,			\
-					struct __name##_sorted_entry *entry);	\
-										\
-static int __name##_sorted__cmp(struct rb_node *nda, struct rb_node *ndb)	\
-{										\
-	struct __name##_sorted_entry *a, *b;					\
-	a = rb_entry(nda, struct __name##_sorted_entry, rb_node);		\
-	b = rb_entry(ndb, struct __name##_sorted_entry, rb_node);		\
-	return __comp;								\
-}										\
-										\
-struct __name##_sorted {							\
-       struct rb_root		    entries;					\
-       struct __name##_sorted_entry nd[0];					\
-};										\
-										\
-static void __name##_sorted__insert(struct __name##_sorted *sorted,		\
-				      struct rb_node *sorted_nd)		\
-{										\
-	struct rb_node **p = &sorted->entries.rb_node, *parent = NULL;		\
-	while (*p != NULL) {							\
-		parent = *p;							\
-		if (__name##_sorted__cmp(sorted_nd, parent))			\
-			p = &(*p)->rb_left;					\
-		else								\
-			p = &(*p)->rb_right;					\
-	}									\
-	rb_link_node(sorted_nd, parent, p);					\
-	rb_insert_color(sorted_nd, &sorted->entries);				\
-}										\
-										\
-static void __name##_sorted__sort(struct __name##_sorted *sorted,		\
-				    struct rb_root *entries)			\
-{										\
-	struct rb_node *nd;							\
-	unsigned int i = 0;							\
-	for (nd = rb_first(entries); nd; nd = rb_next(nd)) {			\
-		struct __name##_sorted_entry *snd = &sorted->nd[i++];		\
-		__name##_sorted__init_entry(nd, snd);				\
-		__name##_sorted__insert(sorted, &snd->rb_node);			\
-	}									\
-}										\
-										\
-static struct __name##_sorted *__name##_sorted__new(struct rb_root *entries,	\
-						    int nr_entries)		\
-{										\
-	struct __name##_sorted *sorted;						\
-	sorted = malloc(sizeof(*sorted) + sizeof(sorted->nd[0]) * nr_entries);	\
-	if (sorted) {								\
-		sorted->entries = RB_ROOT;					\
-		__name##_sorted__sort(sorted, entries);				\
-	}									\
-	return sorted;								\
-}										\
-										\
-static void __name##_sorted__delete(struct __name##_sorted *sorted)		\
-{										\
-	free(sorted);								\
-}										\
-										\
-static void __name##_sorted__init_entry(struct rb_node *nd,			\
-					struct __name##_sorted_entry *entry)
-
-#define DECLARE_RESORT_RB(__name)						\
-struct __name##_sorted_entry *__name##_entry;					\
-struct __name##_sorted *__name = __name##_sorted__new
-
-#define resort_rb__for_each_entry(__nd, __name)					\
-	for (__nd = rb_first(&__name->entries);					\
-	     __name##_entry = rb_entry(__nd, struct __name##_sorted_entry,	\
-				       rb_node), __nd;				\
-	     __nd = rb_next(__nd))
-
-#define resort_rb__delete(__name)						\
-	__name##_sorted__delete(__name), __name = NULL
-
-/*
- * Helpers for other classes that contains both an rbtree and the
- * number of entries in it:
- */
-
-/* For 'struct intlist' */
-#define DECLARE_RESORT_RB_INTLIST(__name, __ilist)				\
-	DECLARE_RESORT_RB(__name)(&__ilist->rblist.entries.rb_root,		\
-				  __ilist->rblist.nr_entries)
-
-#endif /* _PERF_RESORT_RB_H_ */
Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
author maintainer
#14 lore raw

PATCH v2 4/4 perf trace: Add --summary-mode option

In reply to Namhyung Kim

The --summary-mode option will select how to show the syscall summary at the end. By default, it'll show the summary for each thread and it's the same as if --summary-mode=thread is passed.

The other option is to show total summary, which is --summary-mode=total. I'd like to have this instead of a separate option like --total-summary because we may want to add a new summary mode (by cgroup) later.

  $ sudo ./perf trace -as --summary-mode=total sleep 1

Summary of events:

total, 21580 events

     syscall            calls  errors  total       min       avg       max       stddev
                                       (msec)    (msec)    (msec)    (msec)        (%)
     --------------- --------  ------ -------- --------- --------- ---------     ------
     epoll_wait          1305      0 14716.712     0.000    11.277   551.529      8.87%
     futex               1256     89 13331.197     0.000    10.614   733.722     15.49%
     poll                 669      0  6806.618     0.000    10.174   459.316     11.77%
     ppoll                220      0  3968.797     0.000    18.040   516.775     25.35%
     clock_nanosleep        1      0  1000.027  1000.027  1000.027  1000.027      0.00%
     epoll_pwait           21      0   592.783     0.000    28.228   522.293     88.29%
     nanosleep             16      0    60.515     0.000     3.782    10.123     33.33%
     ioctl                510      0     4.284     0.001     0.008     0.182      8.84%
     recvmsg             1434    775     3.497     0.001     0.002     0.174      6.37%
     write               1393      0     2.854     0.001     0.002     0.017      1.79%
     read                1063    100     2.236     0.000     0.002     0.083      5.11%
     ...
---
 tools/perf/Documentation/perf-trace.txt |   4 +
 tools/perf/builtin-trace.c              | 129 ++++++++++++++++++++----
 2 files changed, 114 insertions(+), 19 deletions(-)
tools/perf/Documentation/perf-trace.txt +4 -0
index fb3d2af33844c06b..887dc37773d0f4d6 100644
@@ -150,6 +150,10 @@ the thread executes on the designated CPUs. Default is to monitor all CPUs.
 	To be used with -s or -S, to show stats for the errnos experienced by
 	syscalls, using only this option will trigger --summary.
 
+--summary-mode=mode::
+	To be used with -s or -S, to select how to show summary.  By default it'll
+	show the syscall summary by thread.  Possible values are: thread, total.
+
 --tool_stats::
 	Show tool stats such as number of times fd->pathname was discovered thru
 	hooking the open syscall return + vfs_getname or via reading /proc/pid/fd, etc.
tools/perf/builtin-trace.c +110 -19

295 lines not on this page · raw message

Signature · 1 line
2.48.1.262.g85cc9f2d1e-goog
Acked-by on the v2 series
#15 lore raw
In reply to Namhyung Kim

Hello Namhyung,

Quoted 31 lines · Namhyung Kim

Hello,

I've realized that perf trace shows system call summary at the end for each thread. But sometimes users want to see the global whole system summary or statistics instead.

So I've added --summary-mode option like below:

    $ sudo ./perf trace -as --summary-mode=total sleep 1
     Summary of events:

     total, 21580 events

       syscall            calls  errors  total       min       avg       max       stddev
                                         (msec)    (msec)    (msec)    (msec)        (%)
       --------------- --------  ------ -------- --------- --------- ---------     ------
       epoll_wait          1305      0 14716.712     0.000    11.277   551.529      8.87%
       futex               1256     89 13331.197     0.000    10.614   733.722     15.49%
       poll                 669      0  6806.618     0.000    10.174   459.316     11.77%
       ppoll                220      0  3968.797     0.000    18.040   516.775     25.35%
       clock_nanosleep        1      0  1000.027  1000.027  1000.027  1000.027      0.00%
       epoll_pwait           21      0   592.783     0.000    28.228   522.293     88.29%
       nanosleep             16      0    60.515     0.000     3.782    10.123     33.33%
       ioctl                510      0     4.284     0.001     0.008     0.182      8.84%
       recvmsg             1434    775     3.497     0.001     0.002     0.174      6.37%
       write               1393      0     2.854     0.001     0.002     0.017      1.79%
       read                1063    100     2.236     0.000     0.002     0.083      5.11%
       ...
Quoted 7 lines

Also it changes internal data structure to hash table to track statistics of syscalls. And removes the rb_resort code.

v2 changes)
* Rebase to current perf-tools-next
* Fix some style issues (Howard)
* Rename to --summary-mode (Howard)

perf $ sudo ./perf trace -s -C 0 --summary-mode=total ^C
Summary of events:

total, 185 events

syscall calls errors total min avg
max stddev
(msec) (msec) (msec)
(msec) (%)
--------------- -------- ------ -------- --------- ---------
--------- ------
ppoll 29 0 188.684 0.000 6.506
62.504 54.91%
read 20 0 0.415 0.002 0.021
0.345 82.16%
write 24 0 0.085 0.001 0.004
0.012 12.09%
sendmsg 4 0 0.039 0.005 0.010
0.014 24.12%
recvmsg 8 0 0.034 0.003 0.004
0.005 4.81%
poll 8 0 0.020 0.002 0.003
0.003 8.96%

The new option is working as expected, thank you.

Thanks,
Howard

Quoted 20 lines

Thanks,
Namhyung

Namhyung Kim (4):
perf trace: Allocate syscall stats only if summary is on perf trace: Convert syscall_stats to hashmap perf tools: Get rid of now-unused rb_resort.h perf trace: Add --summary-mode option

 tools/perf/Documentation/perf-trace.txt |   4 +
 tools/perf/builtin-trace.c              | 252 +++++++++++++++++++-----
 tools/perf/util/rb_resort.h             | 146 --------------
 3 files changed, 208 insertions(+), 194 deletions(-)
 delete mode 100644 tools/perf/util/rb_resort.h

--
2.48.1.262.g85cc9f2d1e-goog