OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Remove unnecessary nptl_flags variable from do_fork()

Browse Source 
The 'nptl_flags' variable in do_fork() is set to a copy of
'flags', and then the CLONE_NPTL_FLAGS are cleared out of 'flags'.
However the only effect of this is that the later check on
"if (flags & CLONE_PARENT_SETTID)" is never true. Since we
will already have done the setting of parent_tidptr in clone_func()
in the child thread, we don't need to do it again.

Delete the dead if() and the clearing of CLONE_NPTL_FLAGS from
'flags', and then use 'flags' where we were previously using
'nptl_flags', so we can delete the unnecessary variable.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-08-02 18:41:26 +01:00 committed by Riku Voipio
parent c4b3574402
commit 7cfbd386b9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linux-user/syscall.c
View File

@ -6011,7 +6011,6 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
TaskState *ts; TaskState *ts;
CPUState *new_cpu; CPUState *new_cpu;
CPUArchState *new_env; CPUArchState *new_env;
unsigned int nptl_flags;
sigset_t sigmask; sigset_t sigmask;
/* Emulate vfork() with fork() */ /* Emulate vfork() with fork() */
@ -6034,15 +6033,14 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
ts->bprm = parent_ts->bprm; ts->bprm = parent_ts->bprm;
ts->info = parent_ts->info; ts->info = parent_ts->info;
ts->signal_mask = parent_ts->signal_mask; ts->signal_mask = parent_ts->signal_mask;
nptl_flags = flags;
flags &= ~CLONE_NPTL_FLAGS2;
if (nptl_flags & CLONE_CHILD_CLEARTID) { if (flags & CLONE_CHILD_CLEARTID) {
ts->child_tidptr = child_tidptr; ts->child_tidptr = child_tidptr;
} }
if (nptl_flags & CLONE_SETTLS) if (flags & CLONE_SETTLS) {
cpu_set_tls (new_env, newtls); cpu_set_tls (new_env, newtls);
}
/* Grab a mutex so that thread setup appears atomic. */ /* Grab a mutex so that thread setup appears atomic. */
pthread_mutex_lock(&clone_lock); pthread_mutex_lock(&clone_lock);
@ -6052,10 +6050,12 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
pthread_mutex_lock(&info.mutex); pthread_mutex_lock(&info.mutex);
pthread_cond_init(&info.cond, NULL); pthread_cond_init(&info.cond, NULL);
info.env = new_env; info.env = new_env;
if (nptl_flags & CLONE_CHILD_SETTID) if (flags & CLONE_CHILD_SETTID) {
info.child_tidptr = child_tidptr; info.child_tidptr = child_tidptr;
if (nptl_flags & CLONE_PARENT_SETTID) }
if (flags & CLONE_PARENT_SETTID) {
info.parent_tidptr = parent_tidptr; info.parent_tidptr = parent_tidptr;
}
ret = pthread_attr_init(&attr); ret = pthread_attr_init(&attr);
ret = pthread_attr_setstacksize(&attr, NEW_STACK_SIZE); ret = pthread_attr_setstacksize(&attr, NEW_STACK_SIZE);
@ -6074,8 +6074,6 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
/* Wait for the child to initialize. */ /* Wait for the child to initialize. */
pthread_cond_wait(&info.cond, &info.mutex); pthread_cond_wait(&info.cond, &info.mutex);
ret = info.tid; ret = info.tid;
if (flags & CLONE_PARENT_SETTID)
put_user_u32(ret, parent_tidptr);
} else { } else {
ret = -1; ret = -1;
} }