aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorklaar36 <klas.arvidsson@liu.se>2016-05-16 19:53:47 +0200
committerklaar36 <klas.arvidsson@liu.se>2016-05-16 19:53:47 +0200
commit3e648f7f87e8f9328a527faa8bb97324e67885b4 (patch)
tree5417b3a873c6c6a844d5f15d462be499e5906cd3 /src
parentc4e42961e885612ca2b84dd0246d09b86aad2b97 (diff)
parent3757af98040e80af075e10417179d1a82199d7cf (diff)
downloadpintos-rs-3e648f7f87e8f9328a527faa8bb97324e67885b4.tar.gz
Merge branch 'exec-missing-bugfix' into 'master'
Fix for possible bug in exec-missing. The test userprog/exec-missing verifies that exec() returns -1 when starting a process for which the binary is not found. Since the failure of load() is discovered after a new process has been created, the output 'no-such-file: exit(-1)' will be visible in the output. The problem is that we do not know when this happens with respect to the thread calling exec(). Due to how the tests are designed, the time when 'no-such-file' terminates is important. Some of the cases were listed as acceptable outputs, but I found some acceptable outputs missing from there, namely if 'no-such-file' for some reason takes quite some time terminating, or even terminates after the 'exec-missing' process exits. As there is no synchronization between these processes (nor can it be), we do not know which one terminates first. Effectively, I added the following possible outputs to the test, as I find them reasonable outcomes of a correct implementation (in very unfortunate circumstances, or when printing a lot in process_cleanup): ``` (exec-missing) begin load: no-such-file: open failed (exec-missing) exec("no-such-file"): -1 (exec-missing) end no-such-file: exit(-1) exec-missing: exit(0) ``` ``` (exec-missing) begin load: no-such-file: open failed (exec-missing) exec("no-such-file"): -1 (exec-missing) end exec-missing: exit(0) no-such-file: exit(-1) ``` Signed-off-by: Filip Strömbäck <filip.stromback@liu.se> See merge request !4
Diffstat (limited to 'src')
-rw-r--r--src/tests/userprog/exec-missing.ck39
1 files changed, 37 insertions, 2 deletions
diff --git a/src/tests/userprog/exec-missing.ck b/src/tests/userprog/exec-missing.ck
index 0ef7aaa..749db01 100644
--- a/src/tests/userprog/exec-missing.ck
+++ b/src/tests/userprog/exec-missing.ck
@@ -1,15 +1,36 @@
# -*- perl -*-
+
+# In this test a program named "exec-missing" tries to start another
+# program that do not exist. This is discovered in the thread of the
+# new program, in the function load.
+
+# Correct handling can be done in three basic ways:
+
+# 1. We only know about the failure when our "exec" system call
+# returns -1. The "no-such-file" thread never becomes a process and
+# do not leave any messages.
+
+# 2. We know about the failure both when "exec" return -1 and when the
+# "no-such-file" thread fails to become a process. It notify the
+# failure by printing "load: no-such-file: open failed". But it
+# does not become a process and will thus not leave a
+# "no-such-file: exit(-1)" message.
+
+# 3. "exec" return -1 and "no-such-file" become a failed process. It
+# will thus produce a "no-such-file: exit(-1)" message. This
+# message may occur some time after "open failed".
+
use strict;
use warnings;
use tests::tests;
-check_expected ([<<'EOF', <<'EOF', <<'EOF', <<'EOF']);
+check_expected ([<<'EOF', <<'EOF', <<'EOF', <<'EOF', <<'EOF', <<'EOF']);
(exec-missing) begin
-load: no-such-file: open failed
(exec-missing) exec("no-such-file"): -1
(exec-missing) end
exec-missing: exit(0)
EOF
(exec-missing) begin
+load: no-such-file: open failed
(exec-missing) exec("no-such-file"): -1
(exec-missing) end
exec-missing: exit(0)
@@ -28,4 +49,18 @@ no-such-file: exit(-1)
(exec-missing) end
exec-missing: exit(0)
EOF
+(exec-missing) begin
+load: no-such-file: open failed
+(exec-missing) exec("no-such-file"): -1
+(exec-missing) end
+no-such-file: exit(-1)
+exec-missing: exit(0)
+EOF
+(exec-missing) begin
+load: no-such-file: open failed
+(exec-missing) exec("no-such-file"): -1
+(exec-missing) end
+exec-missing: exit(0)
+no-such-file: exit(-1)
+EOF
pass;