From 2b1319c85c94b7defef2ac2191bb50d773c81db4 Mon Sep 17 00:00:00 2001 From: aurel32 Date: Thu, 18 Dec 2008 22:44:04 +0000 Subject: User-mode GDB stub improvements - handle fork Close gdbserver in child processes, so that only one stub tries to talk to GDB at a time. Updated from an earlier patch by Paul Brook. Signed-off-by: Daniel Jacobowitz Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6095 c046a42c-6fe2-441c-8c8c-71466251a162 --- linux-user/main.c | 4 ++++ linux-user/syscall.c | 22 +++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'linux-user') diff --git a/linux-user/main.c b/linux-user/main.c index 52322d4..238165f 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -162,6 +162,7 @@ void fork_end(int child) pthread_cond_init(&exclusive_cond, NULL); pthread_cond_init(&exclusive_resume, NULL); pthread_mutex_init(&tb_lock, NULL); + gdbserver_fork(thread_env); } else { pthread_mutex_unlock(&exclusive_lock); pthread_mutex_unlock(&tb_lock); @@ -254,6 +255,9 @@ void fork_start(void) void fork_end(int child) { + if (child) { + gdbserver_fork(thread_env); + } } #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 73427ab..bd60494 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2960,17 +2960,17 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, return -EINVAL; fork_start(); ret = fork(); -#if defined(USE_NPTL) - /* There is a race condition here. The parent process could - theoretically read the TID in the child process before the child - tid is set. This would require using either ptrace - (not implemented) or having *_tidptr to point at a shared memory - mapping. We can't repeat the spinlock hack used above because - the child process gets its own copy of the lock. */ if (ret == 0) { + /* Child Process. */ cpu_clone_regs(env, newsp); fork_end(1); - /* Child Process. */ +#if defined(USE_NPTL) + /* There is a race condition here. The parent process could + theoretically read the TID in the child process before the child + tid is set. This would require using either ptrace + (not implemented) or having *_tidptr to point at a shared memory + mapping. We can't repeat the spinlock hack used above because + the child process gets its own copy of the lock. */ if (flags & CLONE_CHILD_SETTID) put_user_u32(gettid(), child_tidptr); if (flags & CLONE_PARENT_SETTID) @@ -2979,14 +2979,10 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, if (flags & CLONE_SETTLS) cpu_set_tls (env, newtls); /* TODO: Implement CLONE_CHILD_CLEARTID. */ +#endif } else { fork_end(0); } -#else - if (ret == 0) { - cpu_clone_regs(env, newsp); - } -#endif } return ret; } -- cgit v1.1