2 files changed, 52 insertions, 13 deletions

diff --git a/src/init/syscalls.c b/src/init/syscalls.c
index 14c0d52..25fa134 100644
--- a/src/init/syscalls.c
+++ b/src/init/syscalls.c
@@ -50,8 +50,8 @@ void __user *_syscall_memflag(void __user *addr, size_t len, int flags) {
 	return (void __user *)_syscall(_SYSCALL_MEMFLAG, (int)addr, (int)len, flags, 0);
 }
 
-handle_t _syscall_pipe(int flags) {
-	return (handle_t)_syscall(_SYSCALL_PIPE, flags, 0, 0, 0);
+int _syscall_pipe(handle_t __user user_ends[2], int flags) {
+	return _syscall(_SYSCALL_PIPE, (int)user_ends, flags, 0, 0);
 }
 
 void _syscall_debug_klog(const void __user *buf, size_t len) {
diff --git a/src/init/tests/pipe.c b/src/init/tests/pipe.c
index bbfe79a..697b9b1 100644
--- a/src/init/tests/pipe.c
+++ b/src/init/tests/pipe.c
@@ -6,36 +6,75 @@
 
 static const char *pipe_msgs[2] = {"hello", "world"};
 
-static void test_pipe_child(handle_t pipe) {
-	int ret = _syscall_write(pipe, pipe_msgs[0], 5, -1);
+static void test_pipe_child(handle_t ends[2]) {
+	int ret = _syscall_write(ends[1], pipe_msgs[0], 5, -1);
 	assert(ret == 5);
 
-	ret = _syscall_write(pipe, pipe_msgs[1], 5, -1);
+	ret = _syscall_write(ends[1], pipe_msgs[1], 5, -1);
 	assert(ret == 5);
 }
 
-static void test_pipe_parent(handle_t pipe) {
+static void test_pipe_parent(handle_t ends[2]) {
 	char buf[16];
-	int ret = _syscall_read(pipe, buf, 16, 0);
+	int ret = _syscall_read(ends[0], buf, 16, 0);
 	assert(ret == 5);
 	assert(!memcmp(buf, pipe_msgs[0], 5));
 
-	_syscall_read(pipe, buf, 16, 0);
+	_syscall_read(ends[0], buf, 16, 0);
 	assert(ret == 5);
-	assert(!memcmp(buf, pipe_msgs[1], 5)); // wrong compare for test
+	assert(!memcmp(buf, pipe_msgs[1], 5));
+
+	// TODO these calls fail for multiple reasons at once - split
+	assert(_syscall_read(ends[1], buf, 16, 0) < 0);
+	assert(_syscall_write(ends[0], buf, 16, 0) < 0);
 }
 
 void test_pipe(void) {
-	handle_t pipe = _syscall_pipe(0);
-	assert(pipe > 0);
+	handle_t ends[2];
+	char buf[16];
+	assert(_syscall_pipe(ends, 0) >= 0);
+
+	if (!_syscall_fork(0, NULL)) {
+		test_pipe_child(ends);
+		_syscall_exit(0);
+	} else {
+		test_pipe_parent(ends);
+		_syscall_await();
+	}
+
+	_syscall_close(ends[0]);
+	_syscall_close(ends[1]);
+
+	assert(_syscall_pipe(ends, 0) >= 0);
+	_syscall_close(ends[0]);
+	assert(_syscall_write(ends[1], buf, 16, 0) < 0);
+	_syscall_close(ends[1]);
+
+	assert(_syscall_pipe(ends, 0) >= 0);
+	_syscall_close(ends[1]);
+	assert(_syscall_read(ends[0], buf, 16, 0) < 0);
+	_syscall_close(ends[0]);
+
+
+	assert(_syscall_pipe(ends, 0) >= 0);
+	if (!_syscall_fork(0, NULL)) {
+		_syscall_exit(0);
+	} else {
+		_syscall_close(ends[1]);
+		assert(_syscall_read(ends[0], buf, 16, 0) < 0);
+		_syscall_await();
+	}
 
+	assert(_syscall_pipe(ends, 0) >= 0);
 	if (!_syscall_fork(0, NULL)) {
-		test_pipe_child(pipe);
 		_syscall_exit(0);
 	} else {
-		test_pipe_parent(pipe);
+		_syscall_close(ends[1]);
+		assert(_syscall_write(ends[1], buf, 16, 0) < 0);
 		_syscall_await();
 	}
 
+	// TODO detect when all processes that can read are stuck on writing to the pipe and vice verse
 	// TODO kill process that's waiting on a pipe
+	// TODO queue
 }