int max_elements = 80;
int toggle_threads = 1;
+int toggle_virt = -1;
int toggle_pause = -1;
+int filter_host_panel = 0;
+
int max_center_lines;
-GPtrArray *selected_processes;
pthread_t keyboard_thread;
-struct header_view cputopview[4];
+struct header_view cputopview[6];
struct header_view iostreamtopview[3];
struct header_view fileview[3];
+struct header_view kprobeview[2];
void reset_ncurses()
{
curs_set(1);
endwin();
- exit(0);
+ quit = 1;
+ sem_post(&pause_sem);
+ sem_post(&timer);
+ sem_post(&goodtodisplay);
+ sem_post(&end_trace_sem);
+ sem_post(&goodtoupdate);
}
static void handle_sigterm(int signal)
{
+ pthread_cancel(keyboard_thread);
reset_ncurses();
}
init_pair(2, COLOR_GREEN, COLOR_BLACK); /* + */
init_pair(3, COLOR_BLACK, COLOR_WHITE); /* keys */
init_pair(4, COLOR_WHITE, COLOR_GREEN); /* keys activated */
- init_pair(5, COLOR_WHITE, COLOR_BLUE); /* select line */
- init_pair(6, COLOR_WHITE, COLOR_GREEN); /* selected process */
+ init_pair(5, COLOR_BLACK, COLOR_YELLOW); /* select line */
+ init_pair(6, COLOR_GREEN, COLOR_BLACK); /* selected process */
+ init_pair(7, COLOR_RED, COLOR_YELLOW); /* selected process + line*/
}
termtype = getenv("TERM");
if (!strcmp(termtype, "xterm") || !strcmp(termtype, "xterm-color") ||
define_key("\033[17;2~", KEY_F(18));
}
signal(SIGTERM, handle_sigterm);
+ signal(SIGINT, handle_sigterm);
mousemask(BUTTON1_CLICKED, NULL);
refresh();
}
int process_selected(struct processtop *process)
{
- int i;
- struct processtop *stored_process;
-
- for (i = 0; i < selected_processes->len; i++) {
- stored_process = g_ptr_array_index(selected_processes, i);
- if (!stored_process)
- return 0;
- if (stored_process->tid == process->tid)
- return 1;
- }
+ if (lookup_filter_tid_list(process->tid))
+ return 1;
return 0;
}
void update_selected_processes()
{
- int i;
- struct processtop *stored_process;
-
if (process_selected(selected_process)) {
- for (i = 0; i < selected_processes->len; i++) {
- stored_process = g_ptr_array_index(selected_processes, i);
- if (!stored_process)
- return;
- if (stored_process->tid == selected_process->tid)
- g_ptr_array_remove(selected_processes,
- stored_process);
- print_log("Process removed");
- }
+ remove_filter_tid_list(selected_process->tid);
} else {
- g_ptr_array_add(selected_processes, selected_process);
- print_log("Process added");
+ add_filter_tid_list(selected_process);
}
}
print_key(footer, "q", "Quit ", 0);
print_key(footer, "r", "Pref ", 0);
print_key(footer, "t", "Threads ", toggle_threads);
+ print_key(footer, "v", "Virt ", toggle_virt);
print_key(footer, "p", "Pause ", toggle_pause);
wrefresh(footer);
wrefresh(header);
}
-struct tm format_timestamp(uint64_t timestamp)
-{
- struct tm tm;
- uint64_t ts_sec = 0, ts_nsec;
- time_t time_s;
-
- ts_nsec = timestamp;
- ts_sec += ts_nsec / NSEC_PER_SEC;
- ts_nsec = ts_nsec % NSEC_PER_SEC;
-
- time_s = (time_t) ts_sec;
-
- localtime_r(&time_s, &tm);
-
- return tm;
-}
-
static void scale_unit(uint64_t bytes, char *ret)
{
if (bytes >= 1000000000)
return -1;
}
+void update_kprobes_display()
+{
+ int i, column;
+ struct kprobes *probe;
+ int header_offset = 2;
+ int current_line = 0;
+
+ set_window_title(center, "Kprobes Top ");
+ wattron(center, A_BOLD);
+ column = 1;
+ for (i = 0; i < 2; i++) {
+ if (kprobeview[i].sort) {
+ wattron(center, A_UNDERLINE);
+ pref_current_sort = i;
+ }
+ mvwprintw(center, 1, column, "%s", kprobeview[i].title);
+ wattroff(center, A_UNDERLINE);
+ column += 30;
+ }
+ wattroff(center, A_BOLD);
+
+ for (i = 0; i < data->kprobes_table->len; i++) {
+ column = 1;
+ probe = g_ptr_array_index(data->kprobes_table, i);
+ mvwprintw(center, current_line + header_offset, column,
+ "%s", probe->probe_name + 6);
+ column += 30;
+ mvwprintw(center, current_line + header_offset, column,
+ "%d", probe->count);
+ current_line++;
+ }
+}
+
void update_cputop_display()
{
int i;
double maxcputime;
int nblinedisplayed = 0;
int current_line = 0;
+ int current_row_offset;
int column;
elapsed = data->end - data->start;
set_window_title(center, "CPU Top");
wattron(center, A_BOLD);
column = 1;
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < 6; i++) {
+ if (toggle_virt < 0 && (i == 3 || i == 4)) {
+ continue;
+ }
if (cputopview[i].sort) {
wattron(center, A_UNDERLINE);
pref_current_sort = i;
for (i = list_offset; i < data->process_table->len &&
nblinedisplayed < max_center_lines; i++) {
tmp = g_ptr_array_index(data->process_table, i);
+ current_row_offset = 1;
+ if (toggle_filter > 0 && !lookup_filter_tid_list(tmp->tid))
+ continue;
+
if (tmp->pid != tmp->tid)
if (toggle_threads == -1)
continue;
- if (process_selected(tmp)) {
- wattron(center, COLOR_PAIR(6));
- mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
- }
+ /* line */
if (current_line == selected_line) {
selected_process = tmp;
wattron(center, COLOR_PAIR(5));
mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
}
+ /* filtered process */
+ if (process_selected(tmp)) {
+ if (current_line == selected_line)
+ wattron(center, COLOR_PAIR(7));
+ else
+ wattron(center, COLOR_PAIR(6));
+ }
/* CPU(%) */
- mvwprintw(center, current_line + header_offset, 1, "%1.2f",
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%1.2f",
tmp->totalcpunsec / maxcputime);
+ current_row_offset += 10;
/* PID */
- mvwprintw(center, current_line + header_offset, 11, "%d", tmp->pid);
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->pid);
+ current_row_offset += 10;
/* TID */
- mvwprintw(center, current_line + header_offset, 21, "%d", tmp->tid);
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->tid);
+ current_row_offset += 10;
+ if (toggle_virt > 0) {
+ /* VPID */
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->vpid);
+ current_row_offset += 10;
+ /* VTID */
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->vtid);
+ current_row_offset += 10;
+ }
/* NAME */
- mvwprintw(center, current_line + header_offset, 31, "%s", tmp->comm);
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%s", tmp->comm);
+ wattroff(center, COLOR_PAIR(7));
wattroff(center, COLOR_PAIR(6));
wattroff(center, COLOR_PAIR(5));
nblinedisplayed++;
wprintw(center, "%d", tmp->pid);
print_key_title("PPID", line++);
wprintw(center, "%d", tmp->ppid);
+ print_key_title("VPID", line++);
+ wprintw(center, "%d", tmp->vpid);
+ print_key_title("VTID", line++);
+ wprintw(center, "%d", tmp->vtid);
+ print_key_title("VPPID", line++);
+ wprintw(center, "%d", tmp->vppid);
print_key_title("CPU", line++);
wprintw(center, "%1.2f %%", tmp->totalcpunsec/maxcputime);
while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {
if (perfn1->visible) {
if (perfn1->sort) {
+ /* pref_current_sort = i; */
wattron(center, A_UNDERLINE);
- /* FIXME : sort in the opposite direction */
}
/* + 5 to strip the "perf_" prefix */
mvwprintw(center, 1, perf_row, "%s",
for (i = 0; i < data->process_table->len &&
nblinedisplayed < max_center_lines; i++) {
tmp = g_ptr_array_index(data->process_table, i);
+
+ if (toggle_filter > 0 && !lookup_filter_tid_list(tmp->tid))
+ continue;
+
if (tmp->pid != tmp->tid)
if (toggle_threads == -1)
continue;
if (process_selected(tmp)) {
- wattron(center, COLOR_PAIR(6));
- mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
+ if (current_line == selected_line)
+ wattron(center, COLOR_PAIR(7));
+ else
+ wattron(center, COLOR_PAIR(6));
}
if (current_line == selected_line) {
selected_process = tmp;
for (i = list_offset; i < data->process_table->len &&
nblinedisplayed < max_center_lines; i++) {
tmp = g_ptr_array_index(data->process_table, i);
+
+ if (toggle_filter > 0 && !lookup_filter_tid_list(tmp->tid))
+ continue;
+
if (tmp->pid != tmp->tid)
if (toggle_threads == -1)
continue;
if (process_selected(tmp)) {
- wattron(center, COLOR_PAIR(6));
- mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
+ if (current_line == selected_line)
+ wattron(center, COLOR_PAIR(7));
+ else
+ wattron(center, COLOR_PAIR(6));
}
if (current_line == selected_line) {
selected_process = tmp;
case tree:
update_cputop_display();
break;
+ case kprobes:
+ update_kprobes_display();
+ break;
default:
break;
}
doupdate();
}
+void update_hostname_pref(int *line_selected, int toggle_filter, int toggle_sort)
+{
+ int i;
+ struct host *host;
+ GList *hostlist;
+ int size;
+
+ if (!data)
+ return;
+ if (pref_panel_window) {
+ del_panel(pref_panel);
+ delwin(pref_panel_window);
+ }
+ size = g_hash_table_size(global_host_list);
+
+ pref_panel_window = create_window(size + 2, 30, 10, 10);
+ pref_panel = new_panel(pref_panel_window);
+
+ werase(pref_panel_window);
+ box(pref_panel_window, 0 , 0);
+ set_window_title(pref_panel_window, "Hosts Preferences ");
+ wattron(pref_panel_window, A_BOLD);
+ mvwprintw(pref_panel_window, g_hash_table_size(global_host_list) + 1, 1,
+ " space : toggle filter");
+ wattroff(pref_panel_window, A_BOLD);
+
+ if (*line_selected > (size - 1))
+ *line_selected = size - 1;
+ else if (*line_selected < 0)
+ *line_selected = 0;
+
+ i = 0;
+ hostlist = g_list_first(g_hash_table_get_keys(global_host_list));
+ while (hostlist) {
+ host = g_hash_table_lookup(global_host_list, hostlist->data);
+ if (i == *line_selected && toggle_filter == 1) {
+ host->filter = host->filter == 1 ? 0:1;
+ update_hostname_filter(host);
+ update_current_view();
+ }
+ if (i == *line_selected) {
+ wattron(pref_panel_window, COLOR_PAIR(5));
+ mvwhline(pref_panel_window, i + 1, 1, ' ', 30 - 2);
+ }
+ if (host->filter == 1)
+ wattron(pref_panel_window, A_BOLD);
+ mvwprintw(pref_panel_window, i + 1, 1, "[%c] %s",
+ host->filter == 1 ? 'x' : ' ',
+ (char *) hostlist->data);
+ wattroff(pref_panel_window, A_BOLD);
+ wattroff(pref_panel_window, COLOR_PAIR(5));
+ i++;
+ hostlist = g_list_next(hostlist);
+ }
+ update_panels();
+ doupdate();
+}
+
int update_preference_panel(int *line_selected, int toggle_view, int toggle_sort)
{
int ret = 0;
switch(current_view) {
case perf:
- update_perf_pref(line_selected, toggle_view, toggle_sort);
+ if (filter_host_panel)
+ update_hostname_pref(line_selected,
+ toggle_view, toggle_sort);
+ else
+ update_perf_pref(line_selected,
+ toggle_view, toggle_sort);
break;
case cpu:
- update_cpu_pref(line_selected, toggle_view, toggle_sort);
+ if (filter_host_panel)
+ update_hostname_pref(line_selected,
+ toggle_view, toggle_sort);
+ else
+ update_cpu_pref(line_selected,
+ toggle_view, toggle_sort);
break;
case iostream:
- update_iostream_pref(line_selected, toggle_view, toggle_sort);
+ if (filter_host_panel)
+ update_hostname_pref(line_selected,
+ toggle_view, toggle_sort);
+ else
+ update_iostream_pref(line_selected,
+ toggle_view, toggle_sort);
break;
case process_details:
- update_process_detail_pref(line_selected, toggle_view, toggle_sort);
+ update_process_detail_pref(line_selected,
+ toggle_view, toggle_sort);
break;
default:
ret = -1;
return ret;
}
-
void toggle_pref_panel(void)
{
int ret;
doupdate();
}
+void toggle_host_panel(void)
+{
+ int ret;
+
+ filter_host_panel = filter_host_panel ? 0 : 1;
+ if (pref_panel_visible) {
+ hide_panel(pref_panel);
+ pref_panel_visible = 0;
+ } else {
+ ret = update_preference_panel(&pref_line_selected, 0, 0);
+ if (ret < 0)
+ return;
+ show_panel(pref_panel);
+ pref_panel_visible = 1;
+ }
+ update_panels();
+ doupdate();
+}
+
void display(unsigned int index)
{
last_display_index = index;
update_preference_panel(&pref_line_selected, 1, 0);
} else {
update_selected_processes();
+ if (toggle_filter > 0) {
+ max_elements = g_hash_table_size(global_filter_list);
+ if (selected_line >= max_elements)
+ selected_line = max_elements - 1;
+ }
update_current_view();
}
break;
update_preference_panel(&pref_line_selected, 0, 1);
break;
case '>':
- if (!pref_panel_visible) {
+ /* perf uses a hashtable, it is ordered backward */
+ if (current_view == perf) {
+ pref_current_sort--;
+ } else if (!pref_panel_visible) {
pref_current_sort++;
- update_sort(&pref_current_sort);
- update_current_view();
}
+ update_sort(&pref_current_sort);
+ update_current_view();
break;
case '<':
- if (!pref_panel_visible) {
- if (pref_current_sort > 0)
- pref_current_sort--;
- update_sort(&pref_current_sort);
- update_current_view();
+ /* perf uses a hashtable, it is ordered backward */
+ if (current_view == perf) {
+ pref_current_sort++;
+ } else if (!pref_panel_visible) {
+ pref_current_sort--;
}
+ update_sort(&pref_current_sort);
+ update_current_view();
break;
case 13: /* FIXME : KEY_ENTER ?? */
current_view = previous_view;
previous_view = process_details;
}
+ selected_line = 0;
update_current_view();
break;
selected_line = 0;
update_current_view();
break;
+ case KEY_F(5):
+ if (pref_panel_visible)
+ toggle_pref_panel();
+ current_view = kprobes;
+ selected_line = 0;
+ update_current_view();
+ break;
case KEY_F(10):
case 'q':
reset_ncurses();
+ /* exit keyboard thread */
+ pthread_exit(0);
+ break;
+ case 'f':
+ toggle_filter *= -1;
+ selected_line = 0;
+ if (toggle_filter > 0)
+ max_elements = g_hash_table_size(global_filter_list);
+ else
+ max_elements = data->process_table->len;
+ update_current_view();
+ break;
+ case 'h':
+ toggle_host_panel();
break;
case 't':
toggle_threads *= -1;
case 'r':
toggle_pref_panel();
break;
+ case 'v':
+ toggle_virt *= -1;
+ update_current_view();
+ break;
/* ESCAPE, but slow to process, don't know why */
case 27:
if (pref_panel_visible)
cputopview[0].sort = 1;
cputopview[1].title = strdup("PID");
cputopview[2].title = strdup("TID");
- cputopview[3].title = strdup("NAME");
+ cputopview[3].title = strdup("VPID");
+ cputopview[4].title = strdup("VTID");
+ cputopview[5].title = strdup("NAME");
iostreamtopview[0].title = strdup("R (B/sec)");
iostreamtopview[1].title = strdup("W (B/sec)");
fileview[1].title = strdup("READ");
fileview[1].sort = 1;
fileview[2].title = strdup("WRITE");
+
+ kprobeview[0].title = strdup("NAME");
+ kprobeview[1].title = strdup("HIT");
+ kprobeview[1].sort = 1;
}
void init_ncurses()
{
- selected_processes = g_ptr_array_new();
sem_init(&update_display_sem, 0, 1);
init_view_headers();
init_screen();