ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename USE_NPTL to CONFIG_USE_NPTL 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-07-27 16:13:24 +02:00 committed by Anthony Liguori
parent 75b5a697ed
commit 2f7bb8780a
11 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd-user/mmap.c
View File

@ -30,7 +30,7 @@
//#define DEBUG_MMAP //#define DEBUG_MMAP
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
pthread_mutex_t mmap_mutex; pthread_mutex_t mmap_mutex;
static int __thread mmap_lock_count; static int __thread mmap_lock_count;

6
bsd-user/qemu.h
View File

@ -24,7 +24,7 @@ enum BSDType {
#include "target_signal.h" #include "target_signal.h"
#include "gdbstub.h" #include "gdbstub.h"
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#define THREAD __thread #define THREAD __thread
#else #else
#define THREAD #define THREAD
@ -188,7 +188,7 @@ void mmap_lock(void);
void mmap_unlock(void); void mmap_unlock(void);
void cpu_list_lock(void); void cpu_list_lock(void);
void cpu_list_unlock(void); void cpu_list_unlock(void);
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
void mmap_fork_start(void); void mmap_fork_start(void);
void mmap_fork_end(int child); void mmap_fork_end(int child);
#endif #endif
@ -382,7 +382,7 @@ static inline void *lock_user_string(abi_ulong guest_addr)
#define unlock_user_struct(host_ptr, guest_addr, copy) \ #define unlock_user_struct(host_ptr, guest_addr, copy) \
unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0) unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0)
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#include <pthread.h> #include <pthread.h>
#endif #endif

2
configure vendored
View File

@ -2056,7 +2056,7 @@ if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
fi fi
if test "$target_user_only" = "yes" \ if test "$target_user_only" = "yes" \
-a "$nptl" = "yes" -a "$target_nptl" = "yes"; then -a "$nptl" = "yes" -a "$target_nptl" = "yes"; then
echo "USE_NPTL=y" >> $config_mak echo "CONFIG_USE_NPTL=y" >> $config_mak
fi fi
# 32 bit ELF loader in addition to native 64 bit loader? # 32 bit ELF loader in addition to native 64 bit loader?
if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then

4
create_config
View File

@ -46,10 +46,6 @@ case $line in
value=${line#*=} value=${line#*=}
echo "#define $name $value" echo "#define $name $value"
;; ;;
USE_NPTL=y) # configuration
name=${line%=*}
echo "#define $name 1"
;;
esac esac
done # read done # read

2
exec.c
View File

