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

Renamed *_stack_region_id with *_stack_area, also replaced region_id with area_id.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9853 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-11-08 13:53:34 +00:00
parent 877547cdb0
commit 148a8e0c57
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/thread_types.h
+2 -2
View File
@@ -163,9 +163,9 @@ struct thread {
} exit; } exit;
// stack // stack
region_id kernel_stack_region_id; area_id kernel_stack_area;
addr_t kernel_stack_base; addr_t kernel_stack_base;
region_id user_stack_region_id; area_id user_stack_area;
addr_t user_stack_base; addr_t user_stack_base;
size_t user_stack_size; size_t user_stack_size;
src/kernel/core/team.c
+8 -8
View File
@@ -1,5 +1,5 @@
/* /*
** Copyright 2002-2004, The Haiku Team. All rights reserved. ** Copyright 2002-2004, Axel Dörfler, [email protected]. All rights reserved.
** Distributed under the terms of the Haiku License. ** Distributed under the terms of the Haiku License.
** **
** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -819,7 +819,7 @@ team_create_thread_start(void *args)
TRACE(("team_create_thread_start: entry thread %ld\n", t->id)); TRACE(("team_create_thread_start: entry thread %ld\n", t->id));
// create an initial primary stack region // create an initial primary stack area
// ToDo: make ENV_SIZE variable and put it on the heap? // ToDo: make ENV_SIZE variable and put it on the heap?
// ToDo: we could reserve the whole USER_STACK_REGION upfront... // ToDo: we could reserve the whole USER_STACK_REGION upfront...
@@ -828,14 +828,14 @@ team_create_thread_start(void *args)
get_arguments_data_size(teamArgs->args, teamArgs->arg_count)); get_arguments_data_size(teamArgs->args, teamArgs->arg_count));
t->user_stack_base = USER_STACK_REGION + USER_STACK_REGION_SIZE - sizeLeft; t->user_stack_base = USER_STACK_REGION + USER_STACK_REGION_SIZE - sizeLeft;
t->user_stack_size = MAIN_THREAD_STACK_SIZE; t->user_stack_size = MAIN_THREAD_STACK_SIZE;
// the exact location at the end of the user stack region // the exact location at the end of the user stack area
sprintf(ustack_name, "%s_main_stack", team->name); sprintf(ustack_name, "%s_main_stack", team->name);
t->user_stack_region_id = create_area_etc(team, ustack_name, (void **)&t->user_stack_base, t->user_stack_area = create_area_etc(team, ustack_name, (void **)&t->user_stack_base,
B_EXACT_ADDRESS, sizeLeft, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA); B_EXACT_ADDRESS, sizeLeft, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA);
if (t->user_stack_region_id < 0) { if (t->user_stack_area < 0) {
dprintf("team_create_thread_start: could not create default user stack region\n"); dprintf("team_create_thread_start: could not create default user stack region\n");
return t->user_stack_region_id; return t->user_stack_area;
} }
// now that the TLS area is allocated, initialize TLS // now that the TLS area is allocated, initialize TLS
@@ -1081,7 +1081,7 @@ fork_team_thread_start(void *_args)
struct arch_fork_arg archArgs = forkArgs->arch_info; struct arch_fork_arg archArgs = forkArgs->arch_info;
// we need a local copy of the arch dependent part // we need a local copy of the arch dependent part
thread->user_stack_region_id = forkArgs->user_stack_area; thread->user_stack_area = forkArgs->user_stack_area;
thread->user_stack_base = forkArgs->user_stack_base; thread->user_stack_base = forkArgs->user_stack_base;
thread->user_stack_size = forkArgs->user_stack_size; thread->user_stack_size = forkArgs->user_stack_size;
thread->user_local_storage = forkArgs->user_local_storage; thread->user_local_storage = forkArgs->user_local_storage;
@@ -1166,7 +1166,7 @@ fork_team(void)
break; break;
} }
if (info.area == parentThread->user_stack_region_id) if (info.area == parentThread->user_stack_area)
forkArgs->user_stack_area = area; forkArgs->user_stack_area = area;
} }