pingpong finished

Makefile

@@ -86,7 +86,7 @@ LD = $(TOOLPREFIX)ld
 OBJCOPY = $(TOOLPREFIX)objcopy
 OBJDUMP = $(TOOLPREFIX)objdump
 
-CFLAGS = -Wall -Werror -O -fno-omit-frame-pointer -ggdb -gdwarf-2
+CFLAGS = -Wall -Werror -O2 -fno-omit-frame-pointer -ggdb -gdwarf-2
 
 ifdef LAB
 LABUPPER = $(shell echo $(LAB) | tr a-z A-Z)
@@ -189,6 +189,7 @@ UPROGS=\
 	$U/_wc\
 	$U/_zombie\
 	$U/_sleep\
+	$U/_pingpong\
 
 
 

kernel/defs.h

@@ -11,11 +11,11 @@ struct superblock;
 
 // bio.c
 void binit(void);
-struct buf*     bread(uint, uint);
+struct buf *bread(uint, uint);
-void            brelse(struct buf*);
+void brelse(struct buf *);
-void            bwrite(struct buf*);
+void bwrite(struct buf *);
-void            bpin(struct buf*);
+void bpin(struct buf *);
-void            bunpin(struct buf*);
+void bunpin(struct buf *);
 
 // console.c
 void consoleinit(void);
@@ -23,62 +23,62 @@ void            consoleintr(int);
 void consputc(int);
 
 // exec.c
-int             exec(char*, char**);
+int exec(char *, char **);
 
 // file.c
-struct file*    filealloc(void);
+struct file *filealloc(void);
-void            fileclose(struct file*);
+void fileclose(struct file *);
-struct file*    filedup(struct file*);
+struct file *filedup(struct file *);
 void fileinit(void);
-int             fileread(struct file*, uint64, int n);
+int fileread(struct file *, uint64, int n);
-int             filestat(struct file*, uint64 addr);
+int filestat(struct file *, uint64 addr);
-int             filewrite(struct file*, uint64, int n);
+int filewrite(struct file *, uint64, int n);
 
 // fs.c
 void fsinit(int);
-int             dirlink(struct inode*, char*, uint);
+int dirlink(struct inode *, char *, uint);
-struct inode*   dirlookup(struct inode*, char*, uint*);
+struct inode *dirlookup(struct inode *, char *, uint *);
-struct inode*   ialloc(uint, short);
+struct inode *ialloc(uint, short);
-struct inode*   idup(struct inode*);
+struct inode *idup(struct inode *);
 void iinit();
-void            ilock(struct inode*);
+void ilock(struct inode *);
-void            iput(struct inode*);
+void iput(struct inode *);
-void            iunlock(struct inode*);
+void iunlock(struct inode *);
-void            iunlockput(struct inode*);
+void iunlockput(struct inode *);
-void            iupdate(struct inode*);
+void iupdate(struct inode *);
-int             namecmp(const char*, const char*);
+int namecmp(const char *, const char *);
-struct inode*   namei(char*);
+struct inode *namei(char *);
-struct inode*   nameiparent(char*, char*);
+struct inode *nameiparent(char *, char *);
-int             readi(struct inode*, int, uint64, uint, uint);
+int readi(struct inode *, int, uint64, uint, uint);
-void            stati(struct inode*, struct stat*);
+void stati(struct inode *, struct stat *);
-int             writei(struct inode*, int, uint64, uint, uint);
+int writei(struct inode *, int, uint64, uint, uint);
-void            itrunc(struct inode*);
+void itrunc(struct inode *);
 
 // ramdisk.c
 void ramdiskinit(void);
 void ramdiskintr(void);
-void            ramdiskrw(struct buf*);
+void ramdiskrw(struct buf *);
 
 // kalloc.c
-void*           kalloc(void);
+void *kalloc(void);
 void kfree(void *);
 void kinit(void);
 
 // log.c
