From patchwork Mon Feb 28 09:10:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 594661 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1S9AsEa006678 for ; Mon, 28 Feb 2011 09:10:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752980Ab1B1JKu (ORCPT ); Mon, 28 Feb 2011 04:10:50 -0500 Received: from mail-gx0-f174.google.com ([209.85.161.174]:36202 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752873Ab1B1JKr (ORCPT ); Mon, 28 Feb 2011 04:10:47 -0500 Received: by mail-gx0-f174.google.com with SMTP id 8so1438591gxk.19 for ; Mon, 28 Feb 2011 01:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=ExauzCAsr4L1BdjykkhaDaxzKiHP3pQYD5bLOWHUWks=; b=FxpmNTaT0+hzNy1Y5S82kTjODHfPZ3AwihZ7bKTjSiPISWdooN4WEZjOW7MXcpjzqQ zV92v/pAWVUVPVq2W81d/+c9pZYfrKJI/IwXNnxZnR2yR7sMKbmSvuNji2J+wz4nCUjd h92Hwvqq+BWvhaaipATSQPmCbPDbP9uoKX4ZE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=M5xKpzjkOXbFbghzDH+shMRgXkJB4azMhZeBUYajzWs2Fvof4YQpOVsmJS4tVx3zhR XBh7tz5tOjYvRosxwXrhL3xkk/TYxZ6vyfC/UiNTLQf99MaFAnLUTHL8Ua7OmfK8DZPu H7dbv2CfwukW41K0TJaY/4nu8A/WpITynZGRQ= Received: by 10.151.77.42 with SMTP id e42mr6808179ybl.367.1298884247131; Mon, 28 Feb 2011 01:10:47 -0800 (PST) Received: from localhost.localdomain (93-34-149-100.ip50.fastwebnet.it [93.34.149.100]) by mx.google.com with ESMTPS id 1sm2037209yhl.11.2011.02.28.01.10.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Feb 2011 01:10:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, aurelien@aurel32.net, blauwirbel@gmail.com, jan.kiszka@siemes.com, mtosatti@redhat.com, Jan Kiszka Subject: [PATCH v3 uq/master 04/22] Refactor thread retrieval and check Date: Mon, 28 Feb 2011 10:10:06 +0100 Message-Id: <1298884224-19734-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> References: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 28 Feb 2011 09:10:55 +0000 (UTC) diff --git a/cpus.c b/cpus.c index 0f33945..09ce6fe 100644 --- a/cpus.c +++ b/cpus.c @@ -531,7 +531,7 @@ void qemu_init_vcpu(void *_env) } } -int qemu_cpu_self(void *env) +int qemu_cpu_is_self(void *env) { return 1; } @@ -699,7 +699,7 @@ int qemu_init_main_loop(void) qemu_mutex_init(&qemu_global_mutex); qemu_mutex_lock(&qemu_global_mutex); - qemu_thread_self(&io_thread); + qemu_thread_get_self(&io_thread); return 0; } @@ -714,7 +714,7 @@ void run_on_cpu(CPUState *env, void (*func)(void *data), void *data) { struct qemu_work_item wi; - if (qemu_cpu_self(env)) { + if (qemu_cpu_is_self(env)) { func(data); return; } @@ -808,7 +808,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) int r; qemu_mutex_lock(&qemu_global_mutex); - qemu_thread_self(env->thread); + qemu_thread_get_self(env->thread); r = kvm_init_vcpu(env); if (r < 0) { @@ -845,7 +845,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) CPUState *env = arg; qemu_tcg_init_cpu_signals(); - qemu_thread_self(env->thread); + qemu_thread_get_self(env->thread); /* signal CPU creation */ qemu_mutex_lock(&qemu_global_mutex); @@ -888,14 +888,11 @@ void qemu_cpu_kick_self(void) } } -int qemu_cpu_self(void *_env) +int qemu_cpu_is_self(void *_env) { CPUState *env = _env; - QemuThread this; - qemu_thread_self(&this); - - return qemu_thread_equal(&this, env->thread); + return qemu_thread_is_self(env->thread); } void qemu_mutex_lock_iothread(void) @@ -1023,10 +1020,7 @@ void cpu_stop_current(void) void vm_stop(int reason) { - QemuThread me; - qemu_thread_self(&me); - - if (!qemu_thread_equal(&me, &io_thread)) { + if (!qemu_thread_is_self(&io_thread)) { qemu_system_vmstop_request(reason); /* * FIXME: should not return to device code in case diff --git a/exec.c b/exec.c index d611100..439a6f6 100644 --- a/exec.c +++ b/exec.c @@ -1640,7 +1640,7 @@ void cpu_interrupt(CPUState *env, int mask) * If called from iothread context, wake the target cpu in * case its halted. */ - if (!qemu_cpu_self(env)) { + if (!qemu_cpu_is_self(env)) { qemu_cpu_kick(env); return; } diff --git a/qemu-common.h b/qemu-common.h index 40dad52..958a002 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -289,7 +289,7 @@ void qemu_notify_event(void); /* Unblock cpu */ void qemu_cpu_kick(void *env); void qemu_cpu_kick_self(void); -int qemu_cpu_self(void *env); +int qemu_cpu_is_self(void *env); /* work queue */ struct qemu_work_item { diff --git a/qemu-thread.c b/qemu-thread.c index fbc78fe..e307773 100644 --- a/qemu-thread.c +++ b/qemu-thread.c @@ -176,14 +176,14 @@ void qemu_thread_signal(QemuThread *thread, int sig) error_exit(err, __func__); } -void qemu_thread_self(QemuThread *thread) +void qemu_thread_get_self(QemuThread *thread) { thread->thread = pthread_self(); } -int qemu_thread_equal(QemuThread *thread1, QemuThread *thread2) +int qemu_thread_is_self(QemuThread *thread) { - return pthread_equal(thread1->thread, thread2->thread); + return pthread_equal(pthread_self(), thread->thread); } void qemu_thread_exit(void *retval) diff --git a/qemu-thread.h b/qemu-thread.h index 19bb30c..add97bf 100644 --- a/qemu-thread.h +++ b/qemu-thread.h @@ -37,8 +37,8 @@ void qemu_thread_create(QemuThread *thread, void *(*start_routine)(void*), void *arg); void qemu_thread_signal(QemuThread *thread, int sig); -void qemu_thread_self(QemuThread *thread); -int qemu_thread_equal(QemuThread *thread1, QemuThread *thread2); +void qemu_thread_get_self(QemuThread *thread); +int qemu_thread_is_self(QemuThread *thread); void qemu_thread_exit(void *retval); #endif diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0aa0a41..1f12cbf 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1355,7 +1355,7 @@ int kvm_arch_put_registers(CPUState *env, int level) { int ret; - assert(cpu_is_stopped(env) || qemu_cpu_self(env)); + assert(cpu_is_stopped(env) || qemu_cpu_is_self(env)); ret = kvm_getput_regs(env, 1); if (ret < 0) { @@ -1403,7 +1403,7 @@ int kvm_arch_get_registers(CPUState *env) { int ret; - assert(cpu_is_stopped(env) || qemu_cpu_self(env)); + assert(cpu_is_stopped(env) || qemu_cpu_is_self(env)); ret = kvm_getput_regs(env, 0); if (ret < 0) { diff --git a/ui/vnc-jobs-async.c b/ui/vnc-jobs-async.c index f596247..1dfa6c3 100644 --- a/ui/vnc-jobs-async.c +++ b/ui/vnc-jobs-async.c @@ -303,7 +303,7 @@ static void *vnc_worker_thread(void *arg) { VncJobQueue *queue = arg; - qemu_thread_self(&queue->thread); + qemu_thread_get_self(&queue->thread); while (!vnc_worker_thread_loop(queue)) ; vnc_queue_clear(queue);