sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-05-04 09:31:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed any refs to global id pools.

Browse Source 
Also added container reference setup to thread creation
This commit is contained in:
Bahadir Balban
2009-08-10 15:16:57 +03:00
parent aa71161a04
commit 15b659eaf0
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/thread.c
View File

@@ -212,9 +212,6 @@ int arch_setup_new_thread(struct ktcb *new, struct ktcb *orig,
/* Skip lr_svc since it's not going to be used */ /* Skip lr_svc since it's not going to be used */
new->context.pc = orig->syscall_regs->lr_usr; new->context.pc = orig->syscall_regs->lr_usr;
/* Copy other relevant fields from original ktcb */
new->pagerid = orig->pagerid;
/* Distribute original thread's ticks into two threads */ /* Distribute original thread's ticks into two threads */
new->ticks_left = orig->ticks_left / 2; new->ticks_left = orig->ticks_left / 2;
orig->ticks_left /= 2; orig->ticks_left /= 2;
@@ -229,9 +226,6 @@ int arch_setup_new_thread(struct ktcb *new, struct ktcb *orig,
int thread_setup_new_ids(struct task_ids *ids, unsigned int flags, int thread_setup_new_ids(struct task_ids *ids, unsigned int flags,
struct ktcb *new, struct ktcb *orig) struct ktcb *new, struct ktcb *orig)
{ {
/* Allocate a new id */
ids->tid = id_new(thread_id_pool);
/* /*
* If thread space is new or copied, * If thread space is new or copied,
* thread gets same group id as its thread id * thread gets same group id as its thread id
@@ -324,6 +318,16 @@ int thread_create(struct task_ids *ids, unsigned int flags)
} }
} }
/*
* Setup container-generic fields from current task
*
* NOTE: If a new container is created, this needs
* to assign the new pager and container
*/
new->pagerid = current->pagerid;
new->pager = current->pager;
new->container = current->container;
/* Set up new thread context by using parent ids and flags */ /* Set up new thread context by using parent ids and flags */
thread_setup_new_ids(ids, flags, new, parent); thread_setup_new_ids(ids, flags, new, parent);
arch_setup_new_thread(new, parent, flags); arch_setup_new_thread(new, parent, flags);

2
src/generic/container.c
View File

@@ -278,7 +278,6 @@ int init_first_pager(struct pager *pager,
pager->tcb = task; pager->tcb = task;
task->pager = pager; task->pager = pager;
task->container = cont; task->container = cont;
link_init(&task->cap_list.caps); /* TODO: Do this in tcb_alloc_init */
task->cap_list_ptr = &pager->cap_list; task->cap_list_ptr = &pager->cap_list;
/* Map the task's space */ /* Map the task's space */
@@ -326,7 +325,6 @@ int init_pager(struct pager *pager, struct container *cont)
pager->tcb = task; pager->tcb = task;
task->pager = pager; task->pager = pager;
task->container = cont; task->container = cont;
link_init(&task->cap_list.caps); /* TODO: Do this in tcb_alloc_init */
task->cap_list_ptr = &pager->cap_list; task->cap_list_ptr = &pager->cap_list;
add_mapping_pgd(pager->start_lma, pager->start_vma, add_mapping_pgd(pager->start_lma, pager->start_vma,

2
src/generic/space.c
View File

@@ -83,7 +83,7 @@ void address_space_delete(struct address_space *space)
delete_page_tables(space); delete_page_tables(space);
/* Return the space id */ /* Return the space id */
id_del(space_id_pool, space->spid); id_del(&kernel_container.space_ids, space->spid);
/* Deallocate the space structure */ /* Deallocate the space structure */
free_space(space); free_space(space);

9
src/generic/tcb.c
View File

@@ -16,11 +16,6 @@
#include INC_SUBARCH(mm.h) #include INC_SUBARCH(mm.h)
#include INC_GLUE(memory.h) #include INC_GLUE(memory.h)
/* ID pools for threads and spaces. */
struct id_pool *thread_id_pool;
struct id_pool *space_id_pool;
void init_ktcb_list(struct ktcb_list *ktcb_list) void init_ktcb_list(struct ktcb_list *ktcb_list)
{ {
memset(ktcb_list, 0, sizeof(*ktcb_list)); memset(ktcb_list, 0, sizeof(*ktcb_list));
@@ -36,6 +31,8 @@ void tcb_init(struct ktcb *new)
link_init(&new->task_list); link_init(&new->task_list);
mutex_init(&new->thread_control_lock); mutex_init(&new->thread_control_lock);
link_init(&new->cap_list.caps);
/* Initialise task's scheduling state and parameters. */ /* Initialise task's scheduling state and parameters. */
sched_init_task(new, TASK_PRIO_NORMAL); sched_init_task(new, TASK_PRIO_NORMAL);
@@ -92,7 +89,7 @@ void tcb_delete(struct ktcb *tcb)
address_space_reference_unlock(); address_space_reference_unlock();
/* Deallocate tcb ids */ /* Deallocate tcb ids */
id_del(thread_id_pool, tcb->tid); id_del(&kernel_container.ktcb_ids, tcb->tid);
/* Free the tcb */ /* Free the tcb */
free_ktcb(tcb); free_ktcb(tcb);