Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

team: Only lock while actually setting io_context, not while creating it.

Browse Source 
Thanks Ingo for the review!
This commit is contained in:
Augustin Cavalier 2017-12-19 20:51:01 -05:00
parent d483b4d0b5
commit 4ecdf1e195
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/kernel/team.cpp
View File

@ -1681,7 +1681,7 @@ load_image_internal(char**& _flatArgs, size_t flatArgsSize, int32 argCount,
status_t status; status_t status;
struct team_arg* teamArgs; struct team_arg* teamArgs;
struct team_loading_info loadingInfo; struct team_loading_info loadingInfo;
io_context* parentIOContext = NULL; io_context* parentIOContext = NULL, *ourIOContext = NULL;
team_id teamID; team_id teamID;
if (flatArgs == NULL || argCount == 0) if (flatArgs == NULL || argCount == 0)
@ -1770,8 +1770,9 @@ load_image_internal(char**& _flatArgs, size_t flatArgsSize, int32 argCount,
// args are owned by the team_arg structure now // args are owned by the team_arg structure now
// create a new io_context for this team // create a new io_context for this team
ourIOContext = vfs_new_io_context(parentIOContext, true);
team->Lock(); team->Lock();
team->io_context = vfs_new_io_context(parentIOContext, true); team->io_context = ourIOContext;
team->Unlock(); team->Unlock();
if (!team->io_context) { if (!team->io_context) {
status = B_NO_MEMORY; status = B_NO_MEMORY;
@ -2037,6 +2038,7 @@ fork_team(void)
thread_id threadID; thread_id threadID;
status_t status; status_t status;
ssize_t areaCookie; ssize_t areaCookie;
io_context* ourIOContext = NULL;
TRACE(("fork_team(): team %" B_PRId32 "\n", parentTeam->id)); TRACE(("fork_team(): team %" B_PRId32 "\n", parentTeam->id));
@ -2107,8 +2109,9 @@ fork_team(void)
} }
// create a new io_context for this team // create a new io_context for this team
ourIOContext = vfs_new_io_context(parentTeam->io_context, false);
team->Lock(); team->Lock();
team->io_context = vfs_new_io_context(parentTeam->io_context, false); team->io_context = ourIOContext;
team->Unlock(); team->Unlock();
if (!team->io_context) { if (!team->io_context) {
status = B_NO_MEMORY; status = B_NO_MEMORY;