Merge pull request #23 from Blue-club/chwangmin

Chwangmin

.vscode/c_cpp_properties.json

@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++98",
+            "intelliSenseMode": "linux-gcc-x64",
+            "configurationProvider": "ms-vscode.makefile-tools"
+        }
+    ],
+    "version": 4
+}

devices/timer.c

@@ -93,8 +93,10 @@ timer_sleep (int64_t ticks) {
 	int64_t start = timer_ticks ();
 
 	ASSERT (intr_get_level () == INTR_ON);
-	while (timer_elapsed (start) < ticks)
-		thread_yield ();
+	//while (timer_elapsed (start) < ticks)
+	//	thread_yield ();
+	if(timer_elapsed(start) < ticks) // 타이머 틱 시작시간보다 ticks가 더 작다면 (당연히 작아야 하는 거 아님?)
+		thread_sleep(start + ticks); // start+ticks 만큼 재운다.
 }
 
 /* Suspends execution for approximately MS milliseconds. */
@@ -126,6 +128,17 @@ static void
 timer_interrupt (struct intr_frame *args UNUSED) {
 	ticks++;
 	thread_tick ();
+
+	int64_t awake_tick = get_next_tick_to_awake();
+
+	if (awake_tick <= ticks){ // ==으로 해보기
+		thread_awake(ticks);
+	}
+	/* sleep queue 에서 깨어날 thread가 있는지 확인
+		sleep queue 에서 가장 빨리 깨어날 쓰레드의 tick값 확인
+		있다면 sleep queue를 순회하며 쓰레드 깨움
+			구현하게 될 함수인 thread_awake() 함수 사용
+	*/
 }
 
 /* Returns true if LOOPS iterations waits for more than one timer
@@ -183,4 +196,4 @@ real_time_sleep (int64_t num, int32_t denom) {
 		ASSERT (denom % 1000 == 0);
 		busy_wait (loops_per_tick * num / 1000 * TIMER_FREQ / (denom / 1000));
 	}
-}
+}

include/threads/synch.h

@@ -7,6 +7,7 @@
 /* A counting semaphore. */
 struct semaphore {
 	unsigned value;             /* Current value. */
+	/* 여러 스레드 semaphore를 대기하고 있는 스레드들의 list인 FIFO로 구현 */
 	struct list waiters;        /* List of waiting threads. */
 };
 
@@ -38,6 +39,8 @@ void cond_wait (struct condition *, struct lock *);
 void cond_signal (struct condition *, struct lock *);
 void cond_broadcast (struct condition *, struct lock *);
 
+bool cmp_sem_priority(const struct list_elem *a, const struct list_elem *b, void *aux);
+
 /* Optimization barrier.
  *
  * The compiler will not reorder operations across an

include/threads/thread.h

@@ -91,9 +91,14 @@ struct thread {
 	enum thread_status status;          /* Thread state. */
 	char name[16];                      /* Name (for debugging purposes). */
 	int priority;                       /* Priority. */
-
+	int64_t wakeup_tick;				/* 해당 쓰레드가 깨어나야 할 tick을 저장할 필드 */
 	/* Shared between thread.c and synch.c. */
 	struct list_elem elem;              /* List element. */
+	/*priority donation 관련 항목 추가*/
+	int init_priority;					/* donation 이후 우선순위를 초기화하기 위해 초기값 저장 */
+	struct lock *wait_on_lock;			/* 해당 스레드가 대기 하고 있는 lock자료구조의 주소를 저장 */
+	struct list donations;				/* multiple donation 을 고려하기 위해 사용 */
+	struct list_elem donation_elem;		/* multiple donation 을 고려하기 위해 사용 */
 
 #ifdef USERPROG
 	/* Owned by userprog/process.c. */
@@ -143,4 +148,19 @@ int thread_get_load_avg (void);
 
 void do_iret (struct intr_frame *tf);
 
+void thread_sleep(int64_t);
+void thread_awake(int64_t);
+void update_next_tick_to_awake(int64_t);
+int64_t get_next_tick_to_awake(void);
+
+void test_max_priority(void);
+bool cmp_priority(const struct list_elem *a, const struct list_elem *b, void *aux UNUSED);
+
+void donate_priority(void);
+void remove_with_lock(struct lock *lock);
+void refresh_priority(void);
+
+bool
+thread_compare_donate_priority(const struct list_elem *x, const struct list_elem *y, void *aux UNUSED);
+
 #endif /* threads/thread.h */

