diff --git a/.gitignore b/.gitignore index dab799c..ac95865 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,12 @@ Module.symvers Mkfile.old dkms.conf +*.result +*.errors + +**/build/**/* + +/.vagrant/**/* + +**/bochsout.txt +**/bochsrc.txt diff --git a/pintos-env/pintos/tests/threads/Make.tests b/pintos-env/pintos/tests/threads/Make.tests index 4569035..ecb766a 100755 --- a/pintos-env/pintos/tests/threads/Make.tests +++ b/pintos-env/pintos/tests/threads/Make.tests @@ -36,6 +36,7 @@ tests/threads_SRC += tests/threads/mlfqs-load-avg.c tests/threads_SRC += tests/threads/mlfqs-recent-1.c tests/threads_SRC += tests/threads/mlfqs-fair.c tests/threads_SRC += tests/threads/mlfqs-block.c +tests/threads_SRC += tests/threads/hello.c MLFQS_OUTPUTS = \ tests/threads/mlfqs-load-1.output \ diff --git a/pintos-env/pintos/tests/threads/hello.c b/pintos-env/pintos/tests/threads/hello.c new file mode 100644 index 0000000..1820621 --- /dev/null +++ b/pintos-env/pintos/tests/threads/hello.c @@ -0,0 +1,5 @@ +#include "hello.h" + +void test_hello(void) { + printf("Hello, world!\n"); +} diff --git a/pintos-env/pintos/tests/threads/hello.h b/pintos-env/pintos/tests/threads/hello.h new file mode 100644 index 0000000..5d40038 --- /dev/null +++ b/pintos-env/pintos/tests/threads/hello.h @@ -0,0 +1,3 @@ +#include + +extern void test_hello(void); diff --git a/pintos-env/pintos/tests/threads/tests.c b/pintos-env/pintos/tests/threads/tests.c index af15aee..414fae6 100755 --- a/pintos-env/pintos/tests/threads/tests.c +++ b/pintos-env/pintos/tests/threads/tests.c @@ -38,6 +38,7 @@ static const struct test tests[] = {"mlfqs-nice-2", test_mlfqs_nice_2}, {"mlfqs-nice-10", test_mlfqs_nice_10}, {"mlfqs-block", test_mlfqs_block}, + {"test_hello", test_hello}, }; static const char *test_name; diff --git a/pintos-env/pintos/tests/threads/tests.h b/pintos-env/pintos/tests/threads/tests.h index cd9d489..3343de1 100755 --- a/pintos-env/pintos/tests/threads/tests.h +++ b/pintos-env/pintos/tests/threads/tests.h @@ -32,6 +32,7 @@ extern test_func test_mlfqs_fair_20; extern test_func test_mlfqs_nice_2; extern test_func test_mlfqs_nice_10; extern test_func test_mlfqs_block; +extern test_func test_hello; void msg (const char *, ...); void fail (const char *, ...); diff --git a/pintos-env/pintos/threads/bochsout.txt b/pintos-env/pintos/threads/bochsout.txt index e6b4085..aa972b5 100755 --- a/pintos-env/pintos/threads/bochsout.txt +++ b/pintos-env/pintos/threads/bochsout.txt @@ -30,7 +30,7 @@ 00000000000i[ ] SB16 support: no 00000000000i[ ] USB support: no 00000000000i[ ] VGA extension support: vbe -00000000000i[MEM0 ] allocated memory at 0x7f3a2075c010. after alignment, vector=0x7f3a2075d000 +00000000000i[MEM0 ] allocated memory at 0x7eff051e8010. after alignment, vector=0x7eff051e9000 00000000000i[MEM0 ] 4.00MB 00000000000i[MEM0 ] mem block size = 0x00100000, blocks=4 00000000000i[MEM0 ] rom at 0xfffe0000/131072 ('/pintos-env/share/bochs/BIOS-bochs-latest') @@ -55,7 +55,7 @@ 00000000000i[ ] init_dev of 'keyboard' plugin device by virtual method 00000000000i[KBD ] will paste characters every 1000 keyboard ticks 00000000000i[ ] init_dev of 'harddrv' plugin device by virtual method -00000000000i[HD ] HD on ata0-0: '/tmp/vgIiYcPakx.dsk', 'flat' mode +00000000000i[HD ] HD on ata0-0: '/tmp/lA8HTUhyge.dsk', 'flat' mode 00000000000i[IMG ] hd_size: 516096 00000000000i[HD ] ata0-0: using specified geometry: CHS=1/16/63 00000000000i[HD ] Using boot sequence disk, none, none @@ -132,42 +132,32 @@ 00000833946i[BIOS ] ata0-0: PCHS=1/16/63 translation=none LCHS=1/16/63 00004712316i[BIOS ] IDE time out 00007773617i[BIOS ] Booting from 0000:7c00 -00008173052i[MEM0 ] allocate_block: block=0x1 used 0x2 of 0x4 -00008213953i[MEM0 ] allocate_block: block=0x2 used 0x3 of 0x4 -00932406100i[NGUI ] ips = 932.406M -02044894390i[NGUI ] ips = 1112.488M -03169115889i[NGUI ] ips = 1124.221M -04292997614i[NGUI ] ips = 1123.882M -05409617500i[NGUI ] ips = 1116.620M -06520342850i[NGUI ] ips = 1110.725M -07644454593i[NGUI ] ips = 1124.112M -08764788638i[NGUI ] ips = 1120.334M -09863746294i[NGUI ] ips = 1098.958M -10984577800i[NGUI ] ips = 1120.832M -12103658109i[NGUI ] ips = 1119.080M -13226495300i[NGUI ] ips = 1122.837M -14347017519i[NGUI ] ips = 1120.522M -15463585695i[NGUI ] ips = 1116.568M -16391355100p[ ] >>PANIC<< SIGNAL 2 caught -16391355100i[CPU0 ] CPU is in protected mode (halted) -16391355100i[CPU0 ] CS.mode = 32 bit -16391355100i[CPU0 ] SS.mode = 32 bit -16391355100i[CPU0 ] EFER = 0x00000000 -16391355100i[CPU0 ] | EAX=00000000 EBX=c0020fd7 ECX=c0103000 EDX=00000018 -16391355100i[CPU0 ] | ESP=c0103fa8 EBP=00000000 ESI=00000000 EDI=00000000 -16391355100i[CPU0 ] | IOPL=0 id vip vif ac vm rf nt of df IF tf SF zf AF pf cf -16391355100i[CPU0 ] | SEG sltr(index|ti|rpl) base limit G D -16391355100i[CPU0 ] | CS:0008( 0001| 0| 0) 00000000 ffffffff 1 1 -16391355100i[CPU0 ] | DS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -16391355100i[CPU0 ] | SS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -16391355100i[CPU0 ] | ES:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -16391355100i[CPU0 ] | FS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -16391355100i[CPU0 ] | GS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -16391355100i[CPU0 ] | EIP=c0020ffc (c0020ffc) -16391355100i[CPU0 ] | CR0=0xe0010015 CR2=0x00000000 -16391355100i[CPU0 ] | CR3=0x00101000 CR4=0x00000000 -16391355100i[CPU0 ] 0xc0020ffc>> lea esi, dword ptr ds:[esi] : 8D742600 -16391355100i[CMOS ] Last time is 16391 (Thu Jan 1 04:33:11 1970) -16391355100i[NGUI ] bx_nogui_gui_c::exit() not implemented yet. -16391355100i[ ] restoring default signal behavior -16391355100i[CTRL ] quit_sim called with exit code 1 +00008171407i[MEM0 ] allocate_block: block=0x1 used 0x2 of 0x4 +00008212308i[MEM0 ] allocate_block: block=0x2 used 0x3 of 0x4 +01030203991i[NGUI ] ips = 1030.204M +02144669032i[NGUI ] ips = 1114.465M +03262317300i[NGUI ] ips = 1117.648M +04381040700i[NGUI ] ips = 1118.723M +04982866726p[ ] >>PANIC<< SIGNAL 2 caught +04982866726i[CPU0 ] CPU is in protected mode (halted) +04982866726i[CPU0 ] CS.mode = 32 bit +04982866726i[CPU0 ] SS.mode = 32 bit +04982866726i[CPU0 ] EFER = 0x00000000 +04982866726i[CPU0 ] | EAX=00000000 EBX=c0020fd7 ECX=c0103000 EDX=00000018 +04982866726i[CPU0 ] | ESP=c0103fa8 EBP=00000000 ESI=00000000 EDI=00000000 +04982866726i[CPU0 ] | IOPL=0 id vip vif ac vm rf nt of df IF tf SF zf AF pf cf +04982866726i[CPU0 ] | SEG sltr(index|ti|rpl) base limit G D +04982866726i[CPU0 ] | CS:0008( 0001| 0| 0) 00000000 ffffffff 1 1 +04982866726i[CPU0 ] | DS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 +04982866726i[CPU0 ] | SS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 +04982866726i[CPU0 ] | ES:0010( 0002| 0| 0) 00000000 ffffffff 1 1 +04982866726i[CPU0 ] | FS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 +04982866726i[CPU0 ] | GS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 +04982866726i[CPU0 ] | EIP=c0020ffc (c0020ffc) +04982866726i[CPU0 ] | CR0=0xe0010015 CR2=0x00000000 +04982866726i[CPU0 ] | CR3=0x00101000 CR4=0x00000000 +04982866726i[CPU0 ] 0xc0020ffc>> lea esi, dword ptr ds:[esi] : 8D742600 +04982866726i[CMOS ] Last time is 4982 (Thu Jan 1 01:23:02 1970) +04982866726i[NGUI ] bx_nogui_gui_c::exit() not implemented yet. +04982866726i[ ] restoring default signal behavior +04982866726i[CTRL ] quit_sim called with exit code 1 diff --git a/pintos-env/pintos/threads/bochsrc.txt b/pintos-env/pintos/threads/bochsrc.txt index 5c9ac21..d5436f6 100755 --- a/pintos-env/pintos/threads/bochsrc.txt +++ b/pintos-env/pintos/threads/bochsrc.txt @@ -7,6 +7,6 @@ log: bochsout.txt panic: action=fatal user_shortcut: keys=ctrlaltdel clock: sync=none, time0=0 -ata0-master: type=disk, path=/tmp/vgIiYcPakx.dsk, mode=flat, cylinders=1, heads=16, spt=63, translation=none +ata0-master: type=disk, path=/tmp/lA8HTUhyge.dsk, mode=flat, cylinders=1, heads=16, spt=63, translation=none com1: enabled=1, mode=file, dev=/dev/stdout display_library: nogui diff --git a/pintos-env/pintos/threads/build/Makefile b/pintos-env/pintos/threads/build/Makefile deleted file mode 100755 index e997d27..0000000 --- a/pintos-env/pintos/threads/build/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# -*- makefile -*- - -SRCDIR = ../.. - -all: kernel.bin loader.bin - -include ../../Make.config -include ../Make.vars -include ../../tests/Make.tests - -# Compiler and assembler options. -kernel.bin: CPPFLAGS += -I$(SRCDIR)/lib/kernel - -# Core kernel. -threads_SRC = threads/start.S # Startup code. -threads_SRC += threads/init.c # Main program. -threads_SRC += threads/thread.c # Thread management core. -threads_SRC += threads/switch.S # Thread switch routine. -threads_SRC += threads/interrupt.c # Interrupt core. -threads_SRC += threads/intr-stubs.S # Interrupt stubs. -threads_SRC += threads/synch.c # Synchronization. -threads_SRC += threads/palloc.c # Page allocator. -threads_SRC += threads/malloc.c # Subpage allocator. - -# Device driver code. -devices_SRC = devices/pit.c # Programmable interrupt timer chip. -devices_SRC += devices/timer.c # Periodic timer device. -devices_SRC += devices/kbd.c # Keyboard device. -devices_SRC += devices/vga.c # Video device. -devices_SRC += devices/serial.c # Serial port device. -devices_SRC += devices/block.c # Block device abstraction layer. -devices_SRC += devices/partition.c # Partition block device. -devices_SRC += devices/ide.c # IDE disk block device. -devices_SRC += devices/input.c # Serial and keyboard input. -devices_SRC += devices/intq.c # Interrupt queue. -devices_SRC += devices/rtc.c # Real-time clock. -devices_SRC += devices/shutdown.c # Reboot and power off. -devices_SRC += devices/speaker.c # PC speaker. - -# Library code shared between kernel and user programs. -lib_SRC = lib/debug.c # Debug helpers. -lib_SRC += lib/random.c # Pseudo-random numbers. -lib_SRC += lib/stdio.c # I/O library. -lib_SRC += lib/stdlib.c # Utility functions. -lib_SRC += lib/string.c # String functions. -lib_SRC += lib/arithmetic.c # 64-bit arithmetic for GCC. -lib_SRC += lib/ustar.c # Unix standard tar format utilities. - -# Kernel-specific library code. -lib/kernel_SRC = lib/kernel/debug.c # Debug helpers. -lib/kernel_SRC += lib/kernel/list.c # Doubly-linked lists. -lib/kernel_SRC += lib/kernel/bitmap.c # Bitmaps. -lib/kernel_SRC += lib/kernel/hash.c # Hash tables. -lib/kernel_SRC += lib/kernel/console.c # printf(), putchar(). - -# User process code. -userprog_SRC = userprog/process.c # Process loading. -userprog_SRC += userprog/pagedir.c # Page directories. -userprog_SRC += userprog/exception.c # User exception handler. -userprog_SRC += userprog/syscall.c # System call handler. -userprog_SRC += userprog/gdt.c # GDT initialization. -userprog_SRC += userprog/tss.c # TSS management. - -# No virtual memory code yet. -#vm_SRC = vm/file.c # Some file. - -# Filesystem code. -filesys_SRC = filesys/filesys.c # Filesystem core. -filesys_SRC += filesys/free-map.c # Free sector bitmap. -filesys_SRC += filesys/file.c # Files. -filesys_SRC += filesys/directory.c # Directories. -filesys_SRC += filesys/inode.c # File headers. -filesys_SRC += filesys/fsutil.c # Utilities. - -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 threads/loader.h - -kernel.o: threads/kernel.lds.s $(OBJECTS) - $(LD) -T $< -o $@ $(OBJECTS) - -kernel.bin: kernel.o - $(OBJCOPY) -R .note -R .comment -S $< $@ - -threads/loader.o: threads/loader.S - $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) - -loader.bin: threads/loader.o - $(LD) -N -e 0 -Ttext 0x7c00 --oformat binary -o $@ $< - -os.dsk: kernel.bin - cat $^ > $@ - -clean:: - rm -f $(OBJECTS) $(DEPENDS) - rm -f threads/loader.o threads/kernel.lds.s threads/loader.d - rm -f kernel.bin.tmp - rm -f kernel.o kernel.lds.s - rm -f kernel.bin loader.bin - rm -f bochsout.txt bochsrc.txt - rm -f results grade - -Makefile: $(SRCDIR)/Makefile.build - cp $< $@ - --include $(DEPENDS) diff --git a/pintos-env/pintos/threads/build/bochsout.txt b/pintos-env/pintos/threads/build/bochsout.txt deleted file mode 100644 index c88f660..0000000 --- a/pintos-env/pintos/threads/build/bochsout.txt +++ /dev/null @@ -1,159 +0,0 @@ -00000000000i[ ] Bochs x86 Emulator 2.6 -00000000000i[ ] Built from SVN snapshot on September 2nd, 2012 -00000000000i[ ] Compiled on Feb 17 2015 at 16:28:11 -00000000000i[ ] System configuration -00000000000i[ ] processors: 1 (cores=1, HT threads=1) -00000000000i[ ] A20 line support: yes -00000000000i[ ] IPS is set to 1000000 -00000000000i[ ] CPU configuration -00000000000i[ ] level: 6 -00000000000i[ ] SMP support: no -00000000000i[ ] APIC support: xapic -00000000000i[ ] FPU support: yes -00000000000i[ ] MMX support: yes -00000000000i[ ] 3dnow! support: no -00000000000i[ ] SEP support: yes -00000000000i[ ] SSE support: sse2 -00000000000i[ ] XSAVE support: no -00000000000i[ ] AES support: no -00000000000i[ ] MOVBE support: no -00000000000i[ ] ADX support: no -00000000000i[ ] x86-64 support: no -00000000000i[ ] MWAIT support: yes -00000000000i[ ] Optimization configuration -00000000000i[ ] RepeatSpeedups support: no -00000000000i[ ] Fast function calls: no -00000000000i[ ] Handlers Chaining speedups: no -00000000000i[ ] Devices configuration -00000000000i[ ] NE2000 support: no -00000000000i[ ] PCI support: no, enabled=no -00000000000i[ ] SB16 support: no -00000000000i[ ] USB support: no -00000000000i[ ] VGA extension support: vbe -00000000000i[MEM0 ] allocated memory at 0x2b1e011b7010. after alignment, vector=0x2b1e011b8000 -00000000000i[MEM0 ] 4.00MB -00000000000i[MEM0 ] mem block size = 0x00100000, blocks=4 -00000000000i[MEM0 ] rom at 0xfffe0000/131072 ('/pintos-env/share/bochs/BIOS-bochs-latest') -00000000000i[ ] init_dev of 'cmos' plugin device by virtual method -00000000000i[CMOS ] Using specified time for initial clock -00000000000i[CMOS ] Setting initial clock to: Thu Jan 1 00:00:00 1970 (time0=0) -00000000000i[ ] init_dev of 'dma' plugin device by virtual method -00000000000i[DMA ] channel 4 used by cascade -00000000000i[ ] init_dev of 'pic' plugin device by virtual method -00000000000i[ ] init_dev of 'pit' plugin device by virtual method -00000000000i[ ] init_dev of 'floppy' plugin device by virtual method -00000000000i[DMA ] channel 2 used by Floppy Drive -00000000000i[ ] init_dev of 'vga' plugin device by virtual method -00000000000i[MEM0 ] Register memory access handlers: 0x00000000000a0000 - 0x00000000000bffff -00000000000i[VGA ] interval=200000 -00000000000i[MEM0 ] Register memory access handlers: 0x00000000e0000000 - 0x00000000e0ffffff -00000000000i[BXVGA] VBE Bochs Display Extension Enabled -00000000000i[MEM0 ] rom at 0xc0000/41472 ('/pintos-env/share/bochs/VGABIOS-lgpl-latest') -00000000000i[ ] init_dev of 'ioapic' plugin device by virtual method -00000000000i[IOAP ] initializing I/O APIC -00000000000i[MEM0 ] Register memory access handlers: 0x00000000fec00000 - 0x00000000fec00fff -00000000000i[ ] init_dev of 'keyboard' plugin device by virtual method -00000000000i[KBD ] will paste characters every 1000 keyboard ticks -00000000000i[ ] init_dev of 'harddrv' plugin device by virtual method -00000000000i[HD ] HD on ata0-0: '/tmp/d1Z0LnzFEn.dsk', 'flat' mode -00000000000i[IMG ] hd_size: 516096 -00000000000i[HD ] ata0-0: using specified geometry: CHS=1/16/63 -00000000000i[HD ] Using boot sequence disk, none, none -00000000000i[HD ] Floppy boot signature check is enabled -00000000000i[ ] init_dev of 'unmapped' plugin device by virtual method -00000000000i[ ] init_dev of 'biosdev' plugin device by virtual method -00000000000i[ ] init_dev of 'speaker' plugin device by virtual method -00000000000i[ ] init_dev of 'extfpuirq' plugin device by virtual method -00000000000i[ ] init_dev of 'parallel' plugin device by virtual method -00000000000i[PAR ] parallel port 1 at 0x0378 irq 7 -00000000000i[ ] init_dev of 'serial' plugin device by virtual method -00000000000i[SER ] com1 at 0x03f8 irq 4 -00000000000i[ ] register state of 'cmos' plugin device by virtual method -00000000000i[ ] register state of 'dma' plugin device by virtual method -00000000000i[ ] register state of 'pic' plugin device by virtual method -00000000000i[ ] register state of 'pit' plugin device by virtual method -00000000000i[ ] register state of 'floppy' plugin device by virtual method -00000000000i[ ] register state of 'vga' plugin device by virtual method -00000000000i[ ] register state of 'unmapped' plugin device by virtual method -00000000000i[ ] register state of 'biosdev' plugin device by virtual method -00000000000i[ ] register state of 'speaker' plugin device by virtual method -00000000000i[ ] register state of 'extfpuirq' plugin device by virtual method -00000000000i[ ] register state of 'parallel' plugin device by virtual method -00000000000i[ ] register state of 'serial' plugin device by virtual method -00000000000i[ ] register state of 'ioapic' plugin device by virtual method -00000000000i[ ] register state of 'keyboard' plugin device by virtual method -00000000000i[ ] register state of 'harddrv' plugin device by virtual method -00000000000i[SYS ] bx_pc_system_c::Reset(HARDWARE) called -00000000000i[CPU0 ] cpu hardware reset -00000000000i[APIC0] allocate APIC id=0 (MMIO enabled) to 0x00000000fee00000 -00000000000i[CPU0 ] CPUID[0x00000000]: 00000002 756e6547 6c65746e 49656e69 -00000000000i[CPU0 ] CPUID[0x00000001]: 00000633 00010800 00000008 1fcbfbff -00000000000i[CPU0 ] CPUID[0x00000002]: 00410601 00000000 00000000 00000000 -00000000000i[CPU0 ] CPUID[0x80000000]: 80000008 00000000 00000000 00000000 -00000000000i[CPU0 ] CPUID[0x80000001]: 00000000 00000000 00000000 00000000 -00000000000i[CPU0 ] CPUID[0x80000002]: 20202020 20202020 20202020 6e492020 -00000000000i[CPU0 ] CPUID[0x80000003]: 286c6574 50202952 69746e65 52286d75 -00000000000i[CPU0 ] CPUID[0x80000004]: 20342029 20555043 20202020 00202020 -00000000000i[CPU0 ] CPUID[0x80000005]: 01ff01ff 01ff01ff 40020140 40020140 -00000000000i[CPU0 ] CPUID[0x80000006]: 00000000 42004200 02008140 00000000 -00000000000i[CPU0 ] CPUID[0x80000007]: 00000000 00000000 00000000 00000000 -00000000000i[CPU0 ] CPUID[0x80000008]: 00002028 00000000 00000000 00000000 -00000000000i[ ] reset of 'cmos' plugin device by virtual method -00000000000i[ ] reset of 'dma' plugin device by virtual method -00000000000i[ ] reset of 'pic' plugin device by virtual method -00000000000i[ ] reset of 'pit' plugin device by virtual method -00000000000i[ ] reset of 'floppy' plugin device by virtual method -00000000000i[ ] reset of 'vga' plugin device by virtual method -00000000000i[ ] reset of 'ioapic' plugin device by virtual method -00000000000i[ ] reset of 'keyboard' plugin device by virtual method -00000000000i[ ] reset of 'harddrv' plugin device by virtual method -00000000000i[ ] reset of 'unmapped' plugin device by virtual method -00000000000i[ ] reset of 'biosdev' plugin device by virtual method -00000000000i[ ] reset of 'speaker' plugin device by virtual method -00000000000e[SPEAK] Failed to open /dev/console: Permission denied -00000000000e[SPEAK] Deactivating beep on console -00000000000i[ ] reset of 'extfpuirq' plugin device by virtual method -00000000000i[ ] reset of 'parallel' plugin device by virtual method -00000000000i[ ] reset of 'serial' plugin device by virtual method -00000000025i[MEM0 ] allocate_block: block=0x0 used 0x1 of 0x4 -00000004661i[BIOS ] $Revision: 11318 $ $Date: 2012-08-06 19:59:54 +0200 (Mo, 06. Aug 2012) $ -00000317820i[KBD ] reset-disable command received -00000319072i[BIOS ] Starting rombios32 -00000319506i[BIOS ] Shutdown flag 0 -00000320089i[BIOS ] ram_size=0x00400000 -00000320487i[BIOS ] ram_end=4MB -00000331328i[BIOS ] Found 1 cpu(s) -00000345510i[BIOS ] bios_table_addr: 0x000fa438 end=0x000fcc00 -00000363970i[BIOS ] bios_table_cur_addr: 0x000fa438 -00000491587i[VBIOS] VGABios $Id: vgabios.c,v 1.75 2011/10/15 14:07:21 vruppert Exp $ -00000491658i[BXVGA] VBE known Display Interface b0c0 -00000491690i[BXVGA] VBE known Display Interface b0c5 -00000494615i[VBIOS] VBE Bios $Id: vbe.c,v 1.64 2011/07/19 18:25:05 vruppert Exp $ -00000833946i[BIOS ] ata0-0: PCHS=1/16/63 translation=none LCHS=1/16/63 -00004712316i[BIOS ] IDE time out -00007773617i[BIOS ] Booting from 0000:7c00 -00008181201i[MEM0 ] allocate_block: block=0x1 used 0x2 of 0x4 -00008222102i[MEM0 ] allocate_block: block=0x2 used 0x3 of 0x4 -00039252091p[UNMP ] >>PANIC<< Shutdown port: shutdown requested -00039252091i[CPU0 ] CPU is in protected mode (active) -00039252091i[CPU0 ] CS.mode = 32 bit -00039252091i[CPU0 ] SS.mode = 32 bit -00039252091i[CPU0 ] EFER = 0x00000000 -00039252091i[CPU0 ] | EAX=0000006e EBX=c002c62c ECX=c000ef7e EDX=ffff8900 -00039252091i[CPU0 ] | ESP=c000ef60 EBP=c000eff8 ESI=00000000 EDI=c00347b0 -00039252091i[CPU0 ] | IOPL=0 id vip vif ac vm rf nt of df IF tf sf zf af pf cf -00039252091i[CPU0 ] | SEG sltr(index|ti|rpl) base limit G D -00039252091i[CPU0 ] | CS:0008( 0001| 0| 0) 00000000 ffffffff 1 1 -00039252091i[CPU0 ] | DS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -00039252091i[CPU0 ] | SS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -00039252091i[CPU0 ] | ES:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -00039252091i[CPU0 ] | FS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -00039252091i[CPU0 ] | GS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 -00039252091i[CPU0 ] | EIP=c0025a7f (c0025a7e) -00039252091i[CPU0 ] | CR0=0xe0010015 CR2=0x00000000 -00039252091i[CPU0 ] | CR3=0x00101000 CR4=0x00000000 -00039252091i[CPU0 ] 0xc0025a7e>> out dx, al : EE -00039252091i[CMOS ] Last time is 39 (Thu Jan 1 00:00:39 1970) -00039252091i[NGUI ] bx_nogui_gui_c::exit() not implemented yet. -00039252091i[ ] restoring default signal behavior -00039252091i[CTRL ] quit_sim called with exit code 1 diff --git a/pintos-env/pintos/threads/build/bochsrc.txt b/pintos-env/pintos/threads/build/bochsrc.txt deleted file mode 100644 index bdc39ee..0000000 --- a/pintos-env/pintos/threads/build/bochsrc.txt +++ /dev/null @@ -1,12 +0,0 @@ -romimage: file=$BXSHARE/BIOS-bochs-latest -vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest -boot: disk -cpu: ips=1000000 -megs: 4 -log: bochsout.txt -panic: action=fatal -user_shortcut: keys=ctrlaltdel -clock: sync=none, time0=0 -ata0-master: type=disk, path=/tmp/d1Z0LnzFEn.dsk, mode=flat, cylinders=1, heads=16, spt=63, translation=none -com1: enabled=1, mode=file, dev=/dev/stdout -display_library: nogui diff --git a/pintos-env/pintos/threads/build/kernel.bin b/pintos-env/pintos/threads/build/kernel.bin deleted file mode 100755 index 33d7ef2..0000000 Binary files a/pintos-env/pintos/threads/build/kernel.bin and /dev/null differ diff --git a/pintos-env/pintos/threads/build/loader.bin b/pintos-env/pintos/threads/build/loader.bin deleted file mode 100755 index 8b3ebf6..0000000 Binary files a/pintos-env/pintos/threads/build/loader.bin and /dev/null differ diff --git a/pintos-env/pintos/threads/build/results b/pintos-env/pintos/threads/build/results deleted file mode 100644 index 8088ba1..0000000 --- a/pintos-env/pintos/threads/build/results +++ /dev/null @@ -1,27 +0,0 @@ -pass tests/threads/alarm-single -pass tests/threads/alarm-multiple -pass tests/threads/alarm-simultaneous -FAIL tests/threads/alarm-priority -pass tests/threads/alarm-zero -pass tests/threads/alarm-negative -FAIL tests/threads/priority-change -FAIL tests/threads/priority-donate-one -FAIL tests/threads/priority-donate-multiple -FAIL tests/threads/priority-donate-multiple2 -FAIL tests/threads/priority-donate-nest -FAIL tests/threads/priority-donate-sema -FAIL tests/threads/priority-donate-lower -FAIL tests/threads/priority-fifo -FAIL tests/threads/priority-preempt -FAIL tests/threads/priority-sema -FAIL tests/threads/priority-condvar -FAIL tests/threads/priority-donate-chain -FAIL tests/threads/mlfqs-load-1 -FAIL tests/threads/mlfqs-load-60 -FAIL tests/threads/mlfqs-load-avg -FAIL tests/threads/mlfqs-recent-1 -pass tests/threads/mlfqs-fair-2 -pass tests/threads/mlfqs-fair-20 -FAIL tests/threads/mlfqs-nice-2 -FAIL tests/threads/mlfqs-nice-10 -FAIL tests/threads/mlfqs-block diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.errors b/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.output b/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.output deleted file mode 100644 index 15ce6f9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.output +++ /dev/null @@ -1,63 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run alarm-multiple -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 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 0: duration=10, iteration=2, product=20 -(alarm-multiple) thread 1: duration=20, iteration=1, 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 0: duration=10, iteration=4, product=40 -(alarm-multiple) thread 1: duration=20, iteration=2, product=40 -(alarm-multiple) thread 3: duration=40, iteration=1, product=40 -(alarm-multiple) thread 0: duration=10, iteration=5, product=50 -(alarm-multiple) thread 4: duration=50, iteration=1, product=50 -(alarm-multiple) thread 0: duration=10, iteration=6, product=60 -(alarm-multiple) thread 1: duration=20, iteration=3, product=60 -(alarm-multiple) thread 2: duration=30, iteration=2, 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 1: duration=20, iteration=5, product=100 -(alarm-multiple) thread 4: duration=50, iteration=2, product=100 -(alarm-multiple) thread 1: duration=20, iteration=6, product=120 -(alarm-multiple) thread 2: duration=30, iteration=4, product=120 -(alarm-multiple) thread 3: duration=40, iteration=3, product=120 -(alarm-multiple) thread 1: duration=20, iteration=7, product=140 -(alarm-multiple) thread 2: duration=30, iteration=5, product=150 -(alarm-multiple) thread 4: duration=50, iteration=3, 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: 842 ticks -Thread: 0 idle ticks, 844 kernel ticks, 0 user ticks -Console: 2950 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.result b/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.result deleted file mode 100644 index 7ef22e9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-multiple.result +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-negative.errors b/pintos-env/pintos/threads/build/tests/threads/alarm-negative.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-negative.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-negative.output b/pintos-env/pintos/threads/build/tests/threads/alarm-negative.output deleted file mode 100644 index 4177959..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-negative.output +++ /dev/null @@ -1,24 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run alarm-negative -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'alarm-negative': -(alarm-negative) begin -(alarm-negative) PASS -(alarm-negative) end -Execution of 'alarm-negative' complete. -Timer: 34 ticks -Thread: 0 idle ticks, 37 kernel ticks, 0 user ticks -Console: 405 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-negative.result b/pintos-env/pintos/threads/build/tests/threads/alarm-negative.result deleted file mode 100644 index 7ef22e9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-negative.result +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-priority.errors b/pintos-env/pintos/threads/build/tests/threads/alarm-priority.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-priority.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-priority.output b/pintos-env/pintos/threads/build/tests/threads/alarm-priority.output deleted file mode 100644 index e6712b2..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-priority.output +++ /dev/null @@ -1,33 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run alarm-priority -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'alarm-priority': -(alarm-priority) begin -(alarm-priority) Thread priority 25 woke up. -(alarm-priority) Thread priority 24 woke up. -(alarm-priority) Thread priority 21 woke up. -(alarm-priority) Thread priority 28 woke up. -(alarm-priority) Thread priority 23 woke up. -(alarm-priority) Thread priority 29 woke up. -(alarm-priority) Thread priority 22 woke up. -(alarm-priority) Thread priority 26 woke up. -(alarm-priority) Thread priority 30 woke up. -(alarm-priority) Thread priority 27 woke up. -(alarm-priority) end -Execution of 'alarm-priority' complete. -Timer: 589 ticks -Thread: 0 idle ticks, 591 kernel ticks, 0 user ticks -Console: 835 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-priority.result b/pintos-env/pintos/threads/build/tests/threads/alarm-priority.result deleted file mode 100644 index 49817e0..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-priority.result +++ /dev/null @@ -1,35 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (alarm-priority) begin - (alarm-priority) Thread priority 30 woke up. - (alarm-priority) Thread priority 29 woke up. - (alarm-priority) Thread priority 28 woke up. - (alarm-priority) Thread priority 27 woke up. - (alarm-priority) Thread priority 26 woke up. - (alarm-priority) Thread priority 25 woke up. - (alarm-priority) Thread priority 24 woke up. - (alarm-priority) Thread priority 23 woke up. - (alarm-priority) Thread priority 22 woke up. - (alarm-priority) Thread priority 21 woke up. - (alarm-priority) end -Differences in `diff -u' format: - (alarm-priority) begin -- (alarm-priority) Thread priority 30 woke up. -- (alarm-priority) Thread priority 29 woke up. -- (alarm-priority) Thread priority 28 woke up. -- (alarm-priority) Thread priority 27 woke up. -- (alarm-priority) Thread priority 26 woke up. - (alarm-priority) Thread priority 25 woke up. - (alarm-priority) Thread priority 24 woke up. -+ (alarm-priority) Thread priority 21 woke up. -+ (alarm-priority) Thread priority 28 woke up. - (alarm-priority) Thread priority 23 woke up. -+ (alarm-priority) Thread priority 29 woke up. - (alarm-priority) Thread priority 22 woke up. -- (alarm-priority) Thread priority 21 woke up. -+ (alarm-priority) Thread priority 26 woke up. -+ (alarm-priority) Thread priority 30 woke up. -+ (alarm-priority) Thread priority 27 woke up. - (alarm-priority) end diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.errors b/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.output b/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.output deleted file mode 100644 index 9f28524..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.output +++ /dev/null @@ -1,41 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run alarm-simultaneous -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'alarm-simultaneous': -(alarm-simultaneous) begin -(alarm-simultaneous) Creating 3 threads to sleep 5 times each. -(alarm-simultaneous) Each thread sleeps 10 ticks each time. -(alarm-simultaneous) Within an iteration, all threads should wake up on the same tick. -(alarm-simultaneous) iteration 0, thread 0: woke up after 10 ticks -(alarm-simultaneous) iteration 0, thread 1: woke up 0 ticks later -(alarm-simultaneous) iteration 0, thread 2: woke up 0 ticks later -(alarm-simultaneous) iteration 1, thread 0: woke up 10 ticks later -(alarm-simultaneous) iteration 1, thread 1: woke up 0 ticks later -(alarm-simultaneous) iteration 1, thread 2: woke up 0 ticks later -(alarm-simultaneous) iteration 2, thread 0: woke up 10 ticks later -(alarm-simultaneous) iteration 2, thread 1: woke up 0 ticks later -(alarm-simultaneous) iteration 2, thread 2: woke up 0 ticks later -(alarm-simultaneous) iteration 3, thread 0: woke up 10 ticks later -(alarm-simultaneous) iteration 3, thread 1: woke up 0 ticks later -(alarm-simultaneous) iteration 3, thread 2: woke up 0 ticks later -(alarm-simultaneous) iteration 4, thread 0: woke up 10 ticks later -(alarm-simultaneous) iteration 4, thread 1: woke up 0 ticks later -(alarm-simultaneous) iteration 4, thread 2: woke up 0 ticks later -(alarm-simultaneous) end -Execution of 'alarm-simultaneous' complete. -Timer: 406 ticks -Thread: 0 idle ticks, 408 kernel ticks, 0 user ticks -Console: 1610 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.result b/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.result deleted file mode 100644 index 7ef22e9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-simultaneous.result +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-single.errors b/pintos-env/pintos/threads/build/tests/threads/alarm-single.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-single.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-single.output b/pintos-env/pintos/threads/build/tests/threads/alarm-single.output deleted file mode 100644 index 5d7d5c2..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-single.output +++ /dev/null @@ -1,33 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run alarm-single -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'alarm-single': -(alarm-single) begin -(alarm-single) Creating 5 threads to sleep 1 times each. -(alarm-single) Thread 0 sleeps 10 ticks each time, -(alarm-single) thread 1 sleeps 20 ticks each time, and so on. -(alarm-single) If successful, product of iteration count and -(alarm-single) sleep duration will appear in nondescending order. -(alarm-single) thread 0: duration=10, iteration=1, product=10 -(alarm-single) thread 1: duration=20, iteration=1, product=20 -(alarm-single) thread 2: duration=30, iteration=1, product=30 -(alarm-single) thread 3: duration=40, iteration=1, product=40 -(alarm-single) thread 4: duration=50, iteration=1, product=50 -(alarm-single) end -Execution of 'alarm-single' complete. -Timer: 354 ticks -Thread: 0 idle ticks, 357 kernel ticks, 0 user ticks -Console: 982 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-single.result b/pintos-env/pintos/threads/build/tests/threads/alarm-single.result deleted file mode 100644 index 7ef22e9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-single.result +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-zero.errors b/pintos-env/pintos/threads/build/tests/threads/alarm-zero.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-zero.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-zero.output b/pintos-env/pintos/threads/build/tests/threads/alarm-zero.output deleted file mode 100644 index 4504436..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-zero.output +++ /dev/null @@ -1,24 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run alarm-zero -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'alarm-zero': -(alarm-zero) begin -(alarm-zero) PASS -(alarm-zero) end -Execution of 'alarm-zero' complete. -Timer: 33 ticks -Thread: 0 idle ticks, 35 kernel ticks, 0 user ticks -Console: 381 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/alarm-zero.result b/pintos-env/pintos/threads/build/tests/threads/alarm-zero.result deleted file mode 100644 index 7ef22e9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/alarm-zero.result +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.output deleted file mode 100644 index 3c14cd0..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.output +++ /dev/null @@ -1,30 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-block -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-block': -(mlfqs-block) begin -(mlfqs-block) Main thread acquiring lock. -(mlfqs-block) Main thread creating block thread, sleeping 25 seconds... -(mlfqs-block) Block thread spinning for 20 seconds... -(mlfqs-block) Block thread acquiring lock... -(mlfqs-block) Main thread spinning for 5 seconds... -(mlfqs-block) Main thread releasing lock. -(mlfqs-block) Block thread should have already acquired lock. -(mlfqs-block) end -Execution of 'mlfqs-block' complete. -Timer: 3058 ticks -Thread: 0 idle ticks, 3061 kernel ticks, 0 user ticks -Console: 748 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.result deleted file mode 100644 index b80c566..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-block.result +++ /dev/null @@ -1,25 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (mlfqs-block) begin - (mlfqs-block) Main thread acquiring lock. - (mlfqs-block) Main thread creating block thread, sleeping 25 seconds... - (mlfqs-block) Block thread spinning for 20 seconds... - (mlfqs-block) Block thread acquiring lock... - (mlfqs-block) Main thread spinning for 5 seconds... - (mlfqs-block) Main thread releasing lock. - (mlfqs-block) ...got it. - (mlfqs-block) Block thread should have already acquired lock. - (mlfqs-block) end -Differences in `diff -u' format: - (mlfqs-block) begin - (mlfqs-block) Main thread acquiring lock. - (mlfqs-block) Main thread creating block thread, sleeping 25 seconds... - (mlfqs-block) Block thread spinning for 20 seconds... - (mlfqs-block) Block thread acquiring lock... - (mlfqs-block) Main thread spinning for 5 seconds... - (mlfqs-block) Main thread releasing lock. -- (mlfqs-block) ...got it. - (mlfqs-block) Block thread should have already acquired lock. - (mlfqs-block) end diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.output deleted file mode 100644 index 534463b..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.output +++ /dev/null @@ -1,28 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-fair-2 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-fair-2': -(mlfqs-fair-2) begin -(mlfqs-fair-2) Starting 2 threads... -(mlfqs-fair-2) Starting threads took 7 ticks. -(mlfqs-fair-2) Sleeping 40 seconds to let threads run, please wait... -(mlfqs-fair-2) Thread 0 received 1501 ticks. -(mlfqs-fair-2) Thread 1 received 1501 ticks. -(mlfqs-fair-2) end -Execution of 'mlfqs-fair-2' complete. -Timer: 4059 ticks -Thread: 0 idle ticks, 4062 kernel ticks, 0 user ticks -Console: 627 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.result deleted file mode 100644 index 7ef22e9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-2.result +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.output deleted file mode 100644 index 2e64b68..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.output +++ /dev/null @@ -1,46 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-fair-20 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-fair-20': -(mlfqs-fair-20) begin -(mlfqs-fair-20) Starting 20 threads... -(mlfqs-fair-20) Starting threads took 46 ticks. -(mlfqs-fair-20) Sleeping 40 seconds to let threads run, please wait... -(mlfqs-fair-20) Thread 0 received 152 ticks. -(mlfqs-fair-20) Thread 1 received 149 ticks. -(mlfqs-fair-20) Thread 2 received 148 ticks. -(mlfqs-fair-20) Thread 3 received 149 ticks. -(mlfqs-fair-20) Thread 4 received 148 ticks. -(mlfqs-fair-20) Thread 5 received 148 ticks. -(mlfqs-fair-20) Thread 6 received 148 ticks. -(mlfqs-fair-20) Thread 7 received 149 ticks. -(mlfqs-fair-20) Thread 8 received 148 ticks. -(mlfqs-fair-20) Thread 9 received 148 ticks. -(mlfqs-fair-20) Thread 10 received 149 ticks. -(mlfqs-fair-20) Thread 11 received 152 ticks. -(mlfqs-fair-20) Thread 12 received 153 ticks. -(mlfqs-fair-20) Thread 13 received 152 ticks. -(mlfqs-fair-20) Thread 14 received 153 ticks. -(mlfqs-fair-20) Thread 15 received 153 ticks. -(mlfqs-fair-20) Thread 16 received 152 ticks. -(mlfqs-fair-20) Thread 17 received 153 ticks. -(mlfqs-fair-20) Thread 18 received 153 ticks. -(mlfqs-fair-20) Thread 19 received 153 ticks. -(mlfqs-fair-20) end -Execution of 'mlfqs-fair-20' complete. -Timer: 4186 ticks -Thread: 0 idle ticks, 4188 kernel ticks, 0 user ticks -Console: 1457 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.result deleted file mode 100644 index 7ef22e9..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-fair-20.result +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.output deleted file mode 100644 index 8147114..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.output +++ /dev/null @@ -1,28 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-load-1 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-load-1': -(mlfqs-load-1) begin -(mlfqs-load-1) spinning for up to 45 seconds, please wait... -(mlfqs-load-1) FAIL: load average stayed below 0.5 for more than 45 seconds -Kernel PANIC at ../../tests/threads/tests.c:93 in fail(): test failed -Call stack: 0xc0027fee. -The `backtrace' program can make call stacks useful. -Read "Backtraces" in the "Debugging Tools" chapter -of the Pintos documentation for more information. -Timer: 4636 ticks -Thread: 0 idle ticks, 4636 kernel ticks, 0 user ticks -Console: 712 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.result deleted file mode 100644 index 53d0d2d..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-1.result +++ /dev/null @@ -1,5 +0,0 @@ -FAIL -Kernel panic in run: PANIC at ../../tests/threads/tests.c:93 in fail(): test failed -Call stack: 0xc0027fee -Translation of call stack: -0xc0027fee: debug_panic (.../../lib/kernel/debug.c:38) diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.output deleted file mode 100644 index 424bb97..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.output +++ /dev/null @@ -1,115 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-load-60 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-load-60': -(mlfqs-load-60) begin -(mlfqs-load-60) Starting 60 niced load threads... -(mlfqs-load-60) Starting threads took 1 seconds. -(mlfqs-load-60) After 0 seconds, load average=0.00. -(mlfqs-load-60) After 2 seconds, load average=0.00. -(mlfqs-load-60) After 4 seconds, load average=0.00. -(mlfqs-load-60) After 6 seconds, load average=0.00. -(mlfqs-load-60) After 8 seconds, load average=0.00. -(mlfqs-load-60) After 10 seconds, load average=0.00. -(mlfqs-load-60) After 12 seconds, load average=0.00. -(mlfqs-load-60) After 14 seconds, load average=0.00. -(mlfqs-load-60) After 16 seconds, load average=0.00. -(mlfqs-load-60) After 18 seconds, load average=0.00. -(mlfqs-load-60) After 20 seconds, load average=0.00. -(mlfqs-load-60) After 22 seconds, load average=0.00. -(mlfqs-load-60) After 24 seconds, load average=0.00. -(mlfqs-load-60) After 26 seconds, load average=0.00. -(mlfqs-load-60) After 28 seconds, load average=0.00. -(mlfqs-load-60) After 30 seconds, load average=0.00. -(mlfqs-load-60) After 32 seconds, load average=0.00. -(mlfqs-load-60) After 34 seconds, load average=0.00. -(mlfqs-load-60) After 36 seconds, load average=0.00. -(mlfqs-load-60) After 38 seconds, load average=0.00. -(mlfqs-load-60) After 40 seconds, load average=0.00. -(mlfqs-load-60) After 42 seconds, load average=0.00. -(mlfqs-load-60) After 44 seconds, load average=0.00. -(mlfqs-load-60) After 46 seconds, load average=0.00. -(mlfqs-load-60) After 48 seconds, load average=0.00. -(mlfqs-load-60) After 50 seconds, load average=0.00. -(mlfqs-load-60) After 52 seconds, load average=0.00. -(mlfqs-load-60) After 54 seconds, load average=0.00. -(mlfqs-load-60) After 56 seconds, load average=0.00. -(mlfqs-load-60) After 58 seconds, load average=0.00. -(mlfqs-load-60) After 60 seconds, load average=0.00. -(mlfqs-load-60) After 62 seconds, load average=0.00. -(mlfqs-load-60) After 64 seconds, load average=0.00. -(mlfqs-load-60) After 66 seconds, load average=0.00. -(mlfqs-load-60) After 68 seconds, load average=0.00. -(mlfqs-load-60) After 70 seconds, load average=0.00. -(mlfqs-load-60) After 72 seconds, load average=0.00. -(mlfqs-load-60) After 74 seconds, load average=0.00. -(mlfqs-load-60) After 76 seconds, load average=0.00. -(mlfqs-load-60) After 78 seconds, load average=0.00. -(mlfqs-load-60) After 80 seconds, load average=0.00. -(mlfqs-load-60) After 82 seconds, load average=0.00. -(mlfqs-load-60) After 84 seconds, load average=0.00. -(mlfqs-load-60) After 86 seconds, load average=0.00. -(mlfqs-load-60) After 88 seconds, load average=0.00. -(mlfqs-load-60) After 90 seconds, load average=0.00. -(mlfqs-load-60) After 92 seconds, load average=0.00. -(mlfqs-load-60) After 94 seconds, load average=0.00. -(mlfqs-load-60) After 96 seconds, load average=0.00. -(mlfqs-load-60) After 98 seconds, load average=0.00. -(mlfqs-load-60) After 100 seconds, load average=0.00. -(mlfqs-load-60) After 102 seconds, load average=0.00. -(mlfqs-load-60) After 104 seconds, load average=0.00. -(mlfqs-load-60) After 106 seconds, load average=0.00. -(mlfqs-load-60) After 108 seconds, load average=0.00. -(mlfqs-load-60) After 110 seconds, load average=0.00. -(mlfqs-load-60) After 112 seconds, load average=0.00. -(mlfqs-load-60) After 114 seconds, load average=0.00. -(mlfqs-load-60) After 116 seconds, load average=0.00. -(mlfqs-load-60) After 118 seconds, load average=0.00. -(mlfqs-load-60) After 120 seconds, load average=0.00. -(mlfqs-load-60) After 122 seconds, load average=0.00. -(mlfqs-load-60) After 124 seconds, load average=0.00. -(mlfqs-load-60) After 126 seconds, load average=0.00. -(mlfqs-load-60) After 128 seconds, load average=0.00. -(mlfqs-load-60) After 130 seconds, load average=0.00. -(mlfqs-load-60) After 132 seconds, load average=0.00. -(mlfqs-load-60) After 134 seconds, load average=0.00. -(mlfqs-load-60) After 136 seconds, load average=0.00. -(mlfqs-load-60) After 138 seconds, load average=0.00. -(mlfqs-load-60) After 140 seconds, load average=0.00. -(mlfqs-load-60) After 142 seconds, load average=0.00. -(mlfqs-load-60) After 144 seconds, load average=0.00. -(mlfqs-load-60) After 146 seconds, load average=0.00. -(mlfqs-load-60) After 148 seconds, load average=0.00. -(mlfqs-load-60) After 150 seconds, load average=0.00. -(mlfqs-load-60) After 152 seconds, load average=0.00. -(mlfqs-load-60) After 154 seconds, load average=0.00. -(mlfqs-load-60) After 156 seconds, load average=0.00. -(mlfqs-load-60) After 158 seconds, load average=0.00. -(mlfqs-load-60) After 160 seconds, load average=0.00. -(mlfqs-load-60) After 162 seconds, load average=0.00. -(mlfqs-load-60) After 164 seconds, load average=0.00. -(mlfqs-load-60) After 166 seconds, load average=0.00. -(mlfqs-load-60) After 168 seconds, load average=0.00. -(mlfqs-load-60) After 170 seconds, load average=0.00. -(mlfqs-load-60) After 172 seconds, load average=0.00. -(mlfqs-load-60) After 174 seconds, load average=0.00. -(mlfqs-load-60) After 176 seconds, load average=0.00. -(mlfqs-load-60) After 178 seconds, load average=0.00. -(mlfqs-load-60) end -Execution of 'mlfqs-load-60' complete. -Timer: 18837 ticks -Thread: 0 idle ticks, 18839 kernel ticks, 0 user ticks -Console: 5295 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.result deleted file mode 100644 index 2a04b01..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-60.result +++ /dev/null @@ -1,93 +0,0 @@ -FAIL -Some load average values were missing or differed from those expected by more than 3.5. - time actual <-> expected explanation ------- -------- --- -------- ---------------------------------------- - 2 0.00 = 2.95 - 4 0.00 <<< 4.84 Too small, by 1.34. - 6 0.00 <<< 6.66 Too small, by 3.16. - 8 0.00 <<< 8.42 Too small, by 4.92. - 10 0.00 <<< 10.13 Too small, by 6.63. - 12 0.00 <<< 11.78 Too small, by 8.28. - 14 0.00 <<< 13.37 Too small, by 9.87. - 16 0.00 <<< 14.91 Too small, by 11.41. - 18 0.00 <<< 16.40 Too small, by 12.90. - 20 0.00 <<< 17.84 Too small, by 14.34. - 22 0.00 <<< 19.24 Too small, by 15.74. - 24 0.00 <<< 20.58 Too small, by 17.08. - 26 0.00 <<< 21.89 Too small, by 18.39. - 28 0.00 <<< 23.15 Too small, by 19.65. - 30 0.00 <<< 24.37 Too small, by 20.87. - 32 0.00 <<< 25.54 Too small, by 22.04. - 34 0.00 <<< 26.68 Too small, by 23.18. - 36 0.00 <<< 27.78 Too small, by 24.28. - 38 0.00 <<< 28.85 Too small, by 25.35. - 40 0.00 <<< 29.88 Too small, by 26.38. - 42 0.00 <<< 30.87 Too small, by 27.37. - 44 0.00 <<< 31.84 Too small, by 28.34. - 46 0.00 <<< 32.77 Too small, by 29.27. - 48 0.00 <<< 33.67 Too small, by 30.17. - 50 0.00 <<< 34.54 Too small, by 31.04. - 52 0.00 <<< 35.38 Too small, by 31.88. - 54 0.00 <<< 36.19 Too small, by 32.69. - 56 0.00 <<< 36.98 Too small, by 33.48. - 58 0.00 <<< 37.74 Too small, by 34.24. - 60 0.00 <<< 37.48 Too small, by 33.98. - 62 0.00 <<< 36.24 Too small, by 32.74. - 64 0.00 <<< 35.04 Too small, by 31.54. - 66 0.00 <<< 33.88 Too small, by 30.38. - 68 0.00 <<< 32.76 Too small, by 29.26. - 70 0.00 <<< 31.68 Too small, by 28.18. - 72 0.00 <<< 30.63 Too small, by 27.13. - 74 0.00 <<< 29.62 Too small, by 26.12. - 76 0.00 <<< 28.64 Too small, by 25.14. - 78 0.00 <<< 27.69 Too small, by 24.19. - 80 0.00 <<< 26.78 Too small, by 23.28. - 82 0.00 <<< 25.89 Too small, by 22.39. - 84 0.00 <<< 25.04 Too small, by 21.54. - 86 0.00 <<< 24.21 Too small, by 20.71. - 88 0.00 <<< 23.41 Too small, by 19.91. - 90 0.00 <<< 22.64 Too small, by 19.14. - 92 0.00 <<< 21.89 Too small, by 18.39. - 94 0.00 <<< 21.16 Too small, by 17.66. - 96 0.00 <<< 20.46 Too small, by 16.96. - 98 0.00 <<< 19.79 Too small, by 16.29. - 100 0.00 <<< 19.13 Too small, by 15.63. - 102 0.00 <<< 18.50 Too small, by 15.00. - 104 0.00 <<< 17.89 Too small, by 14.39. - 106 0.00 <<< 17.30 Too small, by 13.80. - 108 0.00 <<< 16.73 Too small, by 13.23. - 110 0.00 <<< 16.17 Too small, by 12.67. - 112 0.00 <<< 15.64 Too small, by 12.14. - 114 0.00 <<< 15.12 Too small, by 11.62. - 116 0.00 <<< 14.62 Too small, by 11.12. - 118 0.00 <<< 14.14 Too small, by 10.64. - 120 0.00 <<< 13.67 Too small, by 10.17. - 122 0.00 <<< 13.22 Too small, by 9.72. - 124 0.00 <<< 12.78 Too small, by 9.28. - 126 0.00 <<< 12.36 Too small, by 8.86. - 128 0.00 <<< 11.95 Too small, by 8.45. - 130 0.00 <<< 11.56 Too small, by 8.06. - 132 0.00 <<< 11.17 Too small, by 7.67. - 134 0.00 <<< 10.80 Too small, by 7.30. - 136 0.00 <<< 10.45 Too small, by 6.95. - 138 0.00 <<< 10.10 Too small, by 6.60. - 140 0.00 <<< 9.77 Too small, by 6.27. - 142 0.00 <<< 9.45 Too small, by 5.95. - 144 0.00 <<< 9.13 Too small, by 5.63. - 146 0.00 <<< 8.83 Too small, by 5.33. - 148 0.00 <<< 8.54 Too small, by 5.04. - 150 0.00 <<< 8.26 Too small, by 4.76. - 152 0.00 <<< 7.98 Too small, by 4.48. - 154 0.00 <<< 7.72 Too small, by 4.22. - 156 0.00 <<< 7.47 Too small, by 3.97. - 158 0.00 <<< 7.22 Too small, by 3.72. - 160 0.00 <<< 6.98 Too small, by 3.48. - 162 0.00 <<< 6.75 Too small, by 3.25. - 164 0.00 <<< 6.53 Too small, by 3.03. - 166 0.00 <<< 6.31 Too small, by 2.81. - 168 0.00 <<< 6.10 Too small, by 2.60. - 170 0.00 <<< 5.90 Too small, by 2.40. - 172 0.00 <<< 5.70 Too small, by 2.20. - 174 0.00 <<< 5.52 Too small, by 2.02. - 176 0.00 <<< 5.33 Too small, by 1.83. - 178 0.00 <<< 5.16 Too small, by 1.66. diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.output deleted file mode 100644 index 0cbee1c..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.output +++ /dev/null @@ -1,115 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-load-avg -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-load-avg': -(mlfqs-load-avg) begin -(mlfqs-load-avg) Starting 60 load threads... -(mlfqs-load-avg) Starting threads took 1 seconds. -(mlfqs-load-avg) After 0 seconds, load average=0.00. -(mlfqs-load-avg) After 2 seconds, load average=0.00. -(mlfqs-load-avg) After 4 seconds, load average=0.00. -(mlfqs-load-avg) After 6 seconds, load average=0.00. -(mlfqs-load-avg) After 8 seconds, load average=0.00. -(mlfqs-load-avg) After 10 seconds, load average=0.00. -(mlfqs-load-avg) After 12 seconds, load average=0.00. -(mlfqs-load-avg) After 14 seconds, load average=0.00. -(mlfqs-load-avg) After 16 seconds, load average=0.00. -(mlfqs-load-avg) After 18 seconds, load average=0.00. -(mlfqs-load-avg) After 20 seconds, load average=0.00. -(mlfqs-load-avg) After 22 seconds, load average=0.00. -(mlfqs-load-avg) After 24 seconds, load average=0.00. -(mlfqs-load-avg) After 26 seconds, load average=0.00. -(mlfqs-load-avg) After 28 seconds, load average=0.00. -(mlfqs-load-avg) After 30 seconds, load average=0.00. -(mlfqs-load-avg) After 32 seconds, load average=0.00. -(mlfqs-load-avg) After 34 seconds, load average=0.00. -(mlfqs-load-avg) After 36 seconds, load average=0.00. -(mlfqs-load-avg) After 38 seconds, load average=0.00. -(mlfqs-load-avg) After 40 seconds, load average=0.00. -(mlfqs-load-avg) After 42 seconds, load average=0.00. -(mlfqs-load-avg) After 44 seconds, load average=0.00. -(mlfqs-load-avg) After 46 seconds, load average=0.00. -(mlfqs-load-avg) After 48 seconds, load average=0.00. -(mlfqs-load-avg) After 50 seconds, load average=0.00. -(mlfqs-load-avg) After 52 seconds, load average=0.00. -(mlfqs-load-avg) After 54 seconds, load average=0.00. -(mlfqs-load-avg) After 56 seconds, load average=0.00. -(mlfqs-load-avg) After 58 seconds, load average=0.00. -(mlfqs-load-avg) After 60 seconds, load average=0.00. -(mlfqs-load-avg) After 62 seconds, load average=0.00. -(mlfqs-load-avg) After 64 seconds, load average=0.00. -(mlfqs-load-avg) After 66 seconds, load average=0.00. -(mlfqs-load-avg) After 68 seconds, load average=0.00. -(mlfqs-load-avg) After 70 seconds, load average=0.00. -(mlfqs-load-avg) After 72 seconds, load average=0.00. -(mlfqs-load-avg) After 74 seconds, load average=0.00. -(mlfqs-load-avg) After 76 seconds, load average=0.00. -(mlfqs-load-avg) After 78 seconds, load average=0.00. -(mlfqs-load-avg) After 80 seconds, load average=0.00. -(mlfqs-load-avg) After 82 seconds, load average=0.00. -(mlfqs-load-avg) After 84 seconds, load average=0.00. -(mlfqs-load-avg) After 86 seconds, load average=0.00. -(mlfqs-load-avg) After 88 seconds, load average=0.00. -(mlfqs-load-avg) After 90 seconds, load average=0.00. -(mlfqs-load-avg) After 92 seconds, load average=0.00. -(mlfqs-load-avg) After 94 seconds, load average=0.00. -(mlfqs-load-avg) After 96 seconds, load average=0.00. -(mlfqs-load-avg) After 98 seconds, load average=0.00. -(mlfqs-load-avg) After 100 seconds, load average=0.00. -(mlfqs-load-avg) After 102 seconds, load average=0.00. -(mlfqs-load-avg) After 104 seconds, load average=0.00. -(mlfqs-load-avg) After 106 seconds, load average=0.00. -(mlfqs-load-avg) After 108 seconds, load average=0.00. -(mlfqs-load-avg) After 110 seconds, load average=0.00. -(mlfqs-load-avg) After 112 seconds, load average=0.00. -(mlfqs-load-avg) After 114 seconds, load average=0.00. -(mlfqs-load-avg) After 116 seconds, load average=0.00. -(mlfqs-load-avg) After 118 seconds, load average=0.00. -(mlfqs-load-avg) After 120 seconds, load average=0.00. -(mlfqs-load-avg) After 122 seconds, load average=0.00. -(mlfqs-load-avg) After 124 seconds, load average=0.00. -(mlfqs-load-avg) After 126 seconds, load average=0.00. -(mlfqs-load-avg) After 128 seconds, load average=0.00. -(mlfqs-load-avg) After 130 seconds, load average=0.00. -(mlfqs-load-avg) After 132 seconds, load average=0.00. -(mlfqs-load-avg) After 134 seconds, load average=0.00. -(mlfqs-load-avg) After 136 seconds, load average=0.00. -(mlfqs-load-avg) After 138 seconds, load average=0.00. -(mlfqs-load-avg) After 140 seconds, load average=0.00. -(mlfqs-load-avg) After 142 seconds, load average=0.00. -(mlfqs-load-avg) After 144 seconds, load average=0.00. -(mlfqs-load-avg) After 146 seconds, load average=0.00. -(mlfqs-load-avg) After 148 seconds, load average=0.00. -(mlfqs-load-avg) After 150 seconds, load average=0.00. -(mlfqs-load-avg) After 152 seconds, load average=0.00. -(mlfqs-load-avg) After 154 seconds, load average=0.00. -(mlfqs-load-avg) After 156 seconds, load average=0.00. -(mlfqs-load-avg) After 158 seconds, load average=0.00. -(mlfqs-load-avg) After 160 seconds, load average=0.00. -(mlfqs-load-avg) After 162 seconds, load average=0.00. -(mlfqs-load-avg) After 164 seconds, load average=0.00. -(mlfqs-load-avg) After 166 seconds, load average=0.00. -(mlfqs-load-avg) After 168 seconds, load average=0.00. -(mlfqs-load-avg) After 170 seconds, load average=0.00. -(mlfqs-load-avg) After 172 seconds, load average=0.00. -(mlfqs-load-avg) After 174 seconds, load average=0.00. -(mlfqs-load-avg) After 176 seconds, load average=0.00. -(mlfqs-load-avg) After 178 seconds, load average=0.00. -(mlfqs-load-avg) end -Execution of 'mlfqs-load-avg' complete. -Timer: 18837 ticks -Thread: 0 idle ticks, 18839 kernel ticks, 0 user ticks -Console: 5386 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.result deleted file mode 100644 index 74730bc..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-load-avg.result +++ /dev/null @@ -1,93 +0,0 @@ -FAIL -Some load average values were missing or differed from those expected by more than 2.5. - time actual <-> expected explanation ------- -------- --- -------- ---------------------------------------- - 2 0.00 = 0.05 - 4 0.00 = 0.16 - 6 0.00 = 0.34 - 8 0.00 = 0.58 - 10 0.00 = 0.87 - 12 0.00 = 1.22 - 14 0.00 = 1.63 - 16 0.00 = 2.09 - 18 0.00 <<< 2.60 Too small, by 0.10. - 20 0.00 <<< 3.16 Too small, by 0.66. - 22 0.00 <<< 3.76 Too small, by 1.26. - 24 0.00 <<< 4.42 Too small, by 1.92. - 26 0.00 <<< 5.11 Too small, by 2.61. - 28 0.00 <<< 5.85 Too small, by 3.35. - 30 0.00 <<< 6.63 Too small, by 4.13. - 32 0.00 <<< 7.46 Too small, by 4.96. - 34 0.00 <<< 8.32 Too small, by 5.82. - 36 0.00 <<< 9.22 Too small, by 6.72. - 38 0.00 <<< 10.15 Too small, by 7.65. - 40 0.00 <<< 11.12 Too small, by 8.62. - 42 0.00 <<< 12.13 Too small, by 9.63. - 44 0.00 <<< 13.16 Too small, by 10.66. - 46 0.00 <<< 14.23 Too small, by 11.73. - 48 0.00 <<< 15.33 Too small, by 12.83. - 50 0.00 <<< 16.46 Too small, by 13.96. - 52 0.00 <<< 17.62 Too small, by 15.12. - 54 0.00 <<< 18.81 Too small, by 16.31. - 56 0.00 <<< 20.02 Too small, by 17.52. - 58 0.00 <<< 21.26 Too small, by 18.76. - 60 0.00 <<< 22.52 Too small, by 20.02. - 62 0.00 <<< 23.71 Too small, by 21.21. - 64 0.00 <<< 24.80 Too small, by 22.30. - 66 0.00 <<< 25.78 Too small, by 23.28. - 68 0.00 <<< 26.66 Too small, by 24.16. - 70 0.00 <<< 27.45 Too small, by 24.95. - 72 0.00 <<< 28.14 Too small, by 25.64. - 74 0.00 <<< 28.75 Too small, by 26.25. - 76 0.00 <<< 29.27 Too small, by 26.77. - 78 0.00 <<< 29.71 Too small, by 27.21. - 80 0.00 <<< 30.06 Too small, by 27.56. - 82 0.00 <<< 30.34 Too small, by 27.84. - 84 0.00 <<< 30.55 Too small, by 28.05. - 86 0.00 <<< 30.68 Too small, by 28.18. - 88 0.00 <<< 30.74 Too small, by 28.24. - 90 0.00 <<< 30.73 Too small, by 28.23. - 92 0.00 <<< 30.66 Too small, by 28.16. - 94 0.00 <<< 30.52 Too small, by 28.02. - 96 0.00 <<< 30.32 Too small, by 27.82. - 98 0.00 <<< 30.06 Too small, by 27.56. - 100 0.00 <<< 29.74 Too small, by 27.24. - 102 0.00 <<< 29.37 Too small, by 26.87. - 104 0.00 <<< 28.95 Too small, by 26.45. - 106 0.00 <<< 28.47 Too small, by 25.97. - 108 0.00 <<< 27.94 Too small, by 25.44. - 110 0.00 <<< 27.36 Too small, by 24.86. - 112 0.00 <<< 26.74 Too small, by 24.24. - 114 0.00 <<< 26.07 Too small, by 23.57. - 116 0.00 <<< 25.36 Too small, by 22.86. - 118 0.00 <<< 24.60 Too small, by 22.10. - 120 0.00 <<< 23.81 Too small, by 21.31. - 122 0.00 <<< 23.02 Too small, by 20.52. - 124 0.00 <<< 22.26 Too small, by 19.76. - 126 0.00 <<< 21.52 Too small, by 19.02. - 128 0.00 <<< 20.81 Too small, by 18.31. - 130 0.00 <<< 20.12 Too small, by 17.62. - 132 0.00 <<< 19.46 Too small, by 16.96. - 134 0.00 <<< 18.81 Too small, by 16.31. - 136 0.00 <<< 18.19 Too small, by 15.69. - 138 0.00 <<< 17.59 Too small, by 15.09. - 140 0.00 <<< 17.01 Too small, by 14.51. - 142 0.00 <<< 16.45 Too small, by 13.95. - 144 0.00 <<< 15.90 Too small, by 13.40. - 146 0.00 <<< 15.38 Too small, by 12.88. - 148 0.00 <<< 14.87 Too small, by 12.37. - 150 0.00 <<< 14.38 Too small, by 11.88. - 152 0.00 <<< 13.90 Too small, by 11.40. - 154 0.00 <<< 13.44 Too small, by 10.94. - 156 0.00 <<< 13.00 Too small, by 10.50. - 158 0.00 <<< 12.57 Too small, by 10.07. - 160 0.00 <<< 12.15 Too small, by 9.65. - 162 0.00 <<< 11.75 Too small, by 9.25. - 164 0.00 <<< 11.36 Too small, by 8.86. - 166 0.00 <<< 10.99 Too small, by 8.49. - 168 0.00 <<< 10.62 Too small, by 8.12. - 170 0.00 <<< 10.27 Too small, by 7.77. - 172 0.00 <<< 9.93 Too small, by 7.43. - 174 0.00 <<< 9.61 Too small, by 7.11. - 176 0.00 <<< 9.29 Too small, by 6.79. - 178 0.00 <<< 8.98 Too small, by 6.48. diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.output deleted file mode 100644 index d6718bd..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.output +++ /dev/null @@ -1,36 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-nice-10 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-nice-10': -(mlfqs-nice-10) begin -(mlfqs-nice-10) Starting 10 threads... -(mlfqs-nice-10) Starting threads took 24 ticks. -(mlfqs-nice-10) Sleeping 40 seconds to let threads run, please wait... -(mlfqs-nice-10) Thread 0 received 300 ticks. -(mlfqs-nice-10) Thread 1 received 300 ticks. -(mlfqs-nice-10) Thread 2 received 301 ticks. -(mlfqs-nice-10) Thread 3 received 301 ticks. -(mlfqs-nice-10) Thread 4 received 301 ticks. -(mlfqs-nice-10) Thread 5 received 300 ticks. -(mlfqs-nice-10) Thread 6 received 300 ticks. -(mlfqs-nice-10) Thread 7 received 300 ticks. -(mlfqs-nice-10) Thread 8 received 301 ticks. -(mlfqs-nice-10) Thread 9 received 300 ticks. -(mlfqs-nice-10) end -Execution of 'mlfqs-nice-10' complete. -Timer: 4114 ticks -Thread: 0 idle ticks, 4116 kernel ticks, 0 user ticks -Console: 997 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.result deleted file mode 100644 index 9f389ca..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-10.result +++ /dev/null @@ -1,14 +0,0 @@ -FAIL -Some tick counts were missing or differed from those expected by more than 25. -thread actual <-> expected explanation ------- -------- --- -------- ---------------------------------------- - 0 300 <<< 672 Too small, by 347. - 1 300 <<< 588 Too small, by 263. - 2 301 <<< 492 Too small, by 166. - 3 301 <<< 408 Too small, by 82. - 4 301 = 316 - 5 300 >>> 232 Too big, by 43. - 6 300 >>> 152 Too big, by 123. - 7 300 >>> 92 Too big, by 183. - 8 301 >>> 40 Too big, by 236. - 9 300 >>> 8 Too big, by 267. diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.output deleted file mode 100644 index c05e416..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.output +++ /dev/null @@ -1,28 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-nice-2 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-nice-2': -(mlfqs-nice-2) begin -(mlfqs-nice-2) Starting 2 threads... -(mlfqs-nice-2) Starting threads took 7 ticks. -(mlfqs-nice-2) Sleeping 40 seconds to let threads run, please wait... -(mlfqs-nice-2) Thread 0 received 1501 ticks. -(mlfqs-nice-2) Thread 1 received 1501 ticks. -(mlfqs-nice-2) end -Execution of 'mlfqs-nice-2' complete. -Timer: 4059 ticks -Thread: 0 idle ticks, 4062 kernel ticks, 0 user ticks -Console: 627 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.result deleted file mode 100644 index a5be8f0..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-nice-2.result +++ /dev/null @@ -1,6 +0,0 @@ -FAIL -Some tick counts were missing or differed from those expected by more than 50. -thread actual <-> expected explanation ------- -------- --- -------- ---------------------------------------- - 0 1501 <<< 1904 Too small, by 353. - 1 1501 >>> 1096 Too big, by 355. diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.errors b/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.output b/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.output deleted file mode 100644 index 3f0fd82..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.output +++ /dev/null @@ -1,114 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q -mlfqs run mlfqs-recent-1 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'mlfqs-recent-1': -(mlfqs-recent-1) begin -(mlfqs-recent-1) Sleeping 10 seconds to allow recent_cpu to decay, please wait... -(mlfqs-recent-1) After 2 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 4 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 6 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 8 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 10 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 12 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 14 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 16 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 18 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 20 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 22 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 24 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 26 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 28 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 30 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 32 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 34 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 36 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 38 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 40 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 42 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 44 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 46 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 48 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 50 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 52 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 54 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 56 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 58 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 60 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 62 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 64 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 66 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 68 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 70 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 72 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 74 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 76 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 78 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 80 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 82 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 84 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 86 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 88 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 90 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 92 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 94 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 96 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 98 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 100 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 102 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 104 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 106 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 108 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 110 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 112 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 114 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 116 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 118 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 120 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 122 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 124 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 126 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 128 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 130 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 132 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 134 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 136 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 138 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 140 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 142 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 144 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 146 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 148 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 150 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 152 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 154 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 156 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 158 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 160 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 162 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 164 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 166 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 168 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 170 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 172 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 174 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 176 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 178 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) After 180 seconds, recent_cpu is 0.00, load_avg is 0.00. -(mlfqs-recent-1) end -Execution of 'mlfqs-recent-1' complete. -Timer: 19014 ticks -Thread: 0 idle ticks, 19017 kernel ticks, 0 user ticks -Console: 7085 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.result b/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.result deleted file mode 100644 index ba8374e..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/mlfqs-recent-1.result +++ /dev/null @@ -1,93 +0,0 @@ -FAIL -Some recent_cpu values were missing or differed from those expected by more than 2.5. - time actual <-> expected explanation ------- -------- --- -------- ---------------------------------------- - 2 0.00 <<< 6.40 Too small, by 3.90. - 4 0.00 <<< 12.60 Too small, by 10.10. - 6 0.00 <<< 18.61 Too small, by 16.11. - 8 0.00 <<< 24.44 Too small, by 21.94. - 10 0.00 <<< 30.08 Too small, by 27.58. - 12 0.00 <<< 35.54 Too small, by 33.04. - 14 0.00 <<< 40.83 Too small, by 38.33. - 16 0.00 <<< 45.96 Too small, by 43.46. - 18 0.00 <<< 50.92 Too small, by 48.42. - 20 0.00 <<< 55.73 Too small, by 53.23. - 22 0.00 <<< 60.39 Too small, by 57.89. - 24 0.00 <<< 64.90 Too small, by 62.40. - 26 0.00 <<< 69.27 Too small, by 66.77. - 28 0.00 <<< 73.50 Too small, by 71.00. - 30 0.00 <<< 77.60 Too small, by 75.10. - 32 0.00 <<< 81.56 Too small, by 79.06. - 34 0.00 <<< 85.40 Too small, by 82.90. - 36 0.00 <<< 89.12 Too small, by 86.62. - 38 0.00 <<< 92.72 Too small, by 90.22. - 40 0.00 <<< 96.20 Too small, by 93.70. - 42 0.00 <<< 99.57 Too small, by 97.07. - 44 0.00 <<< 102.84 Too small, by 100.34. - 46 0.00 <<< 106.00 Too small, by 103.50. - 48 0.00 <<< 109.06 Too small, by 106.56. - 50 0.00 <<< 112.02 Too small, by 109.52. - 52 0.00 <<< 114.89 Too small, by 112.39. - 54 0.00 <<< 117.66 Too small, by 115.16. - 56 0.00 <<< 120.34 Too small, by 117.84. - 58 0.00 <<< 122.94 Too small, by 120.44. - 60 0.00 <<< 125.46 Too small, by 122.96. - 62 0.00 <<< 127.89 Too small, by 125.39. - 64 0.00 <<< 130.25 Too small, by 127.75. - 66 0.00 <<< 132.53 Too small, by 130.03. - 68 0.00 <<< 134.73 Too small, by 132.23. - 70 0.00 <<< 136.86 Too small, by 134.36. - 72 0.00 <<< 138.93 Too small, by 136.43. - 74 0.00 <<< 140.93 Too small, by 138.43. - 76 0.00 <<< 142.86 Too small, by 140.36. - 78 0.00 <<< 144.73 Too small, by 142.23. - 80 0.00 <<< 146.54 Too small, by 144.04. - 82 0.00 <<< 148.29 Too small, by 145.79. - 84 0.00 <<< 149.99 Too small, by 147.49. - 86 0.00 <<< 151.63 Too small, by 149.13. - 88 0.00 <<< 153.21 Too small, by 150.71. - 90 0.00 <<< 154.75 Too small, by 152.25. - 92 0.00 <<< 156.23 Too small, by 153.73. - 94 0.00 <<< 157.67 Too small, by 155.17. - 96 0.00 <<< 159.06 Too small, by 156.56. - 98 0.00 <<< 160.40 Too small, by 157.90. - 100 0.00 <<< 161.70 Too small, by 159.20. - 102 0.00 <<< 162.96 Too small, by 160.46. - 104 0.00 <<< 164.18 Too small, by 161.68. - 106 0.00 <<< 165.35 Too small, by 162.85. - 108 0.00 <<< 166.49 Too small, by 163.99. - 110 0.00 <<< 167.59 Too small, by 165.09. - 112 0.00 <<< 168.66 Too small, by 166.16. - 114 0.00 <<< 169.69 Too small, by 167.19. - 116 0.00 <<< 170.69 Too small, by 168.19. - 118 0.00 <<< 171.65 Too small, by 169.15. - 120 0.00 <<< 172.58 Too small, by 170.08. - 122 0.00 <<< 173.49 Too small, by 170.99. - 124 0.00 <<< 174.36 Too small, by 171.86. - 126 0.00 <<< 175.20 Too small, by 172.70. - 128 0.00 <<< 176.02 Too small, by 173.52. - 130 0.00 <<< 176.81 Too small, by 174.31. - 132 0.00 <<< 177.57 Too small, by 175.07. - 134 0.00 <<< 178.31 Too small, by 175.81. - 136 0.00 <<< 179.02 Too small, by 176.52. - 138 0.00 <<< 179.72 Too small, by 177.22. - 140 0.00 <<< 180.38 Too small, by 177.88. - 142 0.00 <<< 181.03 Too small, by 178.53. - 144 0.00 <<< 181.65 Too small, by 179.15. - 146 0.00 <<< 182.26 Too small, by 179.76. - 148 0.00 <<< 182.84 Too small, by 180.34. - 150 0.00 <<< 183.41 Too small, by 180.91. - 152 0.00 <<< 183.96 Too small, by 181.46. - 154 0.00 <<< 184.49 Too small, by 181.99. - 156 0.00 <<< 185.00 Too small, by 182.50. - 158 0.00 <<< 185.49 Too small, by 182.99. - 160 0.00 <<< 185.97 Too small, by 183.47. - 162 0.00 <<< 186.43 Too small, by 183.93. - 164 0.00 <<< 186.88 Too small, by 184.38. - 166 0.00 <<< 187.31 Too small, by 184.81. - 168 0.00 <<< 187.73 Too small, by 185.23. - 170 0.00 <<< 188.14 Too small, by 185.64. - 172 0.00 <<< 188.53 Too small, by 186.03. - 174 0.00 <<< 188.91 Too small, by 186.41. - 176 0.00 <<< 189.27 Too small, by 186.77. - 178 0.00 <<< 189.63 Too small, by 187.13. diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-change.errors b/pintos-env/pintos/threads/build/tests/threads/priority-change.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-change.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-change.output b/pintos-env/pintos/threads/build/tests/threads/priority-change.output deleted file mode 100644 index afbe50b..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-change.output +++ /dev/null @@ -1,26 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-change -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-change': -(priority-change) begin -(priority-change) Creating a high-priority thread 2. -(priority-change) Thread 2 should have just lowered its priority. -(priority-change) Thread 2 should have just exited. -(priority-change) end -Execution of 'priority-change' complete. -Timer: 51 ticks -Thread: 0 idle ticks, 53 kernel ticks, 0 user ticks -Console: 559 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-change.result b/pintos-env/pintos/threads/build/tests/threads/priority-change.result deleted file mode 100644 index 91f3f2e..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-change.result +++ /dev/null @@ -1,19 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-change) begin - (priority-change) Creating a high-priority thread 2. - (priority-change) Thread 2 now lowering priority. - (priority-change) Thread 2 should have just lowered its priority. - (priority-change) Thread 2 exiting. - (priority-change) Thread 2 should have just exited. - (priority-change) end -Differences in `diff -u' format: - (priority-change) begin - (priority-change) Creating a high-priority thread 2. -- (priority-change) Thread 2 now lowering priority. - (priority-change) Thread 2 should have just lowered its priority. -- (priority-change) Thread 2 exiting. - (priority-change) Thread 2 should have just exited. - (priority-change) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-condvar.errors b/pintos-env/pintos/threads/build/tests/threads/priority-condvar.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-condvar.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-condvar.output b/pintos-env/pintos/threads/build/tests/threads/priority-condvar.output deleted file mode 100644 index aac68f3..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-condvar.output +++ /dev/null @@ -1,43 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-condvar -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-condvar': -(priority-condvar) begin -(priority-condvar) Thread priority 23 starting. -(priority-condvar) Thread priority 22 starting. -(priority-condvar) Thread priority 30 starting. -(priority-condvar) Thread priority 28 starting. -(priority-condvar) Thread priority 27 starting. -(priority-condvar) Thread priority 25 starting. -(priority-condvar) Thread priority 24 starting. -(priority-condvar) Thread priority 29 starting. -(priority-condvar) Thread priority 26 starting. -(priority-condvar) Thread priority 21 starting. -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) Signaling... -(priority-condvar) end -Execution of 'priority-condvar' complete. -Timer: 138 ticks -Thread: 0 idle ticks, 140 kernel ticks, 0 user ticks -Console: 1195 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-condvar.result b/pintos-env/pintos/threads/build/tests/threads/priority-condvar.result deleted file mode 100644 index a96628d..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-condvar.result +++ /dev/null @@ -1,72 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-condvar) begin - (priority-condvar) Thread priority 23 starting. - (priority-condvar) Thread priority 22 starting. - (priority-condvar) Thread priority 21 starting. - (priority-condvar) Thread priority 30 starting. - (priority-condvar) Thread priority 29 starting. - (priority-condvar) Thread priority 28 starting. - (priority-condvar) Thread priority 27 starting. - (priority-condvar) Thread priority 26 starting. - (priority-condvar) Thread priority 25 starting. - (priority-condvar) Thread priority 24 starting. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 30 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 29 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 28 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 27 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 26 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 25 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 24 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 23 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 22 woke up. - (priority-condvar) Signaling... - (priority-condvar) Thread priority 21 woke up. - (priority-condvar) end -Differences in `diff -u' format: - (priority-condvar) begin - (priority-condvar) Thread priority 23 starting. - (priority-condvar) Thread priority 22 starting. -- (priority-condvar) Thread priority 21 starting. - (priority-condvar) Thread priority 30 starting. -- (priority-condvar) Thread priority 29 starting. - (priority-condvar) Thread priority 28 starting. - (priority-condvar) Thread priority 27 starting. -- (priority-condvar) Thread priority 26 starting. - (priority-condvar) Thread priority 25 starting. - (priority-condvar) Thread priority 24 starting. -+ (priority-condvar) Thread priority 29 starting. -+ (priority-condvar) Thread priority 26 starting. -+ (priority-condvar) Thread priority 21 starting. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 30 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 29 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 28 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 27 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 26 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 25 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 24 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 23 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 22 woke up. - (priority-condvar) Signaling... -- (priority-condvar) Thread priority 21 woke up. - (priority-condvar) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.errors b/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.output b/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.output deleted file mode 100644 index 93e9750..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.output +++ /dev/null @@ -1,37 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-donate-chain -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-donate-chain': -(priority-donate-chain) begin -(priority-donate-chain) main got lock. -(priority-donate-chain) main should have priority 3. Actual priority: 0. -(priority-donate-chain) main should have priority 6. Actual priority: 0. -(priority-donate-chain) interloper 1 finished. -(priority-donate-chain) interloper 2 finished. -(priority-donate-chain) main should have priority 9. Actual priority: 0. -(priority-donate-chain) main should have priority 12. Actual priority: 0. -(priority-donate-chain) interloper 3 finished. -(priority-donate-chain) interloper 4 finished. -(priority-donate-chain) main should have priority 15. Actual priority: 0. -(priority-donate-chain) interloper 5 finished. -(priority-donate-chain) main should have priority 18. Actual priority: 0. -(priority-donate-chain) main should have priority 21. Actual priority: 0. -(priority-donate-chain) main finishing with priority 0. -(priority-donate-chain) end -Execution of 'priority-donate-chain' complete. -Timer: 148 ticks -Thread: 0 idle ticks, 151 kernel ticks, 0 user ticks -Console: 1272 characters output -Keyboard: 0 keys pressed -Powering off...======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.result b/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.result deleted file mode 100644 index 5b9a568..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-chain.result +++ /dev/null @@ -1,94 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-donate-chain) begin - (priority-donate-chain) main got lock. - (priority-donate-chain) main should have priority 3. Actual priority: 3. - (priority-donate-chain) main should have priority 6. Actual priority: 6. - (priority-donate-chain) main should have priority 9. Actual priority: 9. - (priority-donate-chain) main should have priority 12. Actual priority: 12. - (priority-donate-chain) main should have priority 15. Actual priority: 15. - (priority-donate-chain) main should have priority 18. Actual priority: 18. - (priority-donate-chain) main should have priority 21. Actual priority: 21. - (priority-donate-chain) thread 1 got lock - (priority-donate-chain) thread 1 should have priority 21. Actual priority: 21 - (priority-donate-chain) thread 2 got lock - (priority-donate-chain) thread 2 should have priority 21. Actual priority: 21 - (priority-donate-chain) thread 3 got lock - (priority-donate-chain) thread 3 should have priority 21. Actual priority: 21 - (priority-donate-chain) thread 4 got lock - (priority-donate-chain) thread 4 should have priority 21. Actual priority: 21 - (priority-donate-chain) thread 5 got lock - (priority-donate-chain) thread 5 should have priority 21. Actual priority: 21 - (priority-donate-chain) thread 6 got lock - (priority-donate-chain) thread 6 should have priority 21. Actual priority: 21 - (priority-donate-chain) thread 7 got lock - (priority-donate-chain) thread 7 should have priority 21. Actual priority: 21 - (priority-donate-chain) thread 7 finishing with priority 21. - (priority-donate-chain) interloper 7 finished. - (priority-donate-chain) thread 6 finishing with priority 18. - (priority-donate-chain) interloper 6 finished. - (priority-donate-chain) thread 5 finishing with priority 15. - (priority-donate-chain) interloper 5 finished. - (priority-donate-chain) thread 4 finishing with priority 12. - (priority-donate-chain) interloper 4 finished. - (priority-donate-chain) thread 3 finishing with priority 9. - (priority-donate-chain) interloper 3 finished. - (priority-donate-chain) thread 2 finishing with priority 6. - (priority-donate-chain) interloper 2 finished. - (priority-donate-chain) thread 1 finishing with priority 3. - (priority-donate-chain) interloper 1 finished. - (priority-donate-chain) main finishing with priority 0. - (priority-donate-chain) end -Differences in `diff -u' format: - (priority-donate-chain) begin - (priority-donate-chain) main got lock. -- (priority-donate-chain) main should have priority 3. Actual priority: 3. -- (priority-donate-chain) main should have priority 6. Actual priority: 6. -- (priority-donate-chain) main should have priority 9. Actual priority: 9. -- (priority-donate-chain) main should have priority 12. Actual priority: 12. -- (priority-donate-chain) main should have priority 15. Actual priority: 15. -- (priority-donate-chain) main should have priority 18. Actual priority: 18. -- (priority-donate-chain) main should have priority 21. Actual priority: 21. -- (priority-donate-chain) thread 1 got lock -- (priority-donate-chain) thread 1 should have priority 21. Actual priority: 21 -- (priority-donate-chain) thread 2 got lock -- (priority-donate-chain) thread 2 should have priority 21. Actual priority: 21 -- (priority-donate-chain) thread 3 got lock -- (priority-donate-chain) thread 3 should have priority 21. Actual priority: 21 -- (priority-donate-chain) thread 4 got lock -- (priority-donate-chain) thread 4 should have priority 21. Actual priority: 21 -- (priority-donate-chain) thread 5 got lock -- (priority-donate-chain) thread 5 should have priority 21. Actual priority: 21 -- (priority-donate-chain) thread 6 got lock -- (priority-donate-chain) thread 6 should have priority 21. Actual priority: 21 -- (priority-donate-chain) thread 7 got lock -- (priority-donate-chain) thread 7 should have priority 21. Actual priority: 21 -- (priority-donate-chain) thread 7 finishing with priority 21. -- (priority-donate-chain) interloper 7 finished. -- (priority-donate-chain) thread 6 finishing with priority 18. -- (priority-donate-chain) interloper 6 finished. -- (priority-donate-chain) thread 5 finishing with priority 15. -- (priority-donate-chain) interloper 5 finished. -- (priority-donate-chain) thread 4 finishing with priority 12. -- (priority-donate-chain) interloper 4 finished. -- (priority-donate-chain) thread 3 finishing with priority 9. -- (priority-donate-chain) interloper 3 finished. -- (priority-donate-chain) thread 2 finishing with priority 6. -- (priority-donate-chain) interloper 2 finished. -- (priority-donate-chain) thread 1 finishing with priority 3. -+ (priority-donate-chain) main should have priority 3. Actual priority: 0. -+ (priority-donate-chain) main should have priority 6. Actual priority: 0. - (priority-donate-chain) interloper 1 finished. -+ (priority-donate-chain) interloper 2 finished. -+ (priority-donate-chain) main should have priority 9. Actual priority: 0. -+ (priority-donate-chain) main should have priority 12. Actual priority: 0. -+ (priority-donate-chain) interloper 3 finished. -+ (priority-donate-chain) interloper 4 finished. -+ (priority-donate-chain) main should have priority 15. Actual priority: 0. -+ (priority-donate-chain) interloper 5 finished. -+ (priority-donate-chain) main should have priority 18. Actual priority: 0. -+ (priority-donate-chain) main should have priority 21. Actual priority: 0. - (priority-donate-chain) main finishing with priority 0. - (priority-donate-chain) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.errors b/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.output b/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.output deleted file mode 100644 index 5db3b8d..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.output +++ /dev/null @@ -1,28 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-donate-lower -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-donate-lower': -(priority-donate-lower) begin -(priority-donate-lower) Main thread should have priority 41. Actual priority: 31. -(priority-donate-lower) Lowering base priority... -(priority-donate-lower) Main thread should have priority 41. Actual priority: 21. -(priority-donate-lower) acquire must already have finished. -(priority-donate-lower) Main thread should have priority 21. Actual priority: 21. -(priority-donate-lower) end -Execution of 'priority-donate-lower' complete. -Timer: 72 ticks -Thread: 0 idle ticks, 75 kernel ticks, 0 user ticks -Console: 777 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.result b/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.result deleted file mode 100644 index 174eb8f..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-lower.result +++ /dev/null @@ -1,25 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-donate-lower) begin - (priority-donate-lower) Main thread should have priority 41. Actual priority: 41. - (priority-donate-lower) Lowering base priority... - (priority-donate-lower) Main thread should have priority 41. Actual priority: 41. - (priority-donate-lower) acquire: got the lock - (priority-donate-lower) acquire: done - (priority-donate-lower) acquire must already have finished. - (priority-donate-lower) Main thread should have priority 21. Actual priority: 21. - (priority-donate-lower) end -Differences in `diff -u' format: - (priority-donate-lower) begin -- (priority-donate-lower) Main thread should have priority 41. Actual priority: 41. -+ (priority-donate-lower) Main thread should have priority 41. Actual priority: 31. - (priority-donate-lower) Lowering base priority... -- (priority-donate-lower) Main thread should have priority 41. Actual priority: 41. -- (priority-donate-lower) acquire: got the lock -- (priority-donate-lower) acquire: done -+ (priority-donate-lower) Main thread should have priority 41. Actual priority: 21. - (priority-donate-lower) acquire must already have finished. - (priority-donate-lower) Main thread should have priority 21. Actual priority: 21. - (priority-donate-lower) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.errors b/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.output b/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.output deleted file mode 100644 index 6517df1..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.output +++ /dev/null @@ -1,29 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-donate-multiple -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-donate-multiple': -(priority-donate-multiple) begin -(priority-donate-multiple) Main thread should have priority 32. Actual priority: 31. -(priority-donate-multiple) Main thread should have priority 33. Actual priority: 31. -(priority-donate-multiple) Thread b should have just finished. -(priority-donate-multiple) Main thread should have priority 32. Actual priority: 31. -(priority-donate-multiple) Thread a should have just finished. -(priority-donate-multiple) Main thread should have priority 31. Actual priority: 31. -(priority-donate-multiple) end -Execution of 'priority-donate-multiple' complete. -Timer: 86 ticks -Thread: 0 idle ticks, 89 kernel ticks, 0 user ticks -Console: 903 characters output -Keyboard: 0 keys pressed -Powering off...======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.result b/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.result deleted file mode 100644 index 3c71275..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple.result +++ /dev/null @@ -1,32 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-donate-multiple) begin - (priority-donate-multiple) Main thread should have priority 32. Actual priority: 32. - (priority-donate-multiple) Main thread should have priority 33. Actual priority: 33. - (priority-donate-multiple) Thread b acquired lock b. - (priority-donate-multiple) Thread b finished. - (priority-donate-multiple) Thread b should have just finished. - (priority-donate-multiple) Main thread should have priority 32. Actual priority: 32. - (priority-donate-multiple) Thread a acquired lock a. - (priority-donate-multiple) Thread a finished. - (priority-donate-multiple) Thread a should have just finished. - (priority-donate-multiple) Main thread should have priority 31. Actual priority: 31. - (priority-donate-multiple) end -Differences in `diff -u' format: - (priority-donate-multiple) begin -- (priority-donate-multiple) Main thread should have priority 32. Actual priority: 32. -- (priority-donate-multiple) Main thread should have priority 33. Actual priority: 33. -- (priority-donate-multiple) Thread b acquired lock b. -- (priority-donate-multiple) Thread b finished. -+ (priority-donate-multiple) Main thread should have priority 32. Actual priority: 31. -+ (priority-donate-multiple) Main thread should have priority 33. Actual priority: 31. - (priority-donate-multiple) Thread b should have just finished. -- (priority-donate-multiple) Main thread should have priority 32. Actual priority: 32. -- (priority-donate-multiple) Thread a acquired lock a. -- (priority-donate-multiple) Thread a finished. -+ (priority-donate-multiple) Main thread should have priority 32. Actual priority: 31. - (priority-donate-multiple) Thread a should have just finished. - (priority-donate-multiple) Main thread should have priority 31. Actual priority: 31. - (priority-donate-multiple) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.errors b/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.output b/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.output deleted file mode 100644 index 281c6ce..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.output +++ /dev/null @@ -1,31 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-donate-multiple2 -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-donate-multiple2': -(priority-donate-multiple2) begin -(priority-donate-multiple2) Main thread should have priority 34. Actual priority: 31. -(priority-donate-multiple2) Thread c finished. -(priority-donate-multiple2) Main thread should have priority 36. Actual priority: 31. -(priority-donate-multiple2) (priority-donate-multiple2) Thread a acquired lock a. -(priority-donate-multiple2) Thread a finished. -Main thread should have priority 36. Actual priority: 31. -(priority-donate-multiple2) Threads b, a, c should have just finished, in that order. -(priority-donate-multiple2) Main thread should have priority 31. Actual priority: 31. -(priority-donate-multiple2) end -Execution of 'priority-donate-multiple2' complete. -Timer: 103 ticks -Thread: 0 idle ticks, 106 kernel ticks, 0 user ticks -Console: 1022 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.result b/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.result deleted file mode 100644 index b1328ac..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-multiple2.result +++ /dev/null @@ -1,34 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-donate-multiple2) begin - (priority-donate-multiple2) Main thread should have priority 34. Actual priority: 34. - (priority-donate-multiple2) Main thread should have priority 36. Actual priority: 36. - (priority-donate-multiple2) Main thread should have priority 36. Actual priority: 36. - (priority-donate-multiple2) Thread b acquired lock b. - (priority-donate-multiple2) Thread b finished. - (priority-donate-multiple2) Thread a acquired lock a. - (priority-donate-multiple2) Thread a finished. - (priority-donate-multiple2) Thread c finished. - (priority-donate-multiple2) Threads b, a, c should have just finished, in that order. - (priority-donate-multiple2) Main thread should have priority 31. Actual priority: 31. - (priority-donate-multiple2) end -Differences in `diff -u' format: - (priority-donate-multiple2) begin -- (priority-donate-multiple2) Main thread should have priority 34. Actual priority: 34. -- (priority-donate-multiple2) Main thread should have priority 36. Actual priority: 36. -- (priority-donate-multiple2) Main thread should have priority 36. Actual priority: 36. -- (priority-donate-multiple2) Thread b acquired lock b. -- (priority-donate-multiple2) Thread b finished. -- (priority-donate-multiple2) Thread a acquired lock a. -- (priority-donate-multiple2) Thread a finished. -+ (priority-donate-multiple2) Main thread should have priority 34. Actual priority: 31. - (priority-donate-multiple2) Thread c finished. -+ (priority-donate-multiple2) Main thread should have priority 36. Actual priority: 31. -+ (priority-donate-multiple2) (priority-donate-multiple2) Thread a acquired lock a. -+ (priority-donate-multiple2) Thread a finished. -+ Main thread should have priority 36. Actual priority: 31. - (priority-donate-multiple2) Threads b, a, c should have just finished, in that order. - (priority-donate-multiple2) Main thread should have priority 31. Actual priority: 31. - (priority-donate-multiple2) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.errors b/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.output b/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.output deleted file mode 100644 index 81b42a2..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.output +++ /dev/null @@ -1,29 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-donate-nest -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-donate-nest': -(priority-donate-nest) begin -(priority-donate-nest) Low thread should have priority 32. Actual priority: 31. -(priority-donate-nest) Low thread should have priority 33. Actual priority: 31. -(priority-donate-nest) Medium thread should have priority 33. Actual priority: 32. -(priority-donate-nest) Medium thread got the lock. -(priority-donate-nest) Medium thread should just have finished. -(priority-donate-nest) Low thread should have priority 31. Actual priority: 31. -(priority-donate-nest) end -Execution of 'priority-donate-nest' complete. -Timer: 83 ticks -Thread: 0 idle ticks, 85 kernel ticks, 0 user ticks -Console: 855 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.result b/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.result deleted file mode 100644 index 1aee713..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-nest.result +++ /dev/null @@ -1,32 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-donate-nest) begin - (priority-donate-nest) Low thread should have priority 32. Actual priority: 32. - (priority-donate-nest) Low thread should have priority 33. Actual priority: 33. - (priority-donate-nest) Medium thread should have priority 33. Actual priority: 33. - (priority-donate-nest) Medium thread got the lock. - (priority-donate-nest) High thread got the lock. - (priority-donate-nest) High thread finished. - (priority-donate-nest) High thread should have just finished. - (priority-donate-nest) Middle thread finished. - (priority-donate-nest) Medium thread should just have finished. - (priority-donate-nest) Low thread should have priority 31. Actual priority: 31. - (priority-donate-nest) end -Differences in `diff -u' format: - (priority-donate-nest) begin -- (priority-donate-nest) Low thread should have priority 32. Actual priority: 32. -- (priority-donate-nest) Low thread should have priority 33. Actual priority: 33. -- (priority-donate-nest) Medium thread should have priority 33. Actual priority: 33. -+ (priority-donate-nest) Low thread should have priority 32. Actual priority: 31. -+ (priority-donate-nest) Low thread should have priority 33. Actual priority: 31. -+ (priority-donate-nest) Medium thread should have priority 33. Actual priority: 32. - (priority-donate-nest) Medium thread got the lock. -- (priority-donate-nest) High thread got the lock. -- (priority-donate-nest) High thread finished. -- (priority-donate-nest) High thread should have just finished. -- (priority-donate-nest) Middle thread finished. - (priority-donate-nest) Medium thread should just have finished. - (priority-donate-nest) Low thread should have priority 31. Actual priority: 31. - (priority-donate-nest) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.errors b/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.output b/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.output deleted file mode 100644 index e1124c1..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.output +++ /dev/null @@ -1,27 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-donate-one -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-donate-one': -(priority-donate-one) begin -(priority-donate-one) This thread should have priority 32. Actual priority: 31. -(priority-donate-one) This thread should have priority 33. Actual priority: 31. -(priority-donate-one) acquire2, acquire1 must already have finished, in that order. -(priority-donate-one) This should be the last line before finishing this test. -(priority-donate-one) end -Execution of 'priority-donate-one' complete. -Timer: 70 ticks -Thread: 0 idle ticks, 72 kernel ticks, 0 user ticks -Console: 733 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.result b/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.result deleted file mode 100644 index 0102de3..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-one.result +++ /dev/null @@ -1,27 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-donate-one) begin - (priority-donate-one) This thread should have priority 32. Actual priority: 32. - (priority-donate-one) This thread should have priority 33. Actual priority: 33. - (priority-donate-one) acquire2: got the lock - (priority-donate-one) acquire2: done - (priority-donate-one) acquire1: got the lock - (priority-donate-one) acquire1: done - (priority-donate-one) acquire2, acquire1 must already have finished, in that order. - (priority-donate-one) This should be the last line before finishing this test. - (priority-donate-one) end -Differences in `diff -u' format: - (priority-donate-one) begin -- (priority-donate-one) This thread should have priority 32. Actual priority: 32. -- (priority-donate-one) This thread should have priority 33. Actual priority: 33. -- (priority-donate-one) acquire2: got the lock -- (priority-donate-one) acquire2: done -- (priority-donate-one) acquire1: got the lock -- (priority-donate-one) acquire1: done -+ (priority-donate-one) This thread should have priority 32. Actual priority: 31. -+ (priority-donate-one) This thread should have priority 33. Actual priority: 31. - (priority-donate-one) acquire2, acquire1 must already have finished, in that order. - (priority-donate-one) This should be the last line before finishing this test. - (priority-donate-one) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.errors b/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.output b/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.output deleted file mode 100644 index 39ca211..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.output +++ /dev/null @@ -1,27 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-donate-sema -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-donate-sema': -(priority-donate-sema) begin -(priority-donate-sema) Thread L acquired lock. -(priority-donate-sema) Thread L downed semaphore. -(priority-donate-sema) Thread L finished. -(priority-donate-sema) Main thread finished. -(priority-donate-sema) end -Execution of 'priority-donate-sema' complete. -Timer: 60 ticks -Thread: 0 idle ticks, 62 kernel ticks, 0 user ticks -Console: 597 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.result b/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.result deleted file mode 100644 index 826082a..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-donate-sema.result +++ /dev/null @@ -1,23 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-donate-sema) begin - (priority-donate-sema) Thread L acquired lock. - (priority-donate-sema) Thread L downed semaphore. - (priority-donate-sema) Thread H acquired lock. - (priority-donate-sema) Thread H finished. - (priority-donate-sema) Thread M finished. - (priority-donate-sema) Thread L finished. - (priority-donate-sema) Main thread finished. - (priority-donate-sema) end -Differences in `diff -u' format: - (priority-donate-sema) begin - (priority-donate-sema) Thread L acquired lock. - (priority-donate-sema) Thread L downed semaphore. -- (priority-donate-sema) Thread H acquired lock. -- (priority-donate-sema) Thread H finished. -- (priority-donate-sema) Thread M finished. - (priority-donate-sema) Thread L finished. - (priority-donate-sema) Main thread finished. - (priority-donate-sema) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-fifo.errors b/pintos-env/pintos/threads/build/tests/threads/priority-fifo.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-fifo.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-fifo.output b/pintos-env/pintos/threads/build/tests/threads/priority-fifo.output deleted file mode 100644 index a520a2e..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-fifo.output +++ /dev/null @@ -1,41 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-fifo -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-fifo': -(priority-fifo) begin -(priority-fifo) 16 threads will iterate 16 times in the same order each time. -(priority-fifo) If the order varies then there is a bug. -(priority-fifo) iteration: 0 0 1 2 0 1 2 3 4 0 1 2 3 4 5 6 -(priority-fifo) iteration: 0 1 2 3 4 5 6 7 8 0 1 2 3 4 5 6 -(priority-fifo) iteration: 7 8 9 10 0 1 2 3 4 5 6 7 8 9 10 11 -(priority-fifo) iteration: 12 0 1 2 3 4 5 6 7 8 9 10 11 12 13 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 -(priority-fifo) iteration: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 -(priority-fifo) iteration: 2 3 4 5 6 7 8 9 10 11 12 13 14 15 3 4 -(priority-fifo) iteration: 5 6 7 8 9 10 11 12 13 14 15 5 6 7 8 9 -(priority-fifo) iteration: 10 11 12 13 14 15 7 8 9 10 11 12 13 14 15 9 -(priority-fifo) iteration: 10 11 12 13 14 15 11 12 13 14 15 13 14 15 14 15 -(priority-fifo) end -Execution of 'priority-fifo' complete. -Timer: 225 ticks -Thread: 0 idle ticks, 227 kernel ticks, 0 user ticks -Console: 1555 characters output -Keyboard: 0 keys pressed -Powering off..======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-fifo.result b/pintos-env/pintos/threads/build/tests/threads/priority-fifo.result deleted file mode 100644 index 54f9a56..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-fifo.result +++ /dev/null @@ -1,2 +0,0 @@ -FAIL -First iteration does not list all threads 0...15 diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-preempt.errors b/pintos-env/pintos/threads/build/tests/threads/priority-preempt.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-preempt.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-preempt.output b/pintos-env/pintos/threads/build/tests/threads/priority-preempt.output deleted file mode 100644 index 211ca0e..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-preempt.output +++ /dev/null @@ -1,25 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-preempt -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-preempt': -(priority-preempt) begin -(priority-preempt) (priority-preempt) Thread high-priority iteration 0 -The high-priority thread should have already completed. -(priority-preempt) end -Execution of 'priority-preempt' complete. -Timer: 46 ticks -Thread: 0 idle ticks, 49 kernel ticks, 0 user ticks -Console: 520 characters output -Keyboard: 0 keys pressed -Powering off...======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-preempt.result b/pintos-env/pintos/threads/build/tests/threads/priority-preempt.result deleted file mode 100644 index d26f4cd..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-preempt.result +++ /dev/null @@ -1,25 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-preempt) begin - (priority-preempt) Thread high-priority iteration 0 - (priority-preempt) Thread high-priority iteration 1 - (priority-preempt) Thread high-priority iteration 2 - (priority-preempt) Thread high-priority iteration 3 - (priority-preempt) Thread high-priority iteration 4 - (priority-preempt) Thread high-priority done! - (priority-preempt) The high-priority thread should have already completed. - (priority-preempt) end -Differences in `diff -u' format: - (priority-preempt) begin -- (priority-preempt) Thread high-priority iteration 0 -- (priority-preempt) Thread high-priority iteration 1 -- (priority-preempt) Thread high-priority iteration 2 -- (priority-preempt) Thread high-priority iteration 3 -- (priority-preempt) Thread high-priority iteration 4 -- (priority-preempt) Thread high-priority done! -- (priority-preempt) The high-priority thread should have already completed. -+ (priority-preempt) (priority-preempt) Thread high-priority iteration 0 -+ The high-priority thread should have already completed. - (priority-preempt) end diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-sema.errors b/pintos-env/pintos/threads/build/tests/threads/priority-sema.errors deleted file mode 100644 index 07f5cf4..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-sema.errors +++ /dev/null @@ -1,10 +0,0 @@ -Prototype mismatch: sub main::SIGVTALRM () vs none at /pintos-env/pintos/utils/pintos line 934. -Constant subroutine SIGVTALRM redefined at /pintos-env/pintos/utils/pintos line 926. -00000000000i[ ] reading configuration from bochsrc.txt -00000000000e[ ] user_shortcut: old-style syntax detected -00000000000i[ ] installing nogui module as the Bochs GUI -00000000000i[ ] using log file bochsout.txt -======================================================================== -Bochs is exiting with the following message: -[UNMP ] Shutdown port: shutdown requested -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-sema.output b/pintos-env/pintos/threads/build/tests/threads/priority-sema.output deleted file mode 100644 index 47b020e..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-sema.output +++ /dev/null @@ -1,34 +0,0 @@ -warning: can't find squish-pty, so terminal input will fail -bochs -q -PiLo hda1 -Loading.......... -Kernel command line: -q run priority-sema -Pintos booting with 4,096 kB RAM... -383 pages available in kernel pool. -383 pages available in user pool. -Calibrating timer... 204,600 loops/s. -Boot complete. -Executing 'priority-sema': -(priority-sema) begin -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) Back in main thread. -(priority-sema) end -Execution of 'priority-sema' complete. -Timer: 92 ticks -Thread: 0 idle ticks, 95 kernel ticks, 0 user ticks -Console: 748 characters output -Keyboard: 0 keys pressed -Powering off... -======================================================================== - Bochs x86 Emulator 2.6 - Built from SVN snapshot on September 2nd, 2012 - Compiled on Feb 17 2015 at 16:28:11 -======================================================================== diff --git a/pintos-env/pintos/threads/build/tests/threads/priority-sema.result b/pintos-env/pintos/threads/build/tests/threads/priority-sema.result deleted file mode 100644 index 251607c..0000000 --- a/pintos-env/pintos/threads/build/tests/threads/priority-sema.result +++ /dev/null @@ -1,49 +0,0 @@ -FAIL -Test output failed to match any acceptable form. - -Acceptable output: - (priority-sema) begin - (priority-sema) Thread priority 30 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 29 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 28 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 27 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 26 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 25 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 24 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 23 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 22 woke up. - (priority-sema) Back in main thread. - (priority-sema) Thread priority 21 woke up. - (priority-sema) Back in main thread. - (priority-sema) end -Differences in `diff -u' format: - (priority-sema) begin -- (priority-sema) Thread priority 30 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 29 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 28 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 27 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 26 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 25 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 24 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 23 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 22 woke up. - (priority-sema) Back in main thread. -- (priority-sema) Thread priority 21 woke up. - (priority-sema) Back in main thread. - (priority-sema) end diff --git a/pintos-env/pintos/threads/build/threads/kernel.lds.s b/pintos-env/pintos/threads/build/threads/kernel.lds.s deleted file mode 100644 index 778681d..0000000 --- a/pintos-env/pintos/threads/build/threads/kernel.lds.s +++ /dev/null @@ -1,19 +0,0 @@ -OUTPUT_FORMAT("elf32-i386") -OUTPUT_ARCH("i386") -ENTRY(start) -SECTIONS -{ - _start = 0xc0000000 + 0x20000; - . = _start + SIZEOF_HEADERS; - .text : { *(.start) *(.text) } = 0x90 - .rodata : { *(.rodata) *(.rodata.*) - . = ALIGN(0x1000); - _end_kernel_text = .; } - .data : { *(.data) - _signature = .; LONG(0xaa55aa55) } - _start_bss = .; - .bss : { *(.bss) } - _end_bss = .; - _end = .; - ASSERT (_end - _start <= 512K, "Kernel image is too big.") -}