Skip to content

Commit 05e8b08

Browse files
acmelacmel
committed
perf ui browser: Stop using 'self'
Stop using this python/OOP convention, doesn't really helps. Will do more from time to time till we get it cleaned up in all of /perf. Suggested-by: Thomas Gleixner <tglx@linutronix.de> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-5dyxyb8o0gf4yndk27kafbd1@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent c323cf0 commit 05e8b08

File tree

3 files changed

+320
-320
lines changed

3 files changed

+320
-320
lines changed

Diff for: ‎tools/perf/ui/browser.c

+90-90
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ int ui_browser__set_color(struct ui_browser *browser, int color)
3535
return ret;
3636
}
3737

38-
void ui_browser__set_percent_color(struct ui_browser *self,
38+
void ui_browser__set_percent_color(struct ui_browser *browser,
3939
double percent, bool current)
4040
{
41-
int color = ui_browser__percent_color(self, percent, current);
42-
ui_browser__set_color(self, color);
41+
int color = ui_browser__percent_color(browser, percent, current);
42+
ui_browser__set_color(browser, color);
4343
}
4444

45-
void ui_browser__gotorc(struct ui_browser *self, int y, int x)
45+
void ui_browser__gotorc(struct ui_browser *browser, int y, int x)
4646
{
47-
SLsmg_gotorc(self->y + y, self->x + x);
47+
SLsmg_gotorc(browser->y + y, browser->x + x);
4848
}
4949

5050
static struct list_head *
@@ -73,23 +73,23 @@ ui_browser__list_head_filter_prev_entries(struct ui_browser *browser,
7373
return NULL;
7474
}
7575

76-
void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whence)
76+
void ui_browser__list_head_seek(struct ui_browser *browser, off_t offset, int whence)
7777
{
78-
struct list_head *head = self->entries;
78+
struct list_head *head = browser->entries;
7979
struct list_head *pos;
8080

81-
if (self->nr_entries == 0)
81+
if (browser->nr_entries == 0)
8282
return;
8383

8484
switch (whence) {
8585
case SEEK_SET:
86-
pos = ui_browser__list_head_filter_entries(self, head->next);
86+
pos = ui_browser__list_head_filter_entries(browser, head->next);
8787
break;
8888
case SEEK_CUR:
89-
pos = self->top;
89+
pos = browser->top;
9090
break;
9191
case SEEK_END:
92-
pos = ui_browser__list_head_filter_prev_entries(self, head->prev);
92+
pos = ui_browser__list_head_filter_prev_entries(browser, head->prev);
9393
break;
9494
default:
9595
return;
@@ -99,26 +99,26 @@ void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whenc
9999

100100
if (offset > 0) {
101101
while (offset-- != 0)
102-
pos = ui_browser__list_head_filter_entries(self, pos->next);
102+
pos = ui_browser__list_head_filter_entries(browser, pos->next);
103103
} else {
104104
while (offset++ != 0)
105-
pos = ui_browser__list_head_filter_prev_entries(self, pos->prev);
105+
pos = ui_browser__list_head_filter_prev_entries(browser, pos->prev);
106106
}
107107

108-
self->top = pos;
108+
browser->top = pos;
109109
}
110110

111-
void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence)
111+
void ui_browser__rb_tree_seek(struct ui_browser *browser, off_t offset, int whence)
112112
{
113-
struct rb_root *root = self->entries;
113+
struct rb_root *root = browser->entries;
114114
struct rb_node *nd;
115115

116116
switch (whence) {
117117
case SEEK_SET:
118118
nd = rb_first(root);
119119
break;
120120
case SEEK_CUR:
121-
nd = self->top;
121+
nd = browser->top;
122122
break;
123123
case SEEK_END:
124124
nd = rb_last(root);
@@ -135,41 +135,41 @@ void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence)
135135
nd = rb_prev(nd);
136136
}
137137

138-
self->top = nd;
138+
browser->top = nd;
139139
}
140140

141-
unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self)
141+
unsigned int ui_browser__rb_tree_refresh(struct ui_browser *browser)
142142
{
143143
struct rb_node *nd;
144144
int row = 0;
145145

146-
if (self->top == NULL)
147-
self->top = rb_first(self->entries);
146+
if (browser->top == NULL)
147+
browser->top = rb_first(browser->entries);
148148

149-
nd = self->top;
149+
nd = browser->top;
150150

151151
while (nd != NULL) {
152-
ui_browser__gotorc(self, row, 0);
153-
self->write(self, nd, row);
154-
if (++row == self->height)
152+
ui_browser__gotorc(browser, row, 0);
153+
browser->write(browser, nd, row);
154+
if (++row == browser->height)
155155
break;
156156
nd = rb_next(nd);
157157
}
158158

159159
return row;
160160
}
161161

