Merge pull request #96 from hangpark/develop

Release v2.0.1

.travis.yml

@@ -5,7 +5,7 @@ branches:
     - master
     - develop
 
-language: c
+language: bash 
 
 services:
   - docker
@@ -14,4 +14,7 @@ before_install:
   - docker pull hangpark/pintos-dev-env-kaist
 
 script:
-  - docker run -v $TRAVIS_BUILD_DIR:/pintos hangpark/pintos-dev-env-kaist /bin/bash -c "cd /pintos/src/$TARGET_DIRECTORY && make grade" > /dev/null && cat src/$TARGET_DIRECTORY/build/grade
+  - docker run -v $TRAVIS_BUILD_DIR:/pintos hangpark/pintos-dev-env-kaist /bin/bash -c "cd /pintos/src/$TARGET_DIRECTORY && make grade" > /dev/null
+
+after_success:
+  - cat src/$TARGET_DIRECTORY/build/grade

README.md

@@ -1,8 +1,8 @@
-# PintOS Project of CS330 in KAIST
+# Pintos Project of CS330 in KAIST
 
 [![Build Status](https://travis-ci.com/hangpark/pintos.svg?token=gQa4om5Q1o59ZGsZT1Tf&branch=develop)](https://travis-ci.com/hangpark/pintos)
 
-Repository for PintOS implementation project of CS330 in KAIST.
+Repository for Pintos implementation project of CS330 in KAIST.
 
 To contribute, read [CONTRIBUTING.md](CONTRIBUTING.md).
 
@@ -15,14 +15,17 @@ This OS is run in the specific environment below:
 - Bochs 2.2.6
 - QEMU 0.15.0
 
-You can use Bochs or QEMU for emulate PintOS.
+You can use Bochs or QEMU to emulate Pintos.
 
 ## Build
 
-Docker image for an environment satisfies above requirements is provided at [hangpark/pintos-dev-env-kaist](https://hub.docker.com/r/hangpark/pintos-dev-env-kaist/). Use below commands to build (or check, grade) the PintOS.
+Docker image for an environment satisfies above requirements is provided at [hangpark/pintos-dev-env-kaist](https://hub.docker.com/r/hangpark/pintos-dev-env-kaist/). Use below commands to build (or check, grade) the Pintos.
+
 ```bash
 $ git clone https://github.com/hangpark/pintos.git
 $ sudo docker pull hangpark/pintos-dev-env-kaist
-$ sudo docker run -t -d --name pintos -v pintos:/pintos hangpark/pintos-dev-env-kaist
+$ sudo docker run -t -d --name pintos -v <your-pintos-dir>:/pintos hangpark/pintos-dev-env-kaist
 $ sudo docker exec -i -t pintos bash -c "cd src/<dir> && make [check|grade]"
 ```
+
+Make sure that `<your-pintos-dir>` to be an absolute path.

src/userprog/syscall.c

@@ -11,8 +11,7 @@
 #include "threads/synch.h"
 #include "threads/thread.h"
 #include "threads/vaddr.h"
-
-#define pid_t int
+#include "userprog/process.h"
 
 /* A Lock for mutual exclusion between system calls. */
 static struct lock filesys_lock;