* 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>
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(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, "Files");
+ mvwprintw(header, 4, 4, "Network");
wattroff(header, A_BOLD);
wrefresh(header);
}
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, "Files", 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");
+ print_headers(4, "Network", 0, 0, 0);
+ mvwprintw(header, 4, 43, "N/A Mbytes/sec");
wrefresh(header);
}
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) {
}
}
-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;
case process_details:
update_process_details();
break;
- case fileio:
- update_fileio();
- break;
case iostream:
update_iostream();
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();
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(6, COLS - 1, 0, 0);
+ center = create_window(LINES - 7 - 7, COLS - 1, 6, 0);
status = create_window(MAX_LOG_LINES + 2, COLS - 1, LINES - 7, 0);
footer = create_window(1, COLS - 1, LINES - 1, 0);