162-
bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row)
162+
bool ui_browser__is_current_entry(struct ui_browser *browser, unsigned row)
163163
{
164-
return self->top_idx + row == self->index;
164+
return browser->top_idx + row == browser->index;
165165
}
166166

167-
void ui_browser__refresh_dimensions(struct ui_browser *self)
167+
void ui_browser__refresh_dimensions(struct ui_browser *browser)
168168
{
169-
self->width = SLtt_Screen_Cols - 1;
170-
self->height = SLtt_Screen_Rows - 2;
171-
self->y = 1;
172-
self->x = 0;
169+
browser->width = SLtt_Screen_Cols - 1;
170+
browser->height = SLtt_Screen_Rows - 2;
171+
browser->y = 1;
172+
browser->x = 0;
173173
}
174174

175175
void ui_browser__handle_resize(struct ui_browser *browser)
@@ -225,10 +225,10 @@ bool ui_browser__dialog_yesno(struct ui_browser *browser, const char *text)
225225
return key == K_ENTER || toupper(key) == 'Y';
226226
}
227227

228-
void ui_browser__reset_index(struct ui_browser *self)
228+
void ui_browser__reset_index(struct ui_browser *browser)
229229
{
230-
self->index = self->top_idx = 0;
231-
self->seek(self, 0, SEEK_SET);
230+
browser->index = browser->top_idx = 0;
231+
browser->seek(browser, 0, SEEK_SET);
232232
}
233233

234234
void __ui_browser__show_title(struct ui_browser *browser, const char *title)
@@ -245,26 +245,26 @@ void ui_browser__show_title(struct ui_browser *browser, const char *title)
245245
pthread_mutex_unlock(&ui__lock);
246246
}
247247

248-
int ui_browser__show(struct ui_browser *self, const char *title,
248+
int ui_browser__show(struct ui_browser *browser, const char *title,
249249
const char *helpline, ...)
250250
{
251251
int err;
252252
va_list ap;
253253

254-
ui_browser__refresh_dimensions(self);
254+
ui_browser__refresh_dimensions(browser);
255255

256256
pthread_mutex_lock(&ui__lock);
257-
__ui_browser__show_title(self, title);
257+
__ui_browser__show_title(browser, title);
258258

259-
self->title = title;
260-
free(self->helpline);
261-
self->helpline = NULL;
259+
browser->title = title;
260+
free(browser->helpline);
261+
browser->helpline = NULL;
262262

263263
va_start(ap, helpline);
264-
err = vasprintf(&self->helpline, helpline, ap);
264+
err = vasprintf(&browser->helpline, helpline, ap);
265265
va_end(ap);
266266
if (err > 0)
267-
ui_helpline__push(self->helpline);
267+
ui_helpline__push(browser->helpline);
268268
pthread_mutex_unlock(&ui__lock);
269269
return err ? 0 : -1;
270270
}
@@ -350,15 +350,15 @@ void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries)
350350
browser->seek(browser, browser->top_idx, SEEK_SET);
351351
}
352352

