kamkow1/mop3
1
1
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove mail-related fields from struct proc, suspension queue can now have user data
All checks were successful
Build ISO image / build-and-deploy (push) Successful in 2m57s
Details
Build documentation / build-and-deploy (push) Successful in 1m40s
Details

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-04-01 01:17:39 +02:00
parent 12fa3ee11b
commit eeb120bc38
9 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/device/ps2/ps2_kb.c
View File

@@ -203,7 +203,7 @@ DEFINE_DEVICE_OP (ps2kb_read_key) {
return -ST_PERMISSION_ERROR;
}
proc_sq_suspend (proc, &ps2kb_sq, &ps2kb_ringbuffer_lock, frb, rctx);
proc_sq_suspend (proc, &ps2kb_sq, &ps2kb_ringbuffer_lock, frb, rctx, NULL, NULL);
return ST_OK;
}

2
kernel/fs/vfs.c
View File

@@ -132,7 +132,7 @@ int vfs_volume_open (struct proc* proc, const char* volume_name, struct reschedu
spin_unlock (&volume->lock, fv);
return ST_OK;
} else {
proc_sq_suspend (proc, &volume->sq, &volume->lock, fv, rctx);
proc_sq_suspend (proc, &volume->sq, &volume->lock, fv, rctx, NULL, NULL);
return ST_OK;
}
}

38
kernel/proc/mail.c
View File

