i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some ToDo items.

Browse Source 
Smaller cleanup.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2365 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-01-06 08:10:54 +00:00
parent 1d661e3285
commit 722bf47f67
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/team.c
+30 -28
View File
@@ -229,15 +229,15 @@ team_wait_on_team(team_id id, int *retcode)
state = disable_interrupts(); state = disable_interrupts();
GRAB_TEAM_LOCK(); GRAB_TEAM_LOCK();
p = team_get_team_struct_locked(id); p = team_get_team_struct_locked(id);
if(p && p->main_thread) { if (p && p->main_thread)
tid = p->main_thread->id; tid = p->main_thread->id;
} else { else
tid = ERR_INVALID_HANDLE; tid = ERR_INVALID_HANDLE;
}
RELEASE_TEAM_LOCK(); RELEASE_TEAM_LOCK();
restore_interrupts(state); restore_interrupts(state);
if(tid < 0) if (tid < 0)
return tid; return tid;
return thread_wait_on_thread(tid, retcode); return thread_wait_on_thread(tid, retcode);
@@ -333,44 +333,44 @@ team_get_current_team_id(void)
static struct team * static struct team *
create_team_struct(const char *name, bool kernel) create_team_struct(const char *name, bool kernel)
{ {
struct team *p; struct team *team;
p = (struct team *)malloc(sizeof(struct team)); team = (struct team *)malloc(sizeof(struct team));
if (p == NULL) if (team == NULL)
goto error; goto error;
p->id = atomic_add(&next_team_id, 1); team->id = atomic_add(&next_team_id, 1);
strncpy(&p->name[0], name, SYS_MAX_OS_NAME_LEN-1); strncpy(&team->name[0], name, SYS_MAX_OS_NAME_LEN-1);
p->name[SYS_MAX_OS_NAME_LEN-1] = 0; team->name[SYS_MAX_OS_NAME_LEN-1] = 0;
p->num_threads = 0; team->num_threads = 0;
p->io_context = NULL; team->io_context = NULL;
p->_aspace_id = -1; team->_aspace_id = -1;
p->aspace = NULL; team->aspace = NULL;
p->kaspace = vm_get_kernel_aspace(); team->kaspace = vm_get_kernel_aspace();
vm_put_aspace(p->kaspace); vm_put_aspace(team->kaspace);
p->thread_list = NULL; team->thread_list = NULL;
p->main_thread = NULL; team->main_thread = NULL;
p->state = TEAM_STATE_BIRTH; team->state = TEAM_STATE_BIRTH;
p->pending_signals = 0; team->pending_signals = 0;
p->death_sem = -1; team->death_sem = -1;
p->user_env_base = 0; team->user_env_base = 0;
if (arch_team_init_team_struct(p, kernel) < 0) if (arch_team_init_team_struct(team, kernel) < 0)
goto error1; goto error1;
return p; return team;
error1: error1:
free(p); free(team);
error: error:
return NULL; return NULL;
} }
static void static void
delete_team_struct(struct team *p) delete_team_struct(struct team *team)
{ {
free(p); free(team);
} }
@@ -413,6 +413,8 @@ team_create_team2(void *args)
// create an initial primary stack region // create an initial primary stack region
// ToDo: give the main thread a larger user stack (for gcc and friends, as in BeOS)
// ToDo: clean up the ENV_SIZE/STACK_SIZE/whatever mess (and maybe add TLS to it)
tot_top_size = STACK_SIZE + ENV_SIZE + PAGE_ALIGN(get_arguments_data_size(pargs->args, pargs->argc)); tot_top_size = STACK_SIZE + ENV_SIZE + PAGE_ALIGN(get_arguments_data_size(pargs->args, pargs->argc));
t->user_stack_base = ((USER_STACK_REGION - tot_top_size) + USER_STACK_REGION_SIZE); t->user_stack_base = ((USER_STACK_REGION - tot_top_size) + USER_STACK_REGION_SIZE);
sprintf(ustack_name, "%s_primary_stack", p->name); sprintf(ustack_name, "%s_primary_stack", p->name);
@@ -428,7 +430,7 @@ team_create_team2(void *args)
udest = (char *)(uargs + pargs->argc + 1); udest = (char *)(uargs + pargs->argc + 1);
// dprintf("addr: stack base=0x%x uargs = 0x%x udest=0x%x tot_top_size=%d \n\n",t->user_stack_base,uargs,udest,tot_top_size); // dprintf("addr: stack base=0x%x uargs = 0x%x udest=0x%x tot_top_size=%d \n\n",t->user_stack_base,uargs,udest,tot_top_size);
for(arg_cnt = 0; arg_cnt < pargs->argc; arg_cnt++) { for (arg_cnt = 0; arg_cnt < pargs->argc; arg_cnt++) {
uargs[arg_cnt] = udest; uargs[arg_cnt] = udest;
user_strcpy(udest, pargs->args[arg_cnt]); user_strcpy(udest, pargs->args[arg_cnt]);
udest += (strlen(pargs->args[arg_cnt]) + 1); udest += (strlen(pargs->args[arg_cnt]) + 1);