353-
int ui_browser__run(struct ui_browser *self, int delay_secs)
353+
int ui_browser__run(struct ui_browser *browser, int delay_secs)
354354
{
355355
int err, key;
356356

357357
while (1) {
358358
off_t offset;
359359

360360
pthread_mutex_lock(&ui__lock);
361-
err = __ui_browser__refresh(self);
361+
err = __ui_browser__refresh(browser);
362362
SLsmg_refresh();
363363
pthread_mutex_unlock(&ui__lock);
364364
if (err < 0)
@@ -368,78 +368,78 @@ int ui_browser__run(struct ui_browser *self, int delay_secs)
368368

369369
if (key == K_RESIZE) {
370370
ui__refresh_dimensions(false);
371-
ui_browser__refresh_dimensions(self);
372-
__ui_browser__show_title(self, self->title);
373-
ui_helpline__puts(self->helpline);
371+
ui_browser__refresh_dimensions(browser);
372+
__ui_browser__show_title(browser, browser->title);
373+
ui_helpline__puts(browser->helpline);
374374
continue;
375375
}
376376

377-
if (self->use_navkeypressed && !self->navkeypressed) {
377+
if (browser->use_navkeypressed && !browser->navkeypressed) {
378378
if (key == K_DOWN || key == K_UP ||
379379
key == K_PGDN || key == K_PGUP ||
380380
key == K_HOME || key == K_END ||
381381
key == ' ') {
382-
self->navkeypressed = true;
382+
browser->navkeypressed = true;
383383
continue;
384384
} else
385385
return key;
386386
}
387387

388388
switch (key) {
389389
case K_DOWN:
390-
if (self->index == self->nr_entries - 1)
390+
if (browser->index == browser->nr_entries - 1)
391391
break;
392-
++self->index;
393-
if (self->index == self->top_idx + self->height) {
394-
++self->top_idx;
395-
self->seek(self, +1, SEEK_CUR);
392+
++browser->index;
393+
if (browser->index == browser->top_idx + browser->height) {
394+
++browser->top_idx;
395+
browser->seek(browser, +1, SEEK_CUR);
396396
}
397397
break;
398398
case K_UP:
399-
if (self->index == 0)
399+
if (browser->index == 0)
400400
break;
401-
--self->index;
402-
if (self->index < self->top_idx) {
403-
--self->top_idx;
404-
self->seek(self, -1, SEEK_CUR);
401+
--browser->index;
402+
if (browser->index < browser->top_idx) {
403+
--browser->top_idx;
404+
browser->seek(browser, -1, SEEK_CUR);
405405
}
406406
break;
407407
case K_PGDN:
408408
case ' ':
409-
if (self->top_idx + self->height > self->nr_entries - 1)
409+
if (browser->top_idx + browser->height > browser->nr_entries - 1)
410410
break;
411411

412-
offset = self->height;
413-
if (self->index + offset > self->nr_entries - 1)
414-
offset = self->nr_entries - 1 - self->index;
415-
self->index += offset;
416-
self->top_idx += offset;
417-
self->seek(self, +offset, SEEK_CUR);
412+
offset = browser->height;
413+
if (browser->index + offset > browser->nr_entries - 1)
414+
offset = browser->nr_entries - 1 - browser->index;
415+
browser->index += offset;
416+
browser->top_idx += offset;
417+
browser->seek(browser, +offset, SEEK_CUR);
418418
break;
419419
case K_PGUP:
420-
if (self->top_idx == 0)
420+
if (browser->top_idx == 0)
421421
break;
422422

423-
if (self->top_idx < self->height)
424-
offset = self->top_idx;
423+
if (browser->top_idx < browser->height)
424+
offset = browser->top_idx;
425425
else
426-
offset = self->height;
426+
offset = browser->height;
427427

428-
self->index -= offset;
429-
self->top_idx -= offset;
430-
self->seek(self, -offset, SEEK_CUR);
428+
browser->index -= offset;
429+
browser->top_idx -= offset;
430+
browser->seek(browser, -offset, SEEK_CUR);
431431
break;
432432
case K_HOME:
433-
ui_browser__reset_index(self);
433+
ui_browser__reset_index(browser);
434434
break;
435435
case K_END:
436-
offset = self->height - 1;
437-
if (offset >= self->nr_entries)
438-
offset = self->nr_entries - 1;
436+
offset = browser->height - 1;
437+
if (offset >= browser->nr_entries)
438+
offset = browser->nr_entries - 1;
439439

440-
self->index = self->nr_entries - 1;
441-
self->top_idx = self->index - offset;
442-
self->seek(self, -offset, SEEK_END);
440+
browser->index = browser->nr_entries - 1;
441+
browser->top_idx = browser->index - offset;
442+
browser->seek(browser, -offset, SEEK_END);
443443
break;
444444
default:
445445
return key;
@@ -448,22 +448,22 @@ int ui_browser__run(struct ui_browser *self, int delay_secs)
448448
return -1;
449449
}
450450

451-
unsigned int ui_browser__list_head_refresh(struct ui_browser *self)
451+
unsigned int ui_browser__list_head_refresh(struct ui_browser *browser)
452452
{
453453
struct list_head *pos;
454-
struct list_head *head = self->entries;
454+
struct list_head *head = browser->entries;
455455
int row = 0;
456456

457-
if (self->top == NULL || self->top == self->entries)
458-
self->top = ui_browser__list_head_filter_entries(self, head->next);
457+
if (browser->top == NULL || browser->top == browser->entries)
458+
browser->top = ui_browser__list_head_filter_entries(browser, head->next);
459459

460-
pos = self->top;
460+
pos = browser->top;
461461

462462
list_for_each_from(pos, head) {
463-
if (!self->filter || !self->filter(self, pos)) {
464-
ui_browser__gotorc(self, row, 0);
465-
self->write(self, pos, row);
466-
if (++row == self->height)
463+
if (!browser->filter || !browser->filter(browser, pos)) {
464+
ui_browser__gotorc(browser, row, 0);
465+
browser->write(browser, pos, row);
466+
if (++row == browser->height)
467467
break;
468468
}
469469
}

0 commit comments

Comments
 (0)