@@ -10,6 +10,8 @@
#include <sys/debug.h>
#include <sys/smp.h>
static void proc_mail_free_saved_buffer (void* udata) { free (udata); }
void proc_cleanup_resource_mail (struct proc_resource* resource, struct reschedule_ctx* rctx) {
uint64_t fr, fssq;
@@ -45,7 +47,12 @@ void proc_mail_send (struct proc* proc, struct proc_mail* mail, struct reschedul
/* mail full */
if (mail->packets_count == PROC_MAIL_MAX) {
proc_sq_suspend (proc, &mail->send_sq, &mail->resource->lock, fr, rctx);
struct mail_saved_buffer* saved_buffer = malloc (sizeof (*saved_buffer));
saved_buffer->buffer = data;
saved_buffer->size = data_size;
proc_sq_suspend (proc, &mail->send_sq, &mail->resource->lock, fr, rctx, saved_buffer,
&proc_mail_free_saved_buffer);
return;
}
@@ -58,21 +65,14 @@ void proc_mail_send (struct proc* proc, struct proc_mail* mail, struct reschedul
struct proc_sq_entry* sq_entry = list_entry (node, struct proc_sq_entry, sq_link);
struct proc* resumed_proc = sq_entry->proc;
struct mail_saved_buffer* saved_buffer = sq_entry->udata;
size_t copy_size = min (data_size, saved_buffer->size);
memcpy (saved_buffer->buffer, data, copy_size);
spin_unlock (&mail->recv_sq.lock, frsq);
spin_unlock (&mail->resource->lock, fr);
spin_lock (&resumed_proc->lock, &fp);
if (resumed_proc->mail_recv_buffer != NULL) {
size_t copy_size = min (data_size, resumed_proc->mail_recv_size);
memcpy (resumed_proc->mail_recv_buffer, data, copy_size);
resumed_proc->mail_recv_buffer = NULL;
resumed_proc->mail_recv_size = 0;
}
spin_unlock (&resumed_proc->lock, fp);
proc_sq_resume (resumed_proc, sq_entry, rctx);
return;
}
@@ -105,11 +105,6 @@ void proc_mail_receive (struct proc* proc, struct proc_mail* mail, struct resche
void* recv_buffer, size_t recv_size) {
uint64_t fp, fr, fssq;
spin_lock (&proc->lock, &fp);
proc->mail_recv_buffer = recv_buffer;
proc->mail_recv_size = recv_size;
spin_unlock (&proc->lock, fp);
spin_lock (&mail->resource->lock, &fr);
/* consume mesg if available */
@@ -144,6 +139,11 @@ void proc_mail_receive (struct proc* proc, struct proc_mail* mail, struct resche
return;
}
struct mail_saved_buffer* saved_buffer = malloc (sizeof (*saved_buffer));
saved_buffer->buffer = recv_buffer;
saved_buffer->size = recv_size;
/* nothing to receive */
proc_sq_suspend (proc, &mail->recv_sq, &mail->resource->lock, fr, rctx);
proc_sq_suspend (proc, &mail->recv_sq, &mail->resource->lock, fr, rctx, saved_buffer,
&proc_mail_free_saved_buffer);
}

5
kernel/proc/mail.h
View File

@@ -13,6 +13,11 @@ struct proc_resource;
struct cpu;
struct reschedule_ctx;
struct mail_saved_buffer {
void* buffer;
size_t size;
};
struct mail_packet {
void* packet_buffer;
size_t packet_size;

2
kernel/proc/mutex.c
View File

@@ -93,7 +93,7 @@ void proc_mutex_lock (struct proc* proc, struct proc_mutex* mutex, struct resche
return;
}
proc_sq_suspend (proc, &mutex->suspension_q, &mutex->resource->lock, fr, rctx);
proc_sq_suspend (proc, &mutex->suspension_q, &mutex->resource->lock, fr, rctx, NULL, NULL);
}
void proc_mutex_unlock (struct proc* proc, struct proc_mutex* mutex, struct reschedule_ctx* rctx) {

2
kernel/proc/proc.c
View File

@@ -378,7 +378,7 @@ void proc_kill (struct proc* proc, struct reschedule_ctx* rctx) {
}
void proc_wait_for (struct proc* proc, struct reschedule_ctx* rctx, struct proc* wait_proc) {
proc_sq_suspend (proc, &wait_proc->done_sq, NULL, 0, rctx);
proc_sq_suspend (proc, &wait_proc->done_sq, NULL, 0, rctx, NULL, NULL);
}
void proc_irq_sched (void* arg, void* regs, bool user, struct reschedule_ctx* rctx) {

2
kernel/proc/proc.h
View File

@@ -45,8 +45,6 @@ struct proc {
struct cpu* cpu;
int state;
uintptr_t uvaddr_argument;
void* mail_recv_buffer;
size_t mail_recv_size;
char cwv[VOLUME_MAX];
struct proc_suspension_q done_sq;
char name[PATH_MAX + VOLUME_MAX];

9
kernel/proc/suspension_q.c
View File

@@ -11,7 +11,8 @@
#include <sys/spin_lock.h>
int proc_sq_suspend (struct proc* proc, struct proc_suspension_q* sq, spin_lock_t* resource_lock,
uint64_t lockflags, struct reschedule_ctx* rctx) {
uint64_t lockflags, struct reschedule_ctx* rctx, void* udata,
sq_entry_free_udata_func_t free_func) {
uint64_t fc, fp, fsq;
spin_lock (&proc->lock, &fp);
@@ -27,6 +28,8 @@ int proc_sq_suspend (struct proc* proc, struct proc_suspension_q* sq, spin_lock_
sq_entry->proc = proc;
sq_entry->sq = sq;
sq_entry->udata = udata;
sq_entry->free_func = free_func;
spin_lock (&cpu->lock, &fc);
spin_lock (&proc->lock, &fp);
@@ -88,6 +91,8 @@ int proc_sq_resume (struct proc* proc, struct proc_sq_entry* sq_entry,
spin_unlock (&proc->lock, fp);
spin_unlock (&cpu->lock, fc);
if (sq_entry->free_func != NULL)
sq_entry->free_func (sq_entry->udata);
free (sq_entry);
rctx_insert_cpu (rctx, cpu);
@@ -116,6 +121,8 @@ void proc_sqs_cleanup (struct proc* proc) {
spin_unlock (&sq->lock, fsq);
if (sq_entry->free_func != NULL)
sq_entry->free_func (sq_entry->udata);
free (sq_entry);
}

7
kernel/proc/suspension_q.h
View File

@@ -8,6 +8,8 @@ struct proc;
struct cpu;
struct reschedule_ctx;
typedef void (*sq_entry_free_udata_func_t) (void* udata);
struct proc_suspension_q {
struct list_node_link* proc_list;
spin_lock_t lock;
@@ -18,12 +20,15 @@ struct proc_sq_entry {
struct list_node_link proc_link;
struct proc* proc;
struct proc_suspension_q* sq;
void* udata;
sq_entry_free_udata_func_t free_func;
};
void proc_sqs_cleanup (struct proc* proc);
int proc_sq_suspend (struct proc* proc, struct proc_suspension_q* sq, spin_lock_t* resource_lock,
uint64_t lockflags, struct reschedule_ctx* rctx);
uint64_t lockflags, struct reschedule_ctx* rctx, void* udata,
sq_entry_free_udata_func_t free_func);
int proc_sq_resume (struct proc* proc, struct proc_sq_entry* sq_entry, struct reschedule_ctx* rctx);