Pipes should wake up from fswait when they close

klange · Aug 21, 2018 · 4f450cf · 4f450cf
1 parent 058e84b
commit 4f450cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/base/usr/include/kernel/ringbuffer.h b/base/usr/include/kernel/ringbuffer.h
@@ -22,5 +22,6 @@ size_t ring_buffer_write(ring_buffer_t * ring_buffer, size_t size, uint8_t * buf
 ring_buffer_t * ring_buffer_create(size_t size);
 void ring_buffer_destroy(ring_buffer_t * ring_buffer);
 void ring_buffer_interrupt(ring_buffer_t * ring_buffer);
+void ring_buffer_alert_waiters(ring_buffer_t * ring_buffer);
 void ring_buffer_select_wait(ring_buffer_t * ring_buffer, void * process);
 
diff --git a/kernel/ds/ringbuffer.c b/kernel/ds/ringbuffer.c
@@ -49,7 +49,7 @@ static inline void ring_buffer_increment_write(ring_buffer_t * ring_buffer) {
 	}
 }
 
-static void ring_buffer_alert_waiters(ring_buffer_t * ring_buffer) {
+void ring_buffer_alert_waiters(ring_buffer_t * ring_buffer) {
 	if (ring_buffer->alert_waiters) {
 		while (ring_buffer->alert_waiters->head) {
 			node_t * node = list_dequeue(ring_buffer->alert_waiters);

diff --git a/kernel/fs/unixpipe.c b/kernel/fs/unixpipe.c
@@ -90,6 +90,9 @@ static void close_write_pipe(fs_node_t * node) {
 		debug_print(NOTICE, "Both ends now closed, should clean up.");
 	} else {
 		ring_buffer_interrupt(self->buffer);
+		if (!ring_buffer_unread(self->buffer)) {
+			ring_buffer_alert_waiters(self->buffer);
+		}
 	}
 }
 
@@ -98,6 +101,7 @@ static int check_pipe(fs_node_t * node) {
 	if (ring_buffer_unread(self->buffer) > 0) {
 		return 0;
 	}
+	if (self->write_closed) return 0;
 	return 1;
 }