threads/build/Makefile

@@ -0,0 +1,64 @@
+# -*- makefile -*-
+
+SRCDIR = ../..
+
+all: os.dsk
+
+include ../../Make.config
+include ../Make.vars
+include ../../tests/Make.tests
+
+# Compiler and assembler options.
+os.dsk: CPPFLAGS += -I$(SRCDIR)/lib/kernel
+
+# Core kernel.
+include ../../threads/targets.mk
+# User process code.
+include ../../userprog/targets.mk
+# Virtual memory code.
+include ../../vm/targets.mk
+# Filesystem code.
+include ../../filesys/targets.mk
+# Library code shared between kernel and user programs.
+include ../../lib/targets.mk
+# Kernel-specific library code.
+include ../../lib/kernel/targets.mk
+# Device driver code.
+include ../../devices/targets.mk
+
+SOURCES = $(foreach dir,$(KERNEL_SUBDIRS),$($(dir)_SRC))
+OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
+DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
+
+threads/kernel.lds.s: CPPFLAGS += -P
+threads/kernel.lds.s: threads/kernel.lds.S
+
+kernel.o: threads/kernel.lds.s $(OBJECTS)
+	$(LD) $(LDFLAGS) -T $< -o $@ $(OBJECTS)
+
+kernel.bin: kernel.o
+	$(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp
+	dd if=$@.tmp of=$@ bs=4096 conv=sync
+	rm $@.tmp
+
+threads/loader.o: threads/loader.S kernel.bin
+	$(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+
+loader.bin: threads/loader.o
+	$(LD) $(LDFLAGS) -N -e start -Ttext 0x7c00 --oformat binary -o $@ $<
+
+os.dsk: loader.bin kernel.bin
+	cat $^ > $@
+
+clean::
+	rm -f $(OBJECTS) $(DEPENDS)
+	rm -f threads/loader.o threads/kernel.lds.s threads/loader.d
+	rm -f kernel.o kernel.lds.s
+	rm -f kernel.bin loader.bin os.dsk
+	rm -f bochsout.txt bochsrc.txt
+	rm -f results grade
+
+Makefile: $(SRCDIR)/Makefile.build
+	cp $< $@
+
+-include $(DEPENDS)

threads/build/devices/disk.d

@@ -0,0 +1,9 @@
+devices/disk.o: ../../devices/disk.c ../../include/devices/disk.h \
+ ../../include/lib/inttypes.h ../../include/lib/stdint.h \
+ ../../include/lib/ctype.h ../../include/lib/debug.h \
+ ../../include/lib/stdbool.h ../../include/lib/stdio.h \
+ ../../include/lib/stdarg.h ../../include/lib/stddef.h \
+ ../../include/lib/kernel/stdio.h ../../include/devices/timer.h \
+ ../../include/lib/round.h ../../include/threads/io.h \
+ ../../include/threads/interrupt.h ../../include/threads/synch.h \
+ ../../include/lib/kernel/list.h

threads/build/devices/input.d

@@ -0,0 +1,6 @@
+devices/input.o: ../../devices/input.c ../../include/devices/input.h \
+ ../../include/lib/stdbool.h ../../include/lib/stdint.h \
+ ../../include/lib/debug.h ../../include/devices/intq.h \
+ ../../include/threads/interrupt.h ../../include/threads/synch.h \
+ ../../include/lib/kernel/list.h ../../include/lib/stddef.h \
+ ../../include/devices/serial.h

threads/build/devices/intq.d

@@ -0,0 +1,5 @@
+devices/intq.o: ../../devices/intq.c ../../include/devices/intq.h \
+ ../../include/threads/interrupt.h ../../include/lib/stdbool.h \
+ ../../include/lib/stdint.h ../../include/threads/synch.h \
+ ../../include/lib/kernel/list.h ../../include/lib/stddef.h \
+ ../../include/lib/debug.h ../../include/threads/thread.h

threads/build/devices/kbd.d

@@ -0,0 +1,7 @@
+devices/kbd.o: ../../devices/kbd.c ../../include/devices/kbd.h \
+ ../../include/lib/stdint.h ../../include/lib/ctype.h \
+ ../../include/lib/debug.h ../../include/lib/stdio.h \
+ ../../include/lib/stdarg.h ../../include/lib/stdbool.h \
+ ../../include/lib/stddef.h ../../include/lib/kernel/stdio.h \
+ ../../include/lib/string.h ../../include/devices/input.h \
+ ../../include/threads/interrupt.h ../../include/threads/io.h

threads/build/devices/serial.d

@@ -0,0 +1,8 @@
+devices/serial.o: ../../devices/serial.c ../../include/devices/serial.h \
+ ../../include/lib/stdint.h ../../include/lib/debug.h \
+ ../../include/devices/input.h ../../include/lib/stdbool.h \
+ ../../include/devices/intq.h ../../include/threads/interrupt.h \
+ ../../include/threads/synch.h ../../include/lib/kernel/list.h \
+ ../../include/lib/stddef.h ../../include/devices/timer.h \
+ ../../include/lib/round.h ../../include/threads/io.h \
+ ../../include/threads/thread.h

threads/build/devices/timer.d

@@ -0,0 +1,8 @@
+devices/timer.o: ../../devices/timer.c ../../include/devices/timer.h \
+ ../../include/lib/round.h ../../include/lib/stdint.h \
+ ../../include/lib/debug.h ../../include/lib/inttypes.h \
+ ../../include/lib/stdio.h ../../include/lib/stdarg.h \
+ ../../include/lib/stdbool.h ../../include/lib/stddef.h \
+ ../../include/lib/kernel/stdio.h ../../include/threads/interrupt.h \
+ ../../include/threads/io.h ../../include/threads/synch.h \
+ ../../include/lib/kernel/list.h ../../include/threads/thread.h

threads/build/devices/vga.d

@@ -0,0 +1,6 @@
+devices/vga.o: ../../devices/vga.c ../../include/devices/vga.h \
+ ../../include/lib/round.h ../../include/lib/stdint.h \
+ ../../include/lib/stddef.h ../../include/lib/string.h \
+ ../../include/threads/io.h ../../include/threads/interrupt.h \
+ ../../include/lib/stdbool.h ../../include/threads/vaddr.h \
+ ../../include/lib/debug.h ../../include/threads/loader.h

threads/build/lib/arithmetic.d

@@ -0,0 +1 @@
+lib/arithmetic.o: ../../lib/arithmetic.c ../../include/lib/stdint.h

threads/build/lib/debug.d

@@ -0,0 +1,5 @@
+lib/debug.o: ../../lib/debug.c ../../include/lib/debug.h \
+ ../../include/lib/stdarg.h ../../include/lib/stdbool.h \
+ ../../include/lib/stddef.h ../../include/lib/stdio.h \
+ ../../include/lib/stdint.h ../../include/lib/kernel/stdio.h \
+ ../../include/lib/string.h

threads/build/lib/kernel/bitmap.d

@@ -0,0 +1,7 @@
+lib/kernel/bitmap.o: ../../lib/kernel/bitmap.c \
+ ../../include/lib/kernel/bitmap.h ../../include/lib/stdbool.h \
+ ../../include/lib/stddef.h ../../include/lib/inttypes.h \
+ ../../include/lib/stdint.h ../../include/lib/debug.h \
+ ../../include/lib/limits.h ../../include/lib/round.h \
+ ../../include/lib/stdio.h ../../include/lib/stdarg.h \
+ ../../include/lib/kernel/stdio.h ../../include/threads/malloc.h

threads/build/lib/kernel/console.d

@@ -0,0 +1,8 @@
+lib/kernel/console.o: ../../lib/kernel/console.c \
+ ../../include/lib/kernel/console.h ../../include/lib/stdarg.h \
+ ../../include/lib/stdio.h ../../include/lib/debug.h \
+ ../../include/lib/stdbool.h ../../include/lib/stddef.h \
+ ../../include/lib/stdint.h ../../include/lib/kernel/stdio.h \
+ ../../include/devices/serial.h ../../include/devices/vga.h \
+ ../../include/threads/init.h ../../include/threads/interrupt.h \
+ ../../include/threads/synch.h ../../include/lib/kernel/list.h

threads/build/lib/kernel/debug.d

@@ -0,0 +1,7 @@
+lib/kernel/debug.o: ../../lib/kernel/debug.c ../../include/lib/debug.h \
+ ../../include/lib/kernel/console.h ../../include/lib/stdarg.h \
+ ../../include/lib/stdbool.h ../../include/lib/stddef.h \
+ ../../include/lib/stdio.h ../../include/lib/stdint.h \
+ ../../include/lib/kernel/stdio.h ../../include/lib/string.h \
+ ../../include/threads/init.h ../../include/threads/interrupt.h \
+ ../../include/devices/serial.h

threads/build/lib/kernel/hash.d

@@ -0,0 +1,5 @@
+lib/kernel/hash.o: ../../lib/kernel/hash.c \
+ ../../include/lib/kernel/hash.h ../../include/lib/stdbool.h \
+ ../../include/lib/stddef.h ../../include/lib/stdint.h \
+ ../../include/lib/kernel/list.h ../../include/lib/kernel/../debug.h \
+ ../../include/threads/malloc.h ../../include/lib/debug.h

threads/build/lib/kernel/list.d

@@ -0,0 +1,4 @@
+lib/kernel/list.o: ../../lib/kernel/list.c \
+ ../../include/lib/kernel/list.h ../../include/lib/stdbool.h \
+ ../../include/lib/stddef.h ../../include/lib/stdint.h \
+ ../../include/lib/kernel/../debug.h

threads/build/lib/random.d

@@ -0,0 +1,3 @@
+lib/random.o: ../../lib/random.c ../../include/lib/random.h \
+ ../../include/lib/stddef.h ../../include/lib/stdbool.h \
+ ../../include/lib/stdint.h ../../include/lib/debug.h

threads/build/lib/stdio.d

@@ -0,0 +1,6 @@
+lib/stdio.o: ../../lib/stdio.c ../../include/lib/stdio.h \
+ ../../include/lib/debug.h ../../include/lib/stdarg.h \
+ ../../include/lib/stdbool.h ../../include/lib/stddef.h \
+ ../../include/lib/stdint.h ../../include/lib/kernel/stdio.h \
+ ../../include/lib/ctype.h ../../include/lib/inttypes.h \
+ ../../include/lib/round.h ../../include/lib/string.h

threads/build/lib/stdlib.d

@@ -0,0 +1,4 @@
+lib/stdlib.o: ../../lib/stdlib.c ../../include/lib/ctype.h \
+ ../../include/lib/debug.h ../../include/lib/random.h \
+ ../../include/lib/stddef.h ../../include/lib/stdlib.h \
+ ../../include/lib/stdbool.h

threads/build/lib/string.d

@@ -0,0 +1,2 @@
+lib/string.o: ../../lib/string.c ../../include/lib/string.h \
+ ../../include/lib/stddef.h ../../include/lib/debug.h

threads/build/results

@@ -0,0 +1,27 @@
+pass tests/threads/alarm-single
+pass tests/threads/alarm-multiple
+pass tests/threads/alarm-simultaneous
+pass tests/threads/alarm-priority
+pass tests/threads/alarm-zero
+pass tests/threads/alarm-negative
+pass tests/threads/priority-change
+pass tests/threads/priority-donate-one
+pass tests/threads/priority-donate-multiple
+pass tests/threads/priority-donate-multiple2
+pass tests/threads/priority-donate-nest
+pass tests/threads/priority-donate-sema
+pass tests/threads/priority-donate-lower
+pass tests/threads/priority-fifo
+pass tests/threads/priority-preempt
+pass tests/threads/priority-sema
+pass tests/threads/priority-condvar
+pass tests/threads/priority-donate-chain
+FAIL tests/threads/mlfqs/mlfqs-load-1
+FAIL tests/threads/mlfqs/mlfqs-load-60
+FAIL tests/threads/mlfqs/mlfqs-load-avg
+FAIL tests/threads/mlfqs/mlfqs-recent-1
+pass tests/threads/mlfqs/mlfqs-fair-2
+pass tests/threads/mlfqs/mlfqs-fair-20
+FAIL tests/threads/mlfqs/mlfqs-nice-2
+FAIL tests/threads/mlfqs/mlfqs-nice-10
+FAIL tests/threads/mlfqs/mlfqs-block

threads/build/tests/threads/alarm-multiple.errors

@@ -0,0 +1 @@
+qemu-system-x86_64: warning: TCG doesn't support requested feature: CPUID.01H:ECX.vmx [bit 5]

threads/build/tests/threads/alarm-multiple.output

@@ -0,0 +1,57 @@
+Kernel command line: -q run alarm-multiple
+0 ~ 9fc00 1
+100000 ~ 13e0000 1
+Pintos booting with: 
+	base_mem: 0x0 ~ 0x9fc00 (Usable: 639 kB)
+	ext_mem: 0x100000 ~ 0x13e0000 (Usable: 19,328 kB)
+Calibrating timer...  155,648,000 loops/s.
+Boot complete.
+Executing 'alarm-multiple':
+(alarm-multiple) begin
+(alarm-multiple) Creating 5 threads to sleep 7 times each.
+(alarm-multiple) Thread 0 sleeps 10 ticks each time,
+(alarm-multiple) thread 1 sleeps 20 ticks each time, and so on.
+(alarm-multiple) If successful, product of iteration count and
+(alarm-multiple) sleep duration will appear in nondescending order.
+(alarm-multiple) thread 0: duration=10, iteration=1, product=10
+(alarm-multiple) thread 1: duration=20, iteration=1, product=20
+(alarm-multiple) thread 0: duration=10, iteration=2, product=20
+(alarm-multiple) thread 2: duration=30, iteration=1, product=30
+(alarm-multiple) thread 0: duration=10, iteration=3, product=30
+(alarm-multiple) thread 3: duration=40, iteration=1, product=40
+(alarm-multiple) thread 1: duration=20, iteration=2, product=40
+(alarm-multiple) thread 0: duration=10, iteration=4, product=40
+(alarm-multiple) thread 4: duration=50, iteration=1, product=50
+(alarm-multiple) thread 0: duration=10, iteration=5, product=50
+(alarm-multiple) thread 2: duration=30, iteration=2, product=60
+(alarm-multiple) thread 1: duration=20, iteration=3, product=60
+(alarm-multiple) thread 0: duration=10, iteration=6, product=60
+(alarm-multiple) thread 0: duration=10, iteration=7, product=70
+(alarm-multiple) thread 3: duration=40, iteration=2, product=80
+(alarm-multiple) thread 1: duration=20, iteration=4, product=80
+(alarm-multiple) thread 2: duration=30, iteration=3, product=90
+(alarm-multiple) thread 4: duration=50, iteration=2, product=100
+(alarm-multiple) thread 1: duration=20, iteration=5, product=100
+(alarm-multiple) thread 3: duration=40, iteration=3, product=120
+(alarm-multiple) thread 2: duration=30, iteration=4, product=120
+(alarm-multiple) thread 1: duration=20, iteration=6, product=120
+(alarm-multiple) thread 1: duration=20, iteration=7, product=140
+(alarm-multiple) thread 4: duration=50, iteration=3, product=150
+(alarm-multiple) thread 2: duration=30, iteration=5, product=150
+(alarm-multiple) thread 3: duration=40, iteration=4, product=160
+(alarm-multiple) thread 2: duration=30, iteration=6, product=180
+(alarm-multiple) thread 4: duration=50, iteration=4, product=200
+(alarm-multiple) thread 3: duration=40, iteration=5, product=200
+(alarm-multiple) thread 2: duration=30, iteration=7, product=210
+(alarm-multiple) thread 3: duration=40, iteration=6, product=240
+(alarm-multiple) thread 4: duration=50, iteration=5, product=250
+(alarm-multiple) thread 3: duration=40, iteration=7, product=280
+(alarm-multiple) thread 4: duration=50, iteration=6, product=300
+(alarm-multiple) thread 4: duration=50, iteration=7, product=350
+(alarm-multiple) end
+Execution of 'alarm-multiple' complete.
+Timer: 591 ticks
+Thread: 550 idle ticks, 41 kernel ticks, 0 user ticks
+Console: 2995 characters output
+Keyboard: 0 keys pressed
+Powering off...

threads/build/tests/threads/alarm-multiple.result

@@ -0,0 +1 @@
+PASS

threads/build/tests/threads/alarm-negative.d

@@ -0,0 +1,9 @@
+tests/threads/alarm-negative.o: ../../tests/threads/alarm-negative.c \
+ ../../include/lib/stdio.h ../../include/lib/debug.h \
+ ../../include/lib/stdarg.h ../../include/lib/stdbool.h \
+ ../../include/lib/stddef.h ../../include/lib/stdint.h \
+ ../../include/lib/kernel/stdio.h ../../tests/threads/tests.h \
+ ../../include/threads/malloc.h ../../include/threads/synch.h \
+ ../../include/lib/kernel/list.h ../../include/threads/thread.h \
+ ../../include/threads/interrupt.h ../../include/devices/timer.h \
+ ../../include/lib/round.h

threads/build/tests/threads/alarm-negative.errors

@@ -0,0 +1 @@
+qemu-system-x86_64: warning: TCG doesn't support requested feature: CPUID.01H:ECX.vmx [bit 5]