hc
2023-12-08 01573e231f18eb2d99162747186f59511f56b64d
kernel/tools/perf/util/top.c
....@@ -1,18 +1,17 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Copyright (C) 2011, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
34 *
45 * Refactored from builtin-top.c, see that files for further copyright notes.
5
- *
6
- * Released under the GPL v2. (and only v2, not any later version)
76 */
87
9
-#include "cpumap.h"
108 #include "event.h"
119 #include "evlist.h"
1210 #include "evsel.h"
1311 #include "parse-events.h"
1412 #include "symbol.h"
1513 #include "top.h"
14
+#include "../perf.h"
1615 #include <inttypes.h>
1716
1817 #define SNPRINTF(buf, size, fmt, args...) \
....@@ -46,8 +45,9 @@
4645 samples_per_sec;
4746 ret = SNPRINTF(bf, size,
4847 " PerfTop:%8.0f irqs/sec kernel:%4.1f%%"
49
- " exact: %4.1f%% [", samples_per_sec,
50
- ksamples_percent, esamples_percent);
48
+ " exact: %4.1f%% lost: %" PRIu64 "/%" PRIu64 " drop: %" PRIu64 "/%" PRIu64 " [",
49
+ samples_per_sec, ksamples_percent, esamples_percent,
50
+ top->lost, top->lost_total, top->drop, top->drop_total);
5151 } else {
5252 float us_samples_per_sec = top->us_samples / top->delay_secs;
5353 float guest_kernel_samples_per_sec = top->guest_kernel_samples / top->delay_secs;
....@@ -70,14 +70,14 @@
7070 esamples_percent);
7171 }
7272
73
- if (top->evlist->nr_entries == 1) {
74
- struct perf_evsel *first = perf_evlist__first(top->evlist);
73
+ if (top->evlist->core.nr_entries == 1) {
74
+ struct evsel *first = evlist__first(top->evlist);
7575 ret += SNPRINTF(bf + ret, size - ret, "%" PRIu64 "%s ",
76
- (uint64_t)first->attr.sample_period,
76
+ (uint64_t)first->core.attr.sample_period,
7777 opts->freq ? "Hz" : "");
7878 }
7979
80
- ret += SNPRINTF(bf + ret, size - ret, "%s", perf_evsel__name(top->sym_evsel));
80
+ ret += SNPRINTF(bf + ret, size - ret, "%s", evsel__name(top->sym_evsel));
8181
8282 ret += SNPRINTF(bf + ret, size - ret, "], ");
8383
....@@ -95,17 +95,18 @@
9595
9696 if (target->cpu_list)
9797 ret += SNPRINTF(bf + ret, size - ret, ", CPU%s: %s)",
98
- top->evlist->cpus->nr > 1 ? "s" : "",
98
+ top->evlist->core.cpus->nr > 1 ? "s" : "",
9999 target->cpu_list);
100100 else {
101101 if (target->tid)
102102 ret += SNPRINTF(bf + ret, size - ret, ")");
103103 else
104104 ret += SNPRINTF(bf + ret, size - ret, ", %d CPU%s)",
105
- top->evlist->cpus->nr,
106
- top->evlist->cpus->nr > 1 ? "s" : "");
105
+ top->evlist->core.cpus->nr,
106
+ top->evlist->core.cpus->nr > 1 ? "s" : "");
107107 }
108108
109
+ perf_top__reset_sample_counters(top);
109110 return ret;
110111 }
111112
....@@ -113,5 +114,5 @@
113114 {
114115 top->samples = top->us_samples = top->kernel_samples =
115116 top->exact_samples = top->guest_kernel_samples =
116
- top->guest_us_samples = 0;
117
+ top->guest_us_samples = top->lost = top->drop = 0;
117118 }