[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 upstream 22/22] add Win32 IPI service
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 upstream 22/22] add Win32 IPI service |
Date: |
Sat, 26 Feb 2011 16:40:19 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpus.c | 25 ++++++++++++++++++++++---
qemu-thread-posix.c | 9 ---------
qemu-thread-posix.h | 1 -
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/cpus.c b/cpus.c
index 34ef862..a2de3c2 100644
--- a/cpus.c
+++ b/cpus.c
@@ -854,13 +854,32 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
return NULL;
}
+static void qemu_cpu_kick_thread(CPUState *env)
+{
+#ifndef _WIN32
+ int err;
+
+ err = pthread_kill(env->thread->thread, SIG_IPI);
+ if (err) {
+ fprintf(stderr, "qemu:%s: %s", __func__, strerror(err));
+ exit(1);
+ }
+#else /* _WIN32 */
+ if (!qemu_cpu_is_self(env)) {
+ SuspendThread(env->thread->thread);
+ cpu_signal(0);
+ ResumeThread(env->thread->thread);
+ }
+#endif
+}
+
void qemu_cpu_kick(void *_env)
{
CPUState *env = _env;
qemu_cond_broadcast(env->halt_cond);
if (!env->thread_kicked) {
- qemu_thread_signal(env->thread, SIG_IPI);
+ qemu_cpu_kick_thread(env);
env->thread_kicked = true;
}
}
@@ -871,7 +890,7 @@ void qemu_cpu_kick_self(void)
assert(cpu_single_env);
if (!cpu_single_env->thread_kicked) {
- qemu_thread_signal(cpu_single_env->thread, SIG_IPI);
+ qemu_cpu_kick_thread(cpu_single_env);
cpu_single_env->thread_kicked = true;
}
#else
@@ -893,7 +912,7 @@ void qemu_mutex_lock_iothread(void)
} else {
qemu_mutex_lock(&qemu_fair_mutex);
if (qemu_mutex_trylock(&qemu_global_mutex)) {
- qemu_thread_signal(tcg_cpu_thread, SIG_IPI);
+ qemu_cpu_kick_thread(first_cpu);
qemu_mutex_lock(&qemu_global_mutex);
}
qemu_mutex_unlock(&qemu_fair_mutex);
diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c
index a4c6e25..9cceda7 100644
--- a/qemu-thread-posix.c
+++ b/qemu-thread-posix.c
@@ -186,15 +186,6 @@ void qemu_thread_create(QemuThread *thread,
pthread_sigmask(SIG_SETMASK, &oldset, NULL);
}
-void qemu_thread_signal(QemuThread *thread, int sig)
-{
- int err;
-
- err = pthread_kill(thread->thread, sig);
- if (err)
- error_exit(err, __func__);
-}
-
void qemu_thread_get_self(QemuThread *thread)
{
thread->thread = pthread_self();
diff --git a/qemu-thread-posix.h b/qemu-thread-posix.h
index 11978db..35e0a8b 100644
--- a/qemu-thread-posix.h
+++ b/qemu-thread-posix.h
@@ -15,5 +15,4 @@ struct QemuThread {
pthread_t thread;
};
-void qemu_thread_signal(QemuThread *thread, int sig);
#endif
--
1.7.4
- [Qemu-devel] [PATCH v2 upstream 14/22] do not use timedwait on qemu_halt_cond, (continued)
- [Qemu-devel] [PATCH v2 upstream 14/22] do not use timedwait on qemu_halt_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 16/22] do not use timedwait on qemu_pause_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 15/22] do not use timedwait on qemu_system_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 17/22] do not use timedwait on qemu_cpu_cond, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 19/22] move blocking of signals to qemu_signalfd_init, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 18/22] iothread stops the vcpu thread via IPI, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 21/22] protect qemu_cpu_kick_self for Win32, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 20/22] provide dummy signal init functions for win32, Paolo Bonzini, 2011/02/26
- [Qemu-devel] [PATCH v2 upstream 22/22] add Win32 IPI service,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH v2 uq/master 00/22] Win32 iothread support, Blue Swirl, 2011/02/26
- [Qemu-devel] Re: [PATCH v2 uq/master 00/22] Win32 iothread support, Jan Kiszka, 2011/02/27