* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdio.h>
#include "cursesdisplay.h"
#include "lttngtoptypes.h"
+#include "iostreamtop.h"
#include "common.h"
#define DEFAULT_DELAY 15
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(status, ++current_line, 1);
current_char = 1;
} else {
- mvwprintw(status, current_line, current_char++, "%c", log_lines[i]);
+ mvwprintw(status, current_line, current_char++, "%c",
+ log_lines[i]);
}
}
wrefresh(status);
wmove(footer, 1, 1);
print_key(footer, "F2", "CPUtop ", current_view == cpu);
print_key(footer, "F3", "PerfTop ", current_view == perf);
- print_key(footer, "F6", "IOTop ", current_view == iostream);
+ print_key(footer, "F4", "IOTop ", current_view == iostream);
print_key(footer, "Enter", "Details ", current_view == process_details);
print_key(footer, "q", "Quit | ", 0);
print_key(footer, "P", "Perf Pref ", 0);
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);
}
+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()
{
+ 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);
- /*
- 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);
- 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));
- print_headers(4, "Files", data->nbfiles, data->nbnewfiles,
+ print_headers(3, "FDs", data->nbfiles, data->nbnewfiles,
-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);
}
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 &&
unsigned long elapsed;
double maxcputime;
struct processtop *tmp = find_process_tid(data, selected_tid, selected_comm);
+ struct files *file_tmp;
+ int i, j = 0;
set_window_title(center, "Process details");
wprintw(center, "%d", tmp->ppid);
print_key_title("CPU", 5);
wprintw(center, "%1.2f %%", tmp->totalcpunsec/maxcputime);
+
+ print_key_title("READ B/s", 6);
+ wprintw(center, "%d", tmp->fileread);
+
+ 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) {
+ 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->name);
+ j++;
+ }
+ }
}
void update_perf()
{
- int i, j;
+ int i;
int nblinedisplayed = 0;
int current_line = 0;
struct processtop *tmp;
g_hash_table_iter_init(&iter, data->perf_list);
while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {
if (perfn1->visible) {
- /* + 6 to strip the "_perf_" prefix */
+ /* + 5 to strip the "perf_" prefix */
mvwprintw(center, 1, perf_row, "%s",
- (char *) key + 6);
+ (char *) key + 5);
perf_row += 20;
}
if (perfn1->sort) {
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);
value = perfn2->count;
else
value = 0;
- mvwprintw(center, current_line + header_offset, perf_row, "%d", value);
+ mvwprintw(center, current_line + header_offset,
+ perf_row, "%d", value);
perf_row += 20;
}
}
}
}
-void update_fileio()
-{
- int i;
- int offset;
-
- set_window_title(center, "IO Top");
- wattron(center, A_BOLD);
- mvwprintw(center, 1, 10, "READ");
- mvwprintw(center, 2, 1, "bytes");
- mvwprintw(center, 2, 15, "bytes/sec");
-
- mvwprintw(center, 1, 39, "WRITE");
- mvwprintw(center, 2, 33, "bytes");
- mvwprintw(center, 2, 45, "bytes/sec");
-
- if (toggle_threads > 0) {
- mvwprintw(center, 1, 60, "TGID");
- mvwprintw(center, 1, 70, "PID");
- offset = 8;
- } else {
- mvwprintw(center, 1, 60, "PID(TGID)");
- offset = 0;
- }
- mvwprintw(center, 1, 72 + offset, "NAME");
- wattroff(center, A_BOLD);
-
- for (i = 3; i < LINES - 3 - 8 - 1; i++) {
- mvwprintw(center, i, 1, "%d", i*1000);
- mvwprintw(center, i, 15, "%dk", i);
- mvwprintw(center, i, 28, "| %d", i*2000);
- mvwprintw(center, i, 45, "%dk", i*2);
- if (toggle_threads > 0) {
- mvwprintw(center, i, 57, "| %d", i);
- mvwprintw(center, i, 70, "%d", i);
- } else {
- mvwprintw(center, i, 57, "| %d", i);
- }
- mvwprintw(center, i, 72 + offset, "process_%d", i);
- }
-}
-
gint sort_by_ret_desc(gconstpointer p1, gconstpointer p2)
{
struct processtop *n1 = *(struct processtop **)p1;
struct processtop *n2 = *(struct processtop **)p2;
- unsigned long totaln1 = n1->iostream->ret_total;
- unsigned long totaln2 = n2->iostream->ret_total;
+
+ unsigned long totaln1 = n1->totalfileread + n1->totalfilewrite;
+ unsigned long totaln2 = n2->totalfileread + n2->totalfilewrite;
if (totaln1 < totaln2)
return 1;
struct processtop *tmp;
int nblinedisplayed = 0;
int current_line = 0;
+ int total = 0;
set_window_title(center, "IO Top");
wattron(center, A_BOLD);
wattron(center, COLOR_PAIR(5));
mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
}
+
/* READ (bytes/sec) */
mvwprintw(center, current_line + header_offset, 1, "%lu",
- tmp->iostream->ret_read);
+ tmp->fileread);
/* WRITE (bytes/sec) */
mvwprintw(center, current_line + header_offset, 20, "%lu",
- tmp->iostream->ret_write);
+ tmp->filewrite);
/* TOTAL STREAM */
- if(tmp->iostream->ret_total >= 1000000)
+ total = tmp->totalfileread + tmp->totalfilewrite;
+
+ if (total >= 1000000)
mvwprintw(center, current_line + header_offset, 40, "%lu MB",
- tmp->iostream->ret_total/1000000);
- else if(tmp->iostream->ret_total >=1000)
+ total/1000000);
+ else if (total >= 1000)
mvwprintw(center, current_line + header_offset, 40, "%lu KB",
- tmp->iostream->ret_total/1000);
+ total/1000);
else
mvwprintw(center, current_line + header_offset, 40, "%lu B",
- tmp->iostream->ret_total);
+ total);
+
/* TGID */
mvwprintw(center, current_line + header_offset, 60, "%d", tmp->pid);
/* PID */
case process_details:
update_process_details();
break;
- case fileio:
- update_fileio();
- break;
case iostream:
update_iostream();
break;
box(perf_panel_window, 0 , 0);
set_window_title(perf_panel_window, "Perf Preferences ");
wattron(perf_panel_window, A_BOLD);
- mvwprintw(perf_panel_window, g_hash_table_size(data->perf_list) + 1, 1, " 's' to sort");
+ mvwprintw(perf_panel_window, g_hash_table_size(data->perf_list) + 1, 1,
+ " 's' to sort");
wattroff(perf_panel_window, A_BOLD);
if (toggle_sort == 1) {
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++;
break;
case 13: /* FIXME : KEY_ENTER ?? */
- if (current_view == cpu) {
+ if (current_view != process_details) {
+ previous_view = current_view;
current_view = process_details;
+ } else {
+ current_view = previous_view;
+ previous_view = process_details;
}
update_current_view();
break;
update_current_view();
break;
case KEY_F(4):
- current_view = fileio;
- toggle_tree = -1;
- update_current_view();
- break;
- case KEY_F(5):
- current_view = netio;
- toggle_tree = -1;
- update_current_view();
- break;
- case KEY_F(6):
current_view = iostream;
toggle_tree = -1;
update_current_view();
toggle_perf_panel();
break;
default:
- /*
- * commented because it makes the list refresh in different order
- * if we sort and there are equal values
- if (data)
- update_current_view();
- */
+ if (data)
+ update_current_view();
break;
}
update_footer();
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);
projects / lttngtop.git / blobdiff