diff options
| -rw-r--r-- | console.c | 10 | ||||
| -rw-r--r-- | defs.h | 4 | ||||
| -rw-r--r-- | fd.c | 4 | ||||
| -rw-r--r-- | kalloc.c | 2 | ||||
| -rw-r--r-- | lapic.c | 4 | ||||
| -rw-r--r-- | mp.c | 4 | ||||
| -rw-r--r-- | proc.c | 2 | ||||
| -rw-r--r-- | trap.c | 8 | ||||
| -rw-r--r-- | user1.c | 2 | ||||
| -rw-r--r-- | userfs.c | 2 | ||||
| -rw-r--r-- | usertests.c | 19 |
11 files changed, 29 insertions, 32 deletions
@@ -4,7 +4,7 @@ #include "spinlock.h" struct spinlock console_lock; -int paniced = 0; +int panicked = 0; int use_console_lock = 0; /* @@ -31,9 +31,9 @@ real_cons_putc(int c) unsigned short *crt = (unsigned short *) 0xB8000; // base of CGA memory int ind; - if(paniced){ + if(panicked){ cli(); - while(1) + for(;;) ; } @@ -161,7 +161,7 @@ panic(char *s) cprintf("panic: "); cprintf(s, 0); cprintf("\n", 0); - paniced = 1; // freeze other CPU - while(1) + panicked = 1; // freeze other CPU + for(;;) ; } @@ -79,8 +79,8 @@ int pipe_write(struct pipe *p, char *addr, int n); int pipe_read(struct pipe *p, char *addr, int n); // fd.c -int fd_ualloc(); -struct fd * fd_alloc(); +int fd_ualloc(void); +struct fd * fd_alloc(void); void fd_close(struct fd *); int fd_read(struct fd *fd, char *addr, int n); int fd_write(struct fd *fd, char *addr, int n); @@ -15,7 +15,7 @@ struct fd fds[NFD]; * allocate a file descriptor number for curproc. */ int -fd_ualloc() +fd_ualloc(void) { int fd; struct proc *p = curproc[cpu()]; @@ -29,7 +29,7 @@ fd_ualloc() * allocate a file descriptor structure */ struct fd * -fd_alloc() +fd_alloc(void) { int i; @@ -23,7 +23,7 @@ struct run { }; struct run *freelist; -void ktest(); +void ktest(void); /* * initialize free list of physical pages. this code @@ -108,7 +108,7 @@ lapic_write(int r, int data) void -lapic_timerinit() +lapic_timerinit(void) { cprintf("%d: init timer\n", cpu()); lapic_write(LAPIC_TDCR, LAPIC_X1); @@ -118,7 +118,7 @@ lapic_timerinit() } void -lapic_timerintr() +lapic_timerintr(void) { cprintf("%d: timer interrupt!\n", cpu()); lapic_write (LAPIC_EOI, 0); @@ -117,7 +117,7 @@ mp_detect(void) } void -mp_init() +mp_init(void) { int r; uint8_t *p, *e; @@ -193,7 +193,7 @@ mp_bcpu(void) extern void mpmain(void); void -mp_startthem() +mp_startthem(void) { extern uint8_t _binary_bootother_start[], _binary_bootother_size[]; extern int main(); @@ -311,7 +311,7 @@ proc_kill(int pid) // Exited processes remain in the zombie state // until their parent calls wait() to find out they exited. void -proc_exit() +proc_exit(void) { struct proc *p; struct proc *cp = curproc[cpu()]; @@ -10,11 +10,11 @@ struct Gatedesc idt[256]; extern unsigned vectors[]; /* vectors.S, array of 256 entry point addresses */ -extern void trapenter(); -extern void trapenter1(); +extern void trapenter(void); +extern void trapenter1(void); void -tvinit() +tvinit(void) { int i; @@ -25,7 +25,7 @@ tvinit() } void -idtinit() +idtinit(void) { lidt(idt, sizeof idt); } @@ -3,7 +3,7 @@ char buf[32]; int -main() +main(void) { int pid, fds[2], n; @@ -5,7 +5,7 @@ char buf[1024]; int -main() +main(void) { puts("userfs running\n"); block(); diff --git a/usertests.c b/usertests.c index 78b9477..370054b 100644 --- a/usertests.c +++ b/usertests.c @@ -5,7 +5,7 @@ char buf[2048]; // simple fork and pipe read/write void -pipe1() +pipe1(void) { int fds[2], pid; int seq = 0, i, n, cc, total; @@ -27,10 +27,7 @@ pipe1() close(fds[1]); total = 0; cc = 1; - while(1){ - n = read(fds[0], buf, cc); - if(n < 1) - break; + while((n = read(fds[0], buf, cc)) > 0){ for(i = 0; i < n; i++){ if((buf[i] & 0xff) != (seq++ & 0xff)){ panic("pipe1 oops 2\n"); @@ -52,19 +49,19 @@ pipe1() // meant to be run w/ at most two CPUs void -preempt() +preempt(void) { int pid1, pid2, pid3; int pfds[2]; pid1 = fork(); if(pid1 == 0) - while(1) + for(;;) ; pid2 = fork(); if(pid2 == 0) - while(1) + for(;;) ; pipe(pfds); @@ -74,7 +71,7 @@ preempt() if(write(pfds[1], "x", 1) != 1) panic("preempt write error"); close(pfds[1]); - while(1) + for(;;) ; } @@ -95,7 +92,7 @@ preempt() // try to find any races between exit and wait void -exitwait() +exitwait(void) { int i, pid; @@ -118,7 +115,7 @@ exitwait() } int -main() +main(void) { puts("usertests starting\n"); |