From 82f2c02510043927e73926ce52ab4b813e7bc40c Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Wed, 4 May 2022 14:12:50 +0200
Subject: kernel/proc: leave the vfs_request when killing a WAITS4FS proc

...instead of letting the hwole process stay around.
This could end up a bit more complex, I have no idea how to test killing
processes during vfs requests.

The upside of this is that I can remove all the deathbed/deadparent
weirdness now.
---
 src/kernel/proc.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/kernel/proc.c')

diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 40399d8..0e79c93 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -298,6 +298,7 @@ void process_kill(struct process *p, int ret) {
 		process_kill(c, -1);
 	}
 
+	struct vfs_request *req;
 	switch (p->state) {
 		case PS_RUNNING:
 		case PS_WAITS4CHILDDEATH:
@@ -307,20 +308,11 @@ void process_kill(struct process *p, int ret) {
 		case PS_WAITS4FS:
 			// if the request wasn't accepted we could just remove this process from the queue
 		case PS_WAITS4IRQ:
-			/* instead of killing the process outright, we mark it to get killed
-			 * as soon as it becomes running and we try to give it control.
-			 *
-			 * we also reparent it to process_deadparent because we don't want
-			 * dead processes to have any alive children */
-			/* TODO: because requests are no longer owned by the parent, we can safely kill it.
-			 * this whole deathbed thing (and, by extension, freeing after killing) is unnecessary */
-			// TODO process_reparent?
-			p->deathbed = true;
-			process_forget(p);
-			p->sibling = process_deadparent->child;
-			p->parent  = process_deadparent;
-			process_deadparent->child  = p;
-			return;
+			req = p->state == PS_WAITS4FS
+				? p->waits4fs.req : p->waits4irq.req;
+			req->caller = NULL;
+			// TODO test this
+			break;
 
 		case PS_DEAD:
 		case PS_DEADER:
-- 
cgit v1.2.3