sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

. have a user interface - q works! (use curses)

Browse source 
also pressing anything else updates the display
 . interval is settable, default changed to 2sec
 . window size changes are detected and display is
   updated
This commit is contained in:
Ben Gras 2006-03-28 23:42:55 +00:00
parent ea4038ac50
commit dd19ec55ea
2 changed files with 64 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/simple/Makefile
View file

@ -810,7 +810,7 @@ touch: touch.c
@install -S 4kw $@ @install -S 4kw $@
top: top.c top: top.c
$(CCLD) -o $@ $? $(CCLD) -o $@ $? -lcurses
tr: tr.c tr: tr.c
$(CCLD) -o $@ $? $(CCLD) -o $@ $?

69
commands/simple/top.c
View file

@ -6,6 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <pwd.h> #include <pwd.h>
#include <curses.h>
#include <timers.h> #include <timers.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -15,10 +16,14 @@
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/ioc_tty.h> #include <sys/ioc_tty.h>
#include <sys/times.h> #include <sys/times.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h>
#include <sys/select.h>
#include <minix/ipc.h> #include <minix/ipc.h>
#include <minix/config.h> #include <minix/config.h>
@ -29,10 +34,11 @@
#include "../../kernel/const.h" #include "../../kernel/const.h"
#include "../../kernel/proc.h" #include "../../kernel/proc.h"
char *Tclr_all;
#define TC_BUFFER 1024 /* Size of termcap(3) buffer */ #define TC_BUFFER 1024 /* Size of termcap(3) buffer */
#define TC_STRINGS 200 /* Enough room for cm,cl,so,se */ #define TC_STRINGS 200 /* Enough room for cm,cl,so,se */
char *Tclr_all;
int print_memory(struct pm_mem_info *pmi) int print_memory(struct pm_mem_info *pmi)
{ {
int h; int h;
@ -230,7 +236,6 @@ void showtop(int r)
} }
printf("%s", Tclr_all); printf("%s", Tclr_all);
lines += print_load(loads, NLOADS); lines += print_load(loads, NLOADS);
@ -270,16 +275,68 @@ void init(int *rows)
if((v = tgetstr ("li", &s)) != NULL) if((v = tgetstr ("li", &s)) != NULL)
sscanf(v, "%d", rows); sscanf(v, "%d", rows);
if(*rows < 1) *rows = 24; if(*rows < 1) *rows = 24;
if(!initscr()) {
fprintf(stderr, "initscr() failed\n");
exit(1);
}
cbreak();
nl();
} }
void sigwinch(int sig) { }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int r; int r, c, s = 0, orig;
init(&r); init(&r);
while(1) { while((c=getopt(argc, argv, "s:")) != EOF) {
showtop(r); switch(c) {
sleep(5); case 's':
s = atoi(optarg);
break;
default:
fprintf(stderr,
"Usage: %s [-s<secdelay>]\n", argv[0]);
return 1;
}
} }
if(s < 1)
s = 2;
/* Catch window size changes so display is updated properly right away. */
signal(SIGWINCH, sigwinch);
while(1) {
fd_set fds;
int ns;
struct timeval tv;
showtop(r);
tv.tv_sec = s;
tv.tv_usec = 0;
FD_ZERO(&fds);
FD_SET(STDIN_FILENO, &fds);
if((ns=select(STDIN_FILENO+1, &fds, NULL, NULL, &tv)) < 0
&& errno != EINTR) {
perror("select");
sleep(1);
}
if(ns > 0 && FD_ISSET(STDIN_FILENO, &fds)) {
char c;
if(read(STDIN_FILENO, &c, 1) == 1) {
switch(c) {
case 'q':
return 0;
break;
}
}
}
}
return 0;
} }