sleep finished

Makefile

@@ -188,6 +188,7 @@ UPROGS=\
 	$U/_grind\
 	$U/_wc\
 	$U/_zombie\
+	$U/_sleep\
 
 
 

kernel/stat.h

@@ -1,6 +1,7 @@
-#define T_DIR     1   // Directory
+#define T_DIR 1    // Directory
-#define T_FILE    2   // File
+#define T_FILE 2   // File
-#define T_DEVICE  3   // Device
+#define T_DEVICE 3 // Device
+#include "types.h"
 
 struct stat {
   int dev;     // File system's disk device

user/printf.c

@@ -1,26 +1,20 @@
-#include "kernel/types.h"
 #include "kernel/stat.h"
+#include "kernel/types.h"
 #include "user/user.h"
 
 #include <stdarg.h>
 
 static char digits[] = "0123456789ABCDEF";
 
-static void
+static void putc(int fd, char c) { write(fd, &c, 1); }
-putc(int fd, char c)
-{
-  write(fd, &c, 1);
-}
 
-static void
+static void printint(int fd, int xx, int base, int sgn) {
-printint(int fd, int xx, int base, int sgn)
-{
   char buf[16];
   int i, neg;
   uint x;
 
   neg = 0;
-  if(sgn && xx < 0){
+  if (sgn && xx < 0) {
     neg = 1;
     x = -xx;
   } else {
@@ -28,18 +22,17 @@ printint(int fd, int xx, int base, int sgn)
   }
 
   i = 0;
-  do{
+  do {
     buf[i++] = digits[x % base];
-  }while((x /= base) != 0);
+  } while ((x /= base) != 0);
-  if(neg)
+  if (neg)
     buf[i++] = '-';
 
-  while(--i >= 0)
+  while (--i >= 0)
     putc(fd, buf[i]);
 }
 
-static void
+static void printptr(int fd, uint64 x) {
-printptr(int fd, uint64 x) {
   int i;
   putc(fd, '0');
   putc(fd, 'x');
@@ -48,41 +41,39 @@ printptr(int fd, uint64 x) {
 }
 
 // Print to the given fd. Only understands %d, %x, %p, %s.
-void
+void vprintf(int fd, const char *fmt, va_list ap) {
-vprintf(int fd, const char *fmt, va_list ap)
-{
   char *s;
   int c, i, state;
 
   state = 0;
-  for(i = 0; fmt[i]; i++){
+  for (i = 0; fmt[i]; i++) {
     c = fmt[i] & 0xff;
-    if(state == 0){
+    if (state == 0) {
-      if(c == '%'){
+      if (c == '%') {
         state = '%';
       } else {
         putc(fd, c);
       }
-    } else if(state == '%'){
+    } else if (state == '%') {
-      if(c == 'd'){
+      if (c == 'd') {
         printint(fd, va_arg(ap, int), 10, 1);
-      } else if(c == 'l') {
+      } else if (c == 'l') {
         printint(fd, va_arg(ap, uint64), 10, 0);
-      } else if(c == 'x') {
+      } else if (c == 'x') {
         printint(fd, va_arg(ap, int), 16, 0);
-      } else if(c == 'p') {
+      } else if (c == 'p') {
         printptr(fd, va_arg(ap, uint64));
-      } else if(c == 's'){
+      } else if (c == 's') {
-        s = va_arg(ap, char*);
+        s = va_arg(ap, char *);
-        if(s == 0)
+        if (s == 0)
           s = "(null)";
-        while(*s != 0){
+        while (*s != 0) {
           putc(fd, *s);
           s++;
         }
-      } else if(c == 'c'){
+      } else if (c == 'c') {
         putc(fd, va_arg(ap, uint));
-      } else if(c == '%'){
+      } else if (c == '%') {
         putc(fd, c);
       } else {
         // Unknown % sequence.  Print it to draw attention.
@@ -94,18 +85,14 @@ vprintf(int fd, const char *fmt, va_list ap)
   }
 }
 
-void
+void fprintf(int fd, const char *fmt, ...) {
-fprintf(int fd, const char *fmt, ...)
-{
   va_list ap;
 
   va_start(ap, fmt);
   vprintf(fd, fmt, ap);
 }
 
-void
+void printf(const char *fmt, ...) {
-printf(const char *fmt, ...)
-{
   va_list ap;
 
   va_start(ap, fmt);

user/sleep.c

@@ -0,0 +1,13 @@
+#include "kernel/types.h"
+#include "user/user.h"
+
+int main(int argc, char *argv[]) {
+  if (argc != 2) {
+    fprintf(2, "Usage: sleep <time>\n");
+    exit(1);
+  }
+  int time = atoi(argv[1]);
+  // printf("time: %d\n", time);
+  sleep(time);
+  exit(0);
+}