|
@@ -26,13 +26,14 @@ struct hist_browser {
|
|
|
int print_seq;
|
|
int print_seq;
|
|
|
bool show_dso;
|
|
bool show_dso;
|
|
|
float min_pcnt;
|
|
float min_pcnt;
|
|
|
- u64 nr_pcnt_entries;
|
|
|
|
|
|
|
+ u64 nr_non_filtered_entries;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
extern void hist_browser__init_hpp(void);
|
|
extern void hist_browser__init_hpp(void);
|
|
|
|
|
|
|
|
static int hists__browser_title(struct hists *hists, char *bf, size_t size,
|
|
static int hists__browser_title(struct hists *hists, char *bf, size_t size,
|
|
|
const char *ev_name);
|
|
const char *ev_name);
|
|
|
|
|
+static void hist_browser__update_nr_entries(struct hist_browser *hb);
|
|
|
|
|
|
|
|
static void hist_browser__refresh_dimensions(struct hist_browser *browser)
|
|
static void hist_browser__refresh_dimensions(struct hist_browser *browser)
|
|
|
{
|
|
{
|
|
@@ -310,8 +311,6 @@ static void ui_browser__warn_lost_events(struct ui_browser *browser)
|
|
|
"Or reduce the sampling frequency.");
|
|
"Or reduce the sampling frequency.");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-static void hist_browser__update_pcnt_entries(struct hist_browser *hb);
|
|
|
|
|
-
|
|
|
|
|
static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
|
|
static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
|
|
|
struct hist_browser_timer *hbt)
|
|
struct hist_browser_timer *hbt)
|
|
|
{
|
|
{
|
|
@@ -322,7 +321,7 @@ static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
|
|
|
browser->b.entries = &browser->hists->entries;
|
|
browser->b.entries = &browser->hists->entries;
|
|
|
browser->b.nr_entries = browser->hists->nr_entries;
|
|
browser->b.nr_entries = browser->hists->nr_entries;
|
|
|
if (browser->min_pcnt)
|
|
if (browser->min_pcnt)
|
|
|
- browser->b.nr_entries = browser->nr_pcnt_entries;
|
|
|
|
|
|
|
+ browser->b.nr_entries = browser->nr_non_filtered_entries;
|
|
|
|
|
|
|
|
hist_browser__refresh_dimensions(browser);
|
|
hist_browser__refresh_dimensions(browser);
|
|
|
hists__browser_title(browser->hists, title, sizeof(title), ev_name);
|
|
hists__browser_title(browser->hists, title, sizeof(title), ev_name);
|
|
@@ -340,8 +339,8 @@ static int hist_browser__run(struct hist_browser *browser, const char *ev_name,
|
|
|
hbt->timer(hbt->arg);
|
|
hbt->timer(hbt->arg);
|
|
|
|
|
|
|
|
if (browser->min_pcnt) {
|
|
if (browser->min_pcnt) {
|
|
|
- hist_browser__update_pcnt_entries(browser);
|
|
|
|
|
- nr_entries = browser->nr_pcnt_entries;
|
|
|
|
|
|
|
+ hist_browser__update_nr_entries(browser);
|
|
|
|
|
+ nr_entries = browser->nr_non_filtered_entries;
|
|
|
} else {
|
|
} else {
|
|
|
nr_entries = browser->hists->nr_entries;
|
|
nr_entries = browser->hists->nr_entries;
|
|
|
}
|
|
}
|
|
@@ -1343,7 +1342,7 @@ close_file_and_continue:
|
|
|
return ret;
|
|
return ret;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-static void hist_browser__update_pcnt_entries(struct hist_browser *hb)
|
|
|
|
|
|
|
+static void hist_browser__update_nr_entries(struct hist_browser *hb)
|
|
|
{
|
|
{
|
|
|
u64 nr_entries = 0;
|
|
u64 nr_entries = 0;
|
|
|
struct rb_node *nd = rb_first(&hb->hists->entries);
|
|
struct rb_node *nd = rb_first(&hb->hists->entries);
|
|
@@ -1354,7 +1353,7 @@ static void hist_browser__update_pcnt_entries(struct hist_browser *hb)
|
|
|
nd = rb_next(nd);
|
|
nd = rb_next(nd);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- hb->nr_pcnt_entries = nr_entries;
|
|
|
|
|
|
|
+ hb->nr_non_filtered_entries = nr_entries;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
|
|
static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
|
|
@@ -1411,7 +1410,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
|
|
|
|
|
|
|
|
if (min_pcnt) {
|
|
if (min_pcnt) {
|
|
|
browser->min_pcnt = min_pcnt;
|
|
browser->min_pcnt = min_pcnt;
|
|
|
- hist_browser__update_pcnt_entries(browser);
|
|
|
|
|
|
|
+ hist_browser__update_nr_entries(browser);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
fstack = pstack__new(2);
|
|
fstack = pstack__new(2);
|