Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

set task to invalid after freeing of all allocated data

Browse source
This commit is contained in:
Stefan Lankes 2015-08-28 08:00:54 +02:00
parent 2a55eb781b
commit 7b54dca40f
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
hermit/kernel/tasks.c
View file

@ -172,18 +172,28 @@ void finish_task_switch(void)
spinlock_irqsave_lock(&readyqueues[core_id].lock);
if ((old = readyqueues[core_id].old_task) != NULL) {
if (old->status == TASK_INVALID) {
old->stack = NULL;
if (old->status == TASK_FINISHED) {
/* cleanup task */
if (old->stack) {
kfree(old->stack);
old->stack = NULL;
}
if (old->user_usage) {
kfree(old->user_usage);
old->user_usage = NULL;
}
if (!old->parent && old->heap) {
kfree(old->heap);
old->heap = NULL;
}
old->last_stack_pointer = NULL;
readyqueues[core_id].old_task = NULL;
/* cleanup task */
if (old->stack)
kfree(old->stack);
if (old->user_usage);
kfree(old->user_usage);
if (!old->parent && old->heap)
kfree(old->heap);
/* signalizes that this task could be reused */
old->status = TASK_INVALID;
} else {
prio = old->prio;
if (!readyqueues[core_id].queue[prio-1].first) {
@ -212,6 +222,8 @@ static void NORETURN do_exit(int arg)
kprintf("Terminate task: %u, return value %d\n", curr_task->id, arg);
uint8_t flags = irq_nested_disable();
// Threads should delete the page table and the heap */
if (!curr_task->parent)
page_map_drop();
@ -224,6 +236,8 @@ static void NORETURN do_exit(int arg)
curr_task->status = TASK_FINISHED;
reschedule();
irq_nested_enable(flags);
kprintf("Kernel panic: scheduler found no valid task\n");
while(1) {
HALT;
@ -698,11 +712,10 @@ size_t** scheduler(void)
spinlock_irqsave_lock(&readyqueues[core_id].lock);
/* signalizes that this task could be reused */
if (curr_task->status == TASK_FINISHED) {
curr_task->status = TASK_INVALID;
/* signalizes that this task could be realized */
if (curr_task->status == TASK_FINISHED)
readyqueues[core_id].old_task = curr_task;
} else readyqueues[core_id].old_task = NULL; // reset old task
else readyqueues[core_id].old_task = NULL; // reset old task
prio = msb(readyqueues[core_id].prio_bitmap); // determines highest priority
if (prio > MAX_PRIO) {