Redesign reschedule points, allow one operation to reschedule many cpus at once
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m12s
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m12s
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
#include <libk/list.h>
|
||||
#include <libk/minmax.h>
|
||||
#include <libk/std.h>
|
||||
#include <libk/string.h>
|
||||
#include <mm/liballoc.h>
|
||||
@@ -8,9 +10,8 @@
|
||||
#include <sys/debug.h>
|
||||
#include <sys/smp.h>
|
||||
|
||||
bool proc_cleanup_resource_mail (struct proc_resource* resource, struct cpu** reschedule_cpu) {
|
||||
void proc_cleanup_resource_mail (struct proc_resource* resource, struct reschedule_ctx* rctx) {
|
||||
struct proc_mail* mail = &resource->u.mail;
|
||||
bool reschedule = PROC_NO_RESCHEDULE;
|
||||
|
||||
spin_lock (&mail->resource->lock);
|
||||
|
||||
@@ -29,7 +30,7 @@ bool proc_cleanup_resource_mail (struct proc_resource* resource, struct cpu** re
|
||||
spin_unlock (&mail->send_sq.lock);
|
||||
spin_unlock (&mail->resource->lock);
|
||||
|
||||
reschedule = reschedule || proc_sq_resume (suspended_proc, sq_entry, reschedule_cpu);
|
||||
proc_sq_resume (suspended_proc, sq_entry, rctx);
|
||||
|
||||
spin_lock (&mail->resource->lock);
|
||||
spin_lock (&mail->send_sq.lock);
|
||||
@@ -38,13 +39,18 @@ bool proc_cleanup_resource_mail (struct proc_resource* resource, struct cpu** re
|
||||
spin_unlock (&mail->send_sq.lock);
|
||||
|
||||
spin_unlock (&mail->resource->lock);
|
||||
|
||||
return reschedule;
|
||||
}
|
||||
|
||||
bool proc_mail_send (struct proc* proc, struct proc_mail* mail, struct cpu** reschedule_cpu,
|
||||
void proc_mail_send (struct proc* proc, struct proc_mail* mail, struct reschedule_ctx* rctx,
|
||||
void* data, size_t data_size) {
|
||||
spin_lock (&mail->resource->lock);
|
||||
|
||||
/* mail full */
|
||||
if (mail->pending_mesg != NULL) {
|
||||
proc_sq_suspend (proc, &mail->send_sq, &mail->resource->lock, rctx);
|
||||
return;
|
||||
}
|
||||
|
||||
spin_lock (&mail->recv_sq.lock);
|
||||
|
||||
/* if receiver available, hand off directly */
|
||||
@@ -57,40 +63,33 @@ bool proc_mail_send (struct proc* proc, struct proc_mail* mail, struct cpu** res
|
||||
spin_unlock (&mail->recv_sq.lock);
|
||||
spin_unlock (&mail->resource->lock);
|
||||
|
||||
spin_lock (&proc->lock);
|
||||
spin_lock (&resumed_proc->lock);
|
||||
|
||||
if (resumed_proc->mail_recv_buffer != NULL) {
|
||||
size_t copy_size =
|
||||
(data_size < resumed_proc->mail_recv_size) ? data_size : resumed_proc->mail_recv_size;
|
||||
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 (&proc->lock);
|
||||
spin_unlock (&resumed_proc->lock);
|
||||
|
||||
return proc_sq_resume (resumed_proc, sq_entry, reschedule_cpu);
|
||||
proc_sq_resume (resumed_proc, sq_entry, rctx);
|
||||
return;
|
||||
}
|
||||
|
||||
spin_unlock (&mail->recv_sq.lock);
|
||||
|
||||
/* mail full */
|
||||
if (mail->pending_mesg != NULL) {
|
||||
return proc_sq_suspend (proc, &mail->send_sq, &mail->resource->lock, reschedule_cpu);
|
||||
}
|
||||
|
||||
/* mail is empty and nobody is waiting */
|
||||
mail->pending_mesg = malloc (data_size);
|
||||
memcpy (mail->pending_mesg, data, data_size);
|
||||
mail->pending_mesg_size = data_size;
|
||||
|
||||
spin_unlock (&mail->resource->lock);
|
||||
|
||||
return PROC_NO_RESCHEDULE;
|
||||
}
|
||||
|
||||
bool proc_mail_receive (struct proc* proc, struct proc_mail* mail, struct cpu** reschedule_cpu,
|
||||
void proc_mail_receive (struct proc* proc, struct proc_mail* mail, struct reschedule_ctx* rctx,
|
||||
void* recv_buffer, size_t recv_size) {
|
||||
spin_lock (&proc->lock);
|
||||
proc->mail_recv_buffer = recv_buffer;
|
||||
@@ -118,15 +117,16 @@ bool proc_mail_receive (struct proc* proc, struct proc_mail* mail, struct cpu**
|
||||
spin_unlock (&mail->send_sq.lock);
|
||||
spin_unlock (&mail->resource->lock);
|
||||
|
||||
return proc_sq_resume (resumed_proc, sq_entry, reschedule_cpu);
|
||||
proc_sq_resume (resumed_proc, sq_entry, rctx);
|
||||
return;
|
||||
}
|
||||
|
||||
spin_unlock (&mail->send_sq.lock);
|
||||
spin_unlock (&mail->resource->lock);
|
||||
|
||||
return PROC_NO_RESCHEDULE;
|
||||
return;
|
||||
}
|
||||
|
||||
/* nothing to receive */
|
||||
return proc_sq_suspend (proc, &mail->recv_sq, &mail->resource->lock, reschedule_cpu);
|
||||
proc_sq_suspend (proc, &mail->recv_sq, &mail->resource->lock, rctx);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user