mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-28 13:18:22 +00:00
scheduler: use a linked list for threads in a process instead of a table
This commit is contained in:
@@ -46,7 +46,8 @@ syscallret_t syscall_fork(context_t *ctx) {
|
||||
nproc->umask = _cpu()->thread->proc->umask;
|
||||
nproc->root = sched_getroot();
|
||||
nproc->cwd = sched_getcwd();
|
||||
nproc->threads[0] = nthread;
|
||||
nproc->threadlist = nthread;
|
||||
nthread->procnext = NULL;
|
||||
|
||||
ARCH_CONTEXT_THREADSAVE(nthread, ctx);
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ syscallret_t syscall_newthread(context_t *, void *entry, void *stack) {
|
||||
.ret = -1
|
||||
};
|
||||
|
||||
// TODO perhaps clean up threads here as well
|
||||
// if the kernel was specified to have no user threading in the cmdline
|
||||
if (cmdline_get("nomultithread")) {
|
||||
ret.errno = ENOSYS;
|
||||
@@ -16,53 +17,37 @@ syscallret_t syscall_newthread(context_t *, void *entry, void *stack) {
|
||||
|
||||
proc_t *proc = _cpu()->thread->proc;
|
||||
|
||||
MUTEX_ACQUIRE(&proc->mutex, false);
|
||||
thread_t *thread = sched_newthread(entry, 16 * PAGE_SIZE, 1, _cpu()->thread->proc, stack);
|
||||
if (thread == NULL) {
|
||||
ret.errno = ENOMEM;
|
||||
return ret;
|
||||
}
|
||||
|
||||
// if we currently don't want any more threads to start
|
||||
if (proc->nomorethreads == true) {
|
||||
MUTEX_RELEASE(&proc->mutex);
|
||||
thread->vmmctx = _cpu()->thread->vmmctx;
|
||||
|
||||
bool intstatus = interrupt_set(false);
|
||||
spinlock_acquire(&proc->threadlistlock);
|
||||
|
||||
bool shouldntstart = proc->nomorethreads;
|
||||
if (shouldntstart == false) {
|
||||
thread->procnext = proc->threadlist;
|
||||
proc->threadlist = thread;
|
||||
__atomic_fetch_add(&proc->runningthreadcount, 1, __ATOMIC_SEQ_CST);
|
||||
}
|
||||
|
||||
spinlock_release(&proc->threadlistlock);
|
||||
interrupt_set(intstatus);
|
||||
|
||||
if (shouldntstart) {
|
||||
sched_destroythread(thread);
|
||||
ret.errno = EAGAIN;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int i;
|
||||
for (i = 0; i < proc->threadtablesize; ++i) {
|
||||
thread_t *thread = proc->threads[i];
|
||||
if (thread == NULL || (thread->flags & SCHED_THREAD_FLAGS_DEAD) == 0)
|
||||
continue;
|
||||
|
||||
// reuse the slot in the threads table
|
||||
sched_destroythread(thread);
|
||||
break;
|
||||
}
|
||||
|
||||
if (i == proc->threadtablesize) {
|
||||
// resize it
|
||||
void *tmp = realloc(proc->threads, (proc->threadtablesize + 1) * sizeof(thread_t *));
|
||||
if (tmp == NULL) {
|
||||
ret.errno = ENOMEM;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
proc->threads = tmp;
|
||||
}
|
||||
|
||||
proc->threads[i] = sched_newthread(entry, 16 * PAGE_SIZE, 1, _cpu()->thread->proc, stack);
|
||||
if (proc->threads[i] == NULL) {
|
||||
ret.errno = ENOMEM;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
proc->threads[i]->vmmctx = _cpu()->thread->vmmctx;
|
||||
|
||||
ret.errno = 0;
|
||||
ret.ret = proc->threads[i]->tid;
|
||||
ret.ret = thread->tid;
|
||||
|
||||
__atomic_fetch_add(&proc->runningthreadcount, 1, __ATOMIC_SEQ_CST);
|
||||
|
||||
sched_queue(proc->threads[i]);
|
||||
|
||||
cleanup:
|
||||
MUTEX_RELEASE(&proc->mutex);
|
||||
if (shouldntstart == false)
|
||||
sched_queue(thread);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -102,16 +102,26 @@ syscallret_t syscall_waitpid(context_t *context, pid_t pid, int *status, int opt
|
||||
|
||||
MUTEX_RELEASE(&proc->mutex);
|
||||
|
||||
for (int i = 0; i < iterator->threadtablesize && zombie; ++i) {
|
||||
if (iterator->threads[i] == NULL)
|
||||
continue;
|
||||
if (zombie) {
|
||||
bool intstatus = interrupt_set(false);
|
||||
spinlock_acquire(&iterator->threadlistlock);
|
||||
|
||||
volatile int *flags = (volatile int *)(&iterator->threads[i]->flags);
|
||||
// wait until the thread can actually be unallocated
|
||||
while ((*flags & SCHED_THREAD_FLAGS_DEAD) == 0)
|
||||
sched_yield();
|
||||
thread_t *threadlist = iterator->threadlist;
|
||||
iterator->threadlist = NULL;
|
||||
|
||||
sched_destroythread(iterator->threads[i]);
|
||||
spinlock_release(&iterator->threadlistlock);
|
||||
interrupt_set(intstatus);
|
||||
|
||||
while (threadlist) {
|
||||
thread_t *freethread = threadlist;
|
||||
threadlist = threadlist->procnext;
|
||||
volatile int *flags = (volatile int *)(&freethread->flags);
|
||||
// wait until the thread can actually be unallocated
|
||||
while ((*flags & SCHED_THREAD_FLAGS_DEAD) == 0)
|
||||
sched_yield();
|
||||
|
||||
sched_destroythread(freethread);
|
||||
}
|
||||
}
|
||||
|
||||
ret.ret = iterator->pid;
|
||||
|
||||
Reference in New Issue
Block a user