projects
/
lttngtop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove broken page up/down support
[lttngtop.git]
/
src
/
cursesdisplay.c
diff --git
a/src/cursesdisplay.c
b/src/cursesdisplay.c
index 2fd69763673acf7fb55c51197a962cd7c5479830..4c91e1ea49d41bee7824674394bcd3879b975d9e 100644
(file)
--- a/
src/cursesdisplay.c
+++ b/
src/cursesdisplay.c
@@
-61,7
+61,6
@@
int max_elements = 80;
int toggle_threads = -1;
int toggle_pause = -1;
int toggle_threads = -1;
int toggle_pause = -1;
-int toggle_tree = -1;
int max_center_lines;
int max_center_lines;
@@
-165,7
+164,7
@@
void print_headers(int line, char *desc, int value, int first, int second)
wattron(header, A_BOLD);
mvwprintw(header, line, 4, "%s", desc);
wattroff(header, A_BOLD);
wattron(header, A_BOLD);
mvwprintw(header, line, 4, "%s", desc);
wattroff(header, A_BOLD);
- mvwprintw(header, line, 16, "
N/A
", value);
+ mvwprintw(header, line, 16, "
%d
", value);
wmove(header, line, 24);
print_digits(header, first, second);
wmove(header, line, 40);
wmove(header, line, 24);
print_digits(header, first, second);
wmove(header, line, 40);
@@
-254,42
+253,57
@@
void basic_header()
set_window_title(header, "Statistics for interval [gathering data...[");
wattron(header, A_BOLD);
mvwprintw(header, 1, 4, "CPUs");
set_window_title(header, "Statistics for interval [gathering data...[");
wattron(header, A_BOLD);
mvwprintw(header, 1, 4, "CPUs");
- mvwprintw(header, 2, 4, "Processes");
- mvwprintw(header, 3, 4, "Threads");
- mvwprintw(header, 4, 4, "Files");
- mvwprintw(header, 5, 4, "Network");
- mvwprintw(header, 6, 4, "IO");
+ mvwprintw(header, 2, 4, "Threads");
+ mvwprintw(header, 3, 4, "FDs");
wattroff(header, A_BOLD);
wrefresh(header);
}
wattroff(header, A_BOLD);
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;
+}
+
void update_header()
{
void update_header()
{
+ struct tm start, end;
+ uint64_t ts_nsec_start, ts_nsec_end;
+
+ ts_nsec_start = data->start % NSEC_PER_SEC;
+ start = format_timestamp(data->start);
+
+ ts_nsec_end = data->end % NSEC_PER_SEC;
+ end = format_timestamp(data->end);
+
werase(header);
box(header, 0 , 0);
set_window_title(header, "Statistics for interval ");
wattron(header, A_BOLD);
werase(header);
box(header, 0 , 0);
set_window_title(header, "Statistics for interval ");
wattron(header, A_BOLD);
- /*
- wprintw(header, "[%lu.%lu, %lu.%lu[",
- data->start.tv_sec, data->start.tv_nsec,
- data->end.tv_sec, data->end.tv_nsec);
- */
- wprintw(header, "[%lu, %lu[",
- data->start,
- data->end);
+
+ wprintw(header, "[%02d:%02d:%02d.%09" PRIu64 ", %02d:%02d:%02d.%09" PRIu64 "[",
+ start.tm_hour, start.tm_min, start.tm_sec, ts_nsec_start,
+ end.tm_hour, end.tm_min, end.tm_sec, ts_nsec_end);
mvwprintw(header, 1, 4, "CPUs");
wattroff(header, A_BOLD);
wprintw(header, "\t%d\t(max/cpu : %0.2f%)", data->cpu_table->len,
100.0/data->cpu_table->len);
mvwprintw(header, 1, 4, "CPUs");
wattroff(header, A_BOLD);
wprintw(header, "\t%d\t(max/cpu : %0.2f%)", data->cpu_table->len,
100.0/data->cpu_table->len);
- print_headers(2, "Processes", data->nbproc, data->nbnewproc,
- -1*(data->nbdeadproc));
- print_headers(3, "Threads", data->nbthreads, data->nbnewthreads,
+ print_headers(2, "Threads", data->nbthreads, data->nbnewthreads,
-1*(data->nbdeadthreads));
-1*(data->nbdeadthreads));
- print_headers(
4, "File
s", data->nbfiles, data->nbnewfiles,
+ print_headers(
3, "FD
s", data->nbfiles, data->nbnewfiles,
-1*(data->nbclosedfiles));
-1*(data->nbclosedfiles));
- mvwprintw(header, 4, 43, "N/A kbytes/sec");
- print_headers(5, "Network", 114, 0, 0);
- mvwprintw(header, 5, 43, "N/A Mbytes/sec");
+ mvwprintw(header, 3, 43, "N/A kbytes/sec");
wrefresh(header);
}
wrefresh(header);
}
@@
-344,7
+358,7
@@
void update_cputop_display()
mvwprintw(center, 1, 32, "NAME");
wattroff(center, A_BOLD);
mvwprintw(center, 1, 32, "NAME");
wattroff(center, A_BOLD);
- max_center_lines = LINES -
7
- 7 - 1 - header_offset;
+ max_center_lines = LINES -
5
- 7 - 1 - header_offset;
/* iterate the process (thread) list */
for (i = list_offset; i < data->process_table->len &&
/* iterate the process (thread) list */
for (i = list_offset; i < data->process_table->len &&
@@
-452,13
+466,20
@@
void update_process_details()
print_key_title("WRITE B/s", 7);
wprintw(center, "%d", tmp->filewrite);
print_key_title("WRITE B/s", 7);
wprintw(center, "%d", tmp->filewrite);
+ wattron(center, A_BOLD);
+ mvwprintw(center, 8, 1, "FD");
+ mvwprintw(center, 8, 12, "READ");
+ mvwprintw(center, 8, 22, "WRITE");
+ mvwprintw(center, 8, 32, "FILENAME");
+ wattroff(center, A_BOLD);
+
for (i = 0; i < tmp->process_files_table->len; i++) {
file_tmp = get_file(tmp, i);
if (file_tmp != NULL) {
for (i = 0; i < tmp->process_files_table->len; i++) {
file_tmp = get_file(tmp, i);
if (file_tmp != NULL) {
-
print_key_title("file", 8+j
);
-
wprintw(center, "%s fd = %d", file_tmp->name, i
);
-
wprintw(center, " read = %d", file_tmp->read
);
-
wprintw(center, " write = %d", file_tmp->writ
e);
+
mvwprintw(center, 9 + j, 1, "%d", i
);
+
mvwprintw(center, 9 + j, 12, "%d", file_tmp->read
);
+
mvwprintw(center, 9 + j, 22, "%d", file_tmp->write
);
+
mvwprintw(center, 9 + j, 32, "%s", file_tmp->nam
e);
j++;
}
}
j++;
}
}
@@
-502,12
+523,14
@@
void update_perf()
g_ptr_array_sort_with_data(data->process_table, sort_perf, perf_key);
g_ptr_array_sort_with_data(data->process_table, sort_perf, perf_key);
- for (i = 0; i < data->process_table->len &&
+ for (i = 0; i < data->process_table->len &&
nblinedisplayed < max_center_lines; i++) {
tmp = g_ptr_array_index(data->process_table, i);
if (current_line == selected_line) {
selected_process = tmp;
nblinedisplayed < max_center_lines; i++) {
tmp = g_ptr_array_index(data->process_table, i);
if (current_line == selected_line) {
selected_process = tmp;
+ selected_tid = tmp->tid;
+ selected_comm = tmp->comm;
wattron(center, COLOR_PAIR(5));
mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
}
wattron(center, COLOR_PAIR(5));
mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
}
@@
-719,7
+742,7
@@
void update_perf_panel(int line_selected, int toggle_view, int toggle_sort)
wattron(perf_panel_window, A_BOLD);
mvwprintw(perf_panel_window, i + 1, 1, "[%c] %s",
perf->visible == 1 ? 'x' : ' ',
wattron(perf_panel_window, A_BOLD);
mvwprintw(perf_panel_window, i + 1, 1, "[%c] %s",
perf->visible == 1 ? 'x' : ' ',
- (char *) perflist->data +
6
);
+ (char *) perflist->data +
5
);
wattroff(perf_panel_window, A_BOLD);
wattroff(perf_panel_window, COLOR_PAIR(5));
i++;
wattroff(perf_panel_window, A_BOLD);
wattroff(perf_panel_window, COLOR_PAIR(5));
i++;
@@
-798,20
+821,6
@@
void *handle_keyboard(void *p)
}
break;
case KEY_NPAGE:
}
break;
case KEY_NPAGE:
- if ((selected_line + 10 < max_center_lines - 1) &&
- ((selected_line + 10) < max_elements - 1)) {
- selected_line += 10;
- selected_in_list += 10;
- } else if (max_elements > max_center_lines) {
- selected_line = max_center_lines - 1;
- if (selected_in_list + 10 < max_elements - 1) {
- selected_in_list += 10;
- list_offset += (selected_in_list - max_center_lines + 1);
- }
- } else if (selected_line + 10 > max_elements) {
- selected_line = max_elements - 1;
- }
- update_current_view();
break;
case KEY_UP:
if (perf_panel_visible) {
break;
case KEY_UP:
if (perf_panel_visible) {
@@
-830,11
+839,6
@@
void *handle_keyboard(void *p)
}
break;
case KEY_PPAGE:
}
break;
case KEY_PPAGE:
- if (selected_line - 10 > 0)
- selected_line -= 10;
- else
- selected_line = 0;
- update_current_view();
break;
/* Navigate the history with arrows */
break;
/* Navigate the history with arrows */
@@
-882,29
+886,34
@@
void *handle_keyboard(void *p)
break;
case 13: /* FIXME : KEY_ENTER ?? */
break;
case 13: /* FIXME : KEY_ENTER ?? */
- if (current_view == cpu) {
+ if (current_view != process_details) {
+ previous_view = current_view;
current_view = process_details;
current_view = process_details;
+ } else {
+ current_view = previous_view;
+ previous_view = process_details;
}
update_current_view();
break;
case KEY_F(1):
}
update_current_view();
break;
case KEY_F(1):
- toggle_tree *= -1;
current_view = cpu;
current_view = cpu;
+ selected_line = 0;
update_current_view();
break;
case KEY_F(2):
current_view = cpu;
update_current_view();
break;
case KEY_F(2):
current_view = cpu;
+ selected_line = 0;
update_current_view();
break;
case KEY_F(3):
current_view = perf;
update_current_view();
break;
case KEY_F(3):
current_view = perf;
-
toggle_tree = -1
;
+
selected_line = 0
;
update_current_view();
break;
case KEY_F(4):
current_view = iostream;
update_current_view();
break;
case KEY_F(4):
current_view = iostream;
-
toggle_tree = -1
;
+
selected_line = 0
;
update_current_view();
break;
case KEY_F(10):
update_current_view();
break;
case KEY_F(10):
@@
-940,8
+949,8
@@
void init_ncurses()
sem_init(&update_display_sem, 0, 1);
init_screen();
sem_init(&update_display_sem, 0, 1);
init_screen();
- header = create_window(
7
, COLS - 1, 0, 0);
- center = create_window(LINES -
7 - 7, COLS - 1, 7
, 0);
+ header = create_window(
5
, COLS - 1, 0, 0);
+ center = create_window(LINES -
5 - 7, COLS - 1, 5
, 0);
status = create_window(MAX_LOG_LINES + 2, COLS - 1, LINES - 7, 0);
footer = create_window(1, COLS - 1, LINES - 1, 0);
status = create_window(MAX_LOG_LINES + 2, COLS - 1, LINES - 7, 0);
footer = create_window(1, COLS - 1, LINES - 1, 0);
This page took
0.026712 seconds
and
4
git commands to generate.