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

Don't clone the user thread area on fork(), just create a new one for

Browse Source 
the new team. Otherwise it would lose it's properties (full lock,
B_KERNEL_AREA).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26622 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-07-24 23:03:59 +00:00
parent 29ec0f52d2
commit cdc6ad72bb
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/team.cpp
+9 -8
View File
@@ -1481,6 +1481,14 @@ fork_team(void)
cookie = 0; cookie = 0;
while (get_next_area_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) { while (get_next_area_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
if (info.area == parentTeam->user_data_area) {
// don't clone the user area; just create a new one
status = create_team_user_data(team);
if (status != B_OK)
break;
forkArgs->user_thread = team_allocate_user_thread(team);
} else {
void *address; void *address;
area_id area = vm_copy_area(team->address_space->id, info.name, area_id area = vm_copy_area(team->address_space->id, info.name,
&address, B_CLONE_ADDRESS, info.protection, info.area); &address, B_CLONE_ADDRESS, info.protection, info.area);
@@ -1489,15 +1497,8 @@ fork_team(void)
break; break;
} }
if (info.area == parentThread->user_stack_area) { if (info.area == parentThread->user_stack_area)
forkArgs->user_stack_area = area; forkArgs->user_stack_area = area;
} else if (info.area == parentTeam->user_data_area) {
team->user_data = (addr_t)address;
team->used_user_data = 0;
team->user_data_size = info.size;
team->user_data_area = area;
team->free_user_threads = NULL;
forkArgs->user_thread = team_allocate_user_thread(team);
} }
} }