@ -1515,7 +1515,7 @@ void cpu_set_log_filename(const char *filename)
static void cpu_unlink_tb(CPUState *env) static void cpu_unlink_tb(CPUState *env)
{ {
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
/* FIXME: TB unchaining isn't SMP safe. For now just ignore the /* FIXME: TB unchaining isn't SMP safe. For now just ignore the
problem and hope the cpu will stop of its own accord. For userspace problem and hope the cpu will stop of its own accord. For userspace
emulation this often isn't actually as bad as it sounds. Often emulation this often isn't actually as bad as it sounds. Often

2
gdbstub.c
View File

@ -1592,7 +1592,7 @@ static void gdb_set_cpu_pc(GDBState *s, target_ulong pc)
static inline int gdb_id(CPUState *env) static inline int gdb_id(CPUState *env)
{ {
#if defined(CONFIG_USER_ONLY) && defined(USE_NPTL) #if defined(CONFIG_USER_ONLY) && defined(CONFIG_USE_NPTL)
return env->host_tid; return env->host_tid;
#else #else
return env->cpu_index + 1; return env->cpu_index + 1;

6
linux-user/main.c
View File

@ -108,7 +108,7 @@ int64_t cpu_get_real_ticks(void)
#endif #endif
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
/***********************************************************/ /***********************************************************/
/* Helper routines for implementing atomic operations. */ /* Helper routines for implementing atomic operations. */
@ -222,7 +222,7 @@ void cpu_list_unlock(void)
{ {
pthread_mutex_unlock(&cpu_list_mutex); pthread_mutex_unlock(&cpu_list_mutex);
} }
#else /* if !USE_NPTL */ #else /* if !CONFIG_USE_NPTL */
/* These are no-ops because we are not threadsafe. */ /* These are no-ops because we are not threadsafe. */
static inline void cpu_exec_start(CPUState *env) static inline void cpu_exec_start(CPUState *env)
{ {
@ -2357,7 +2357,7 @@ THREAD CPUState *thread_env;
void task_settid(TaskState *ts) void task_settid(TaskState *ts)
{ {
if (ts->ts_tid == 0) { if (ts->ts_tid == 0) {
#ifdef USE_NPTL #ifdef CONFIG_USE_NPTL
ts->ts_tid = (pid_t)syscall(SYS_gettid); ts->ts_tid = (pid_t)syscall(SYS_gettid);
#else #else
/* when no threads are used, tid becomes pid */ /* when no threads are used, tid becomes pid */

2
linux-user/mmap.c
View File

@ -33,7 +33,7 @@
//#define DEBUG_MMAP //#define DEBUG_MMAP
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
static int __thread mmap_lock_count; static int __thread mmap_lock_count;

8
linux-user/qemu.h
View File

@ -20,7 +20,7 @@
#include "gdbstub.h" #include "gdbstub.h"
#include "sys-queue.h" #include "sys-queue.h"
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#define THREAD __thread #define THREAD __thread
#else #else
#define THREAD #define THREAD
@ -104,7 +104,7 @@ typedef struct TaskState {
uint32_t v86flags; uint32_t v86flags;
uint32_t v86mask; uint32_t v86mask;
#endif #endif
#ifdef USE_NPTL #ifdef CONFIG_USE_NPTL
abi_ulong child_tidptr; abi_ulong child_tidptr;
#endif #endif
#ifdef TARGET_M68K #ifdef TARGET_M68K
@ -244,7 +244,7 @@ void mmap_unlock(void);
abi_ulong mmap_find_vma(abi_ulong, abi_ulong); abi_ulong mmap_find_vma(abi_ulong, abi_ulong);
void cpu_list_lock(void); void cpu_list_lock(void);
void cpu_list_unlock(void); void cpu_list_unlock(void);
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
void mmap_fork_start(void); void mmap_fork_start(void);
void mmap_fork_end(int child); void mmap_fork_end(int child);
#endif #endif
@ -441,7 +441,7 @@ static inline void *lock_user_string(abi_ulong guest_addr)
#define unlock_user_struct(host_ptr, guest_addr, copy) \ #define unlock_user_struct(host_ptr, guest_addr, copy) \
unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0) unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0)
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#include <pthread.h> #include <pthread.h>
#endif #endif

20
linux-user/syscall.c
View File

@ -82,7 +82,7 @@
#include "qemu.h" #include "qemu.h"
#include "qemu-common.h" #include "qemu-common.h"
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \ #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID) CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)
#else #else
@ -219,7 +219,7 @@ _syscall1(int,exit_group,int,error_code)
#if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address) #if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address)
_syscall1(int,set_tid_address,int *,tidptr) _syscall1(int,set_tid_address,int *,tidptr)
#endif #endif
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#if defined(TARGET_NR_futex) && defined(__NR_futex) #if defined(TARGET_NR_futex) && defined(__NR_futex)
_syscall6(int,sys_futex,int *,uaddr,int,op,int,val, _syscall6(int,sys_futex,int *,uaddr,int,op,int,val,
const struct timespec *,timeout,int *,uaddr2,int,val3) const struct timespec *,timeout,int *,uaddr2,int,val3)
@ -3458,7 +3458,7 @@ static abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
#endif /* defined(TARGET_I386) */ #endif /* defined(TARGET_I386) */
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#define NEW_STACK_SIZE PTHREAD_STACK_MIN #define NEW_STACK_SIZE PTHREAD_STACK_MIN
@ -3527,7 +3527,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp,
TaskState *ts; TaskState *ts;
uint8_t *new_stack; uint8_t *new_stack;
CPUState *new_env; CPUState *new_env;
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
unsigned int nptl_flags; unsigned int nptl_flags;
sigset_t sigmask; sigset_t sigmask;
#endif #endif
@ -3538,7 +3538,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp,
if (flags & CLONE_VM) { if (flags & CLONE_VM) {
TaskState *parent_ts = (TaskState *)env->opaque; TaskState *parent_ts = (TaskState *)env->opaque;
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
new_thread_info info; new_thread_info info;
pthread_attr_t attr; pthread_attr_t attr;
#endif #endif
@ -3552,7 +3552,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp,
new_env->opaque = ts; new_env->opaque = ts;
ts->bprm = parent_ts->bprm; ts->bprm = parent_ts->bprm;
ts->info = parent_ts->info; ts->info = parent_ts->info;
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
nptl_flags = flags; nptl_flags = flags;
flags &= ~CLONE_NPTL_FLAGS2; flags &= ~CLONE_NPTL_FLAGS2;
@ -3621,7 +3621,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp,
/* Child Process. */ /* Child Process. */
cpu_clone_regs(env, newsp); cpu_clone_regs(env, newsp);
fork_end(1); fork_end(1);
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
/* There is a race condition here. The parent process could /* There is a race condition here. The parent process could
theoretically read the TID in the child process before the child theoretically read the TID in the child process before the child
tid is set. This would require using either ptrace tid is set. This would require using either ptrace
@ -4016,7 +4016,7 @@ static inline abi_long host_to_target_stat64(void *cpu_env,
} }
#endif #endif
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
/* ??? Using host futex calls even when target atomic operations /* ??? Using host futex calls even when target atomic operations
are not really atomic probably breaks things. However implementing are not really atomic probably breaks things. However implementing
futexes locally would make futexes shared between multiple processes futexes locally would make futexes shared between multiple processes
@ -4126,7 +4126,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
switch(num) { switch(num) {
case TARGET_NR_exit: case TARGET_NR_exit:
#ifdef USE_NPTL #ifdef CONFIG_USE_NPTL
/* In old applications this may be used to implement _exit(2). /* In old applications this may be used to implement _exit(2).
However in threaded applictions it is used for thread termination, However in threaded applictions it is used for thread termination,
and _exit_group is used for application termination. and _exit_group is used for application termination.
@ -6828,7 +6828,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
break; break;
#endif #endif
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
case TARGET_NR_futex: case TARGET_NR_futex:
ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6); ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6);
break; break;

2
qemu-lock.h
View File

@ -23,7 +23,7 @@
likely to release it soon. In environments where you have more threads likely to release it soon. In environments where you have more threads
than physical CPUs (the extreme case being a single CPU host) a spinlock than physical CPUs (the extreme case being a single CPU host) a spinlock
simply wastes CPU until the OS decides to preempt it. */ simply wastes CPU until the OS decides to preempt it. */
#if defined(USE_NPTL) #if defined(CONFIG_USE_NPTL)
#include <pthread.h> #include <pthread.h>
#define spin_lock pthread_mutex_lock #define spin_lock pthread_mutex_lock