-void            initlog(int, struct superblock*);
+void initlog(int, struct superblock *);
-void            log_write(struct buf*);
+void log_write(struct buf *);
 void begin_op(void);
 void end_op(void);
 
 // pipe.c
-int             pipealloc(struct file**, struct file**);
+int pipealloc(struct file **, struct file **);
-void            pipeclose(struct pipe*, int);
+void pipeclose(struct pipe *, int);
-int             piperead(struct pipe*, uint64, int);
+int piperead(struct pipe *, uint64, int);
-int             pipewrite(struct pipe*, uint64, int);
+int pipewrite(struct pipe *, uint64, int);
 
 // printf.c
-void            printf(char*, ...);
+void printf(char *, ...);
-void            panic(char*) __attribute__((noreturn));
+void panic(char *) __attribute__((noreturn));
 void printfinit(void);
 
 // proc.c
@@ -90,55 +90,55 @@ void            proc_mapstacks(pagetable_t);
 pagetable_t proc_pagetable(struct proc *);
 void proc_freepagetable(pagetable_t, uint64);
 int kill(int);
-int             killed(struct proc*);
+int killed(struct proc *);
-void            setkilled(struct proc*);
+void setkilled(struct proc *);
-struct cpu*     mycpu(void);
+struct cpu *mycpu(void);
-struct cpu*     getmycpu(void);
+struct cpu *getmycpu(void);
-struct proc*    myproc();
+struct proc *myproc();
 void procinit(void);
 void scheduler(void) __attribute__((noreturn));
 void sched(void);
-void            sleep(void*, struct spinlock*);
+void sleep(void *, struct spinlock *);
 void userinit(void);
 int wait(uint64);
-void            wakeup(void*);
+void wakeup(void *);
 void yield(void);
 int either_copyout(int user_dst, uint64 dst, void *src, uint64 len);
 int either_copyin(void *dst, int user_src, uint64 src, uint64 len);
 void procdump(void);
 
 // swtch.S
-void            swtch(struct context*, struct context*);
+void swtch(struct context *, struct context *);
 
 // spinlock.c
-void            acquire(struct spinlock*);
+void acquire(struct spinlock *);
-int             holding(struct spinlock*);
+int holding(struct spinlock *);
-void            initlock(struct spinlock*, char*);
+void initlock(struct spinlock *, char *);
-void            release(struct spinlock*);
+void release(struct spinlock *);
 void push_off(void);
 void pop_off(void);
 
 // sleeplock.c
-void            acquiresleep(struct sleeplock*);
+void acquiresleep(struct sleeplock *);
-void            releasesleep(struct sleeplock*);
+void releasesleep(struct sleeplock *);
-int             holdingsleep(struct sleeplock*);
+int holdingsleep(struct sleeplock *);
-void            initsleeplock(struct sleeplock*, char*);
+void initsleeplock(struct sleeplock *, char *);
 
 // string.c
-int             memcmp(const void*, const void*, uint);
+int memcmp(const void *, const void *, uint);
-void*           memmove(void*, const void*, uint);
+void *memmove(void *, const void *, uint);
-void*           memset(void*, int, uint);
+void *memset(void *, int, uint);
-char*           safestrcpy(char*, const char*, int);
+char *safestrcpy(char *, const char *, int);
-int             strlen(const char*);
+int strlen(const char *);
-int             strncmp(const char*, const char*, uint);
+int strncmp(const char *, const char *, uint);
-char*           strncpy(char*, const char*, int);
+char *strncpy(char *, const char *, int);
 
 // syscall.c
-void            argint(int, int*);
+void argint(int, int *);
-int             argstr(int, char*, int);
+int argstr(int, char *, int);
 void argaddr(int, uint64 *);
-int             fetchstr(uint64, char*, int);
+int fetchstr(uint64, char *, int);
-int             fetchaddr(uint64, uint64*);
+int fetchaddr(uint64, uint64 *);
 void syscall();
 
 // trap.c
@@ -168,7 +168,7 @@ int             uvmcopy(pagetable_t, pagetable_t, uint64);
 void uvmfree(pagetable_t, uint64);
 void uvmunmap(pagetable_t, uint64, uint64, int);
 void uvmclear(pagetable_t, uint64);
-pte_t *         walk(pagetable_t, uint64, int);
+pte_t *walk(pagetable_t, uint64, int);
 uint64 walkaddr(pagetable_t, uint64);
 int copyout(pagetable_t, uint64, char *, uint64);
 int copyin(pagetable_t, char *, uint64, uint64);
@@ -186,4 +186,4 @@ void            virtio_disk_rw(struct buf *, int);
 void virtio_disk_intr(void);
 
 // number of elements in fixed-size array
-#define NELEM(x) (sizeof(x)/sizeof((x)[0]))
+#define NELEM(x) (sizeof(x) / sizeof((x)[0]))

user/pingpong.c

@@ -0,0 +1,21 @@
+#include "kernel/types.h"
+#include "user/user.h"
+
+int main(int argc, char *argv[]) {
+  int proc_f2s[2], proc_s2f[2];
+  char buffer[8];
+  pipe(proc_f2s);
+  pipe(proc_s2f);
+
+  if (fork() == 0) {
+    read(proc_s2f[0], buffer, 4);
+    printf("%d: received %s\n", getpid(), buffer);
+    write(proc_f2s[1], "pong", strlen("pong"));
+  } else {
+    write(proc_s2f[1], "ping", strlen("ping"));
+    read(proc_f2s[0], buffer, 4);
+    printf("%d: received %s\n", getpid(), buffer);
+  }
+
+  exit(0);
+}

user/ulib.c

@@ -1,134 +1,112 @@
-#include "kernel/types.h"
-#include "kernel/stat.h"
 #include "kernel/fcntl.h"
+#include "kernel/stat.h"
+#include "kernel/types.h"
 #include "user/user.h"
 
 //
 // wrapper so that it's OK if main() does not call exit().
 //
-void
+void _main() {
-_main()
-{
   extern int main();
   main();
   exit(0);
 }
 
-char*
+char *strcpy(char *s, const char *t) {
-strcpy(char *s, const char *t)
-{
   char *os;
 
   os = s;
-  while((*s++ = *t++) != 0)
+  while ((*s++ = *t++) != 0)
     ;
   return os;
 }
 
-int
+int strcmp(const char *p, const char *q) {
-strcmp(const char *p, const char *q)
+  while (*p && *p == *q)
-{
-  while(*p && *p == *q)
     p++, q++;
   return (uchar)*p - (uchar)*q;
 }
 
-uint
+uint strlen(const char *s) {
-strlen(const char *s)
-{
   int n;
 
-  for(n = 0; s[n]; n++)
+  for (n = 0; s[n]; n++)
     ;
   return n;
 }
 
-void*
+void *memset(void *dst, int c, uint n) {
-memset(void *dst, int c, uint n)
+  char *cdst = (char *)dst;
-{
-  char *cdst = (char *) dst;
   int i;
-  for(i = 0; i < n; i++){
+  for (i = 0; i < n; i++) {
     cdst[i] = c;
   }
   return dst;
 }
 
-char*
+char *strchr(const char *s, char c) {
-strchr(const char *s, char c)
+  for (; *s; s++)
-{
+    if (*s == c)
-  for(; *s; s++)
+      return (char *)s;
-    if(*s == c)
-      return (char*)s;
   return 0;
 }
 
-char*
+char *gets(char *buf, int max) {
-gets(char *buf, int max)
-{
   int i, cc;
   char c;
 
-  for(i=0; i+1 < max; ){
+  for (i = 0; i + 1 < max;) {
     cc = read(0, &c, 1);
-    if(cc < 1)
+    if (cc < 1)
       break;
     buf[i++] = c;
-    if(c == '\n' || c == '\r')
+    if (c == '\n' || c == '\r')
       break;
   }
   buf[i] = '\0';
   return buf;
 }
 
-int
+int stat(const char *n, struct stat *st) {
-stat(const char *n, struct stat *st)
-{
   int fd;
   int r;
 
   fd = open(n, O_RDONLY);
-  if(fd < 0)
+  if (fd < 0)
     return -1;
   r = fstat(fd, st);
   close(fd);
   return r;
 }
 
-int
+int atoi(const char *s) {
-atoi(const char *s)
-{
   int n;
 
   n = 0;
-  while('0' <= *s && *s <= '9')
+  while ('0' <= *s && *s <= '9')
-    n = n*10 + *s++ - '0';
+    n = n * 10 + *s++ - '0';
   return n;
 }
 
-void*
+void *memmove(void *vdst, const void *vsrc, int n) {
-memmove(void *vdst, const void *vsrc, int n)
-{
   char *dst;
   const char *src;
 
   dst = vdst;
   src = vsrc;
   if (src > dst) {
-    while(n-- > 0)
+    while (n-- > 0)
       *dst++ = *src++;
   } else {
     dst += n;
     src += n;
-    while(n-- > 0)
+    while (n-- > 0)
       *--dst = *--src;
   }
   return vdst;
 }
 
-int
+int memcmp(const void *s1, const void *s2, uint n) {
-memcmp(const void *s1, const void *s2, uint n)
-{
   const char *p1 = s1, *p2 = s2;
   while (n-- > 0) {
     if (*p1 != *p2) {
@@ -140,8 +118,6 @@ memcmp(const void *s1, const void *s2, uint n)
   return 0;
 }
 
-void *
+void *memcpy(void *dst, const void *src, uint n) {
-memcpy(void *dst, const void *src, uint n)
-{
   return memmove(dst, src, n);
 }

user/user.h

@@ -1,41 +1,42 @@
+#include "kernel/types.h"
 struct stat;
 
 // system calls
 int fork(void);
 int exit(int) __attribute__((noreturn));
-int wait(int*);
+int wait(int *);
-int pipe(int*);
+int pipe(int *);
-int write(int, const void*, int);
+int write(int, const void *, int);
-int read(int, void*, int);
+int read(int, void *, int);
 int close(int);
 int kill(int);
-int exec(const char*, char**);
+int exec(const char *, char **);
-int open(const char*, int);
+int open(const char *, int);
-int mknod(const char*, short, short);
+int mknod(const char *, short, short);
-int unlink(const char*);
+int unlink(const char *);
-int fstat(int fd, struct stat*);
+int fstat(int fd, struct stat *);
-int link(const char*, const char*);
+int link(const char *, const char *);
-int mkdir(const char*);
+int mkdir(const char *);
-int chdir(const char*);
+int chdir(const char *);
 int dup(int);
 int getpid(void);
-char* sbrk(int);
+char *sbrk(int);
 int sleep(int);
 int uptime(void);
 
 // ulib.c
-int stat(const char*, struct stat*);
+int stat(const char *, struct stat *);
-char* strcpy(char*, const char*);
+char *strcpy(char *, const char *);
-void *memmove(void*, const void*, int);
+void *memmove(void *, const void *, int);
-char* strchr(const char*, char c);
+char *strchr(const char *, char c);
-int strcmp(const char*, const char*);
+int strcmp(const char *, const char *);
-void fprintf(int, const char*, ...);
+void fprintf(int, const char *, ...);
-void printf(const char*, ...);
+void printf(const char *, ...);
-char* gets(char*, int max);
+char *gets(char *, int max);
-uint strlen(const char*);
+uint strlen(const char *);
-void* memset(void*, int, uint);
+void *memset(void *, int, uint);
-void* malloc(uint);
+void *malloc(uint);
-void free(void*);
+void free(void *);
-int atoi(const char*);
+int atoi(const char *);
 int memcmp(const void *, const void *, uint);
 void *memcpy(void *, const void *, uint);