d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize the two linux_clone() implementations which includes a few

Browse Source 
minor cleanups in both.
This commit is contained in:
jhb 2003-04-18 20:54:41 +00:00
parent a34e2cfbbf
commit a23b3dc7d4
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/alpha/linux/linux_machdep.c
View File

@ -129,7 +129,6 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
struct proc *p2;
struct thread *td2;
int exit_signal;
vm_offset_t start;
#ifdef DEBUG
if (ldebug(clone)) {
@ -158,10 +157,8 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
if (!(args->flags & CLONE_FILES))
ff |= RFFDG;
error = 0;
start = 0;
if ((error = fork1(td, ff, 0, &p2)) != 0)
error = fork1(td, ff, 0, &p2);
if (error)
return (error);
PROC_LOCK(p2);
@ -181,7 +178,7 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
*/
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(td2);
setrunqueue(FIRST_THREAD_IN_PROC(p2));
setrunqueue(td2);
mtx_unlock_spin(&sched_lock);
td->td_retval[0] = p2->p_pid;

44
sys/i386/linux/linux_machdep.c
View File

@ -313,6 +313,7 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
{
int error, ff = RFPROC | RFSTOPPED;
struct proc *p2;
struct thread *td2;
int exit_signal;
#ifdef DEBUG
@ -341,35 +342,34 @@ linux_clone(struct thread *td, struct linux_clone_args *args)
if (!(args->flags & CLONE_FILES))
ff |= RFFDG;
mtx_lock(&Giant);
error = fork1(td, ff, 0, &p2);
if (error == 0) {
td->td_retval[0] = p2->p_pid;
td->td_retval[1] = 0;
if (error)
return (error);
PROC_LOCK(p2);
p2->p_sigparent = exit_signal;
FIRST_THREAD_IN_PROC(p2)->td_frame->tf_esp =
(unsigned int)args->stack;
PROC_LOCK(p2);
p2->p_sigparent = exit_signal;
PROC_UNLOCK(p2);
td2 = FIRST_THREAD_IN_PROC(p2);
td2->td_frame->tf_esp = (unsigned int)args->stack;
#ifdef DEBUG
if (ldebug(clone))
printf(LMSG("clone: successful rfork to %ld"),
(long)p2->p_pid);
if (ldebug(clone))
printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"),
(long)p2->p_pid, args->stack, exit_signal);
#endif
/*
* Make this runnable after we are finished with it.
*/
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(FIRST_THREAD_IN_PROC(p2));
setrunqueue(FIRST_THREAD_IN_PROC(p2));
mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(p2);
}
mtx_unlock(&Giant);
/*
* Make this runnable after we are finished with it.
*/
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(td2);
setrunqueue(td2);
mtx_unlock_spin(&sched_lock);
return (error);
td->td_retval[0] = p2->p_pid;
td->td_retval[1] = 0;
return (0);
}
/* XXX move */