From nobody Mon Feb 9 10:47:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586526978; cv=none; d=zohomail.com; s=zohoarc; b=UJMLjAyrTuuAC9tl+cN1kzUbABDjSJbv2Q47gbqL9iUVMZBDo6I+AVLr6HdylZuhSrTJyYp8h7Dc4b2oxTeLwDv4gcLEMfZF4lqRCQRUD/FWB3CqLQufOwqszQjmV33x1CkYJ2NZm7YiUOKr5BNgZo/CpUXrlH1Irrqquh8cLoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586526978; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5yIfH4oFVGfdV3tZIM2d728y+6DrDOhGs2B/2ZcEN+o=; b=BS76g7x3vdcCoWWqjoPjdDb+vVknxrv0wT61j3cCw/pX0AatCtxDdtjNHq149cZRGcfEBt0kXLqU+O1zbvMBY4aYGx0kul3ASRsfDxYVaJKbkHXm3p5LaA9bGxfr4Ihc//M4YS4aWCfH9MIisvg4Zpx4RJ6WrEo0mrmABNUmJhI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1586526978110171.52522900778126; Fri, 10 Apr 2020 06:56:18 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-473-4NkqrVUHMcyKbKTY7O7XBg-1; Fri, 10 Apr 2020 09:56:14 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B47AF104FB6C; Fri, 10 Apr 2020 13:56:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 866249E0D6; Fri, 10 Apr 2020 13:56:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3023C180880C; Fri, 10 Apr 2020 13:56:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03ADtlNB023004 for ; Fri, 10 Apr 2020 09:55:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id F30972166B35; Fri, 10 Apr 2020 13:55:46 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEE932166B34 for ; Fri, 10 Apr 2020 13:55:46 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D0725802D05 for ; Fri, 10 Apr 2020 13:55:46 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-492-kn1J0IgeOn-DpsCmErndTw-1; Fri, 10 Apr 2020 09:55:44 -0400 Received: by mail-wr1-f65.google.com with SMTP id 65so2413984wrl.1 for ; Fri, 10 Apr 2020 06:55:44 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id c11sm3066319wrt.24.2020.04.10.06.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2020 06:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586526976; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5yIfH4oFVGfdV3tZIM2d728y+6DrDOhGs2B/2ZcEN+o=; b=h2KDgpKwgXYuRo4krbUr/EEKHvgQLu6tBjDE8tvYRH2vaAIyiqZ1tYjkjJOm7yrzd0XQbJ X3qCGhPfbsUbhLIx5HjKclZCnkDo5I9/JJu5v9nP1qJwQc7O4Hnl6yRCISrzXcbjuv7bsC HxnKt/OIl+SNd5+V3KHiORJoQHqrrhA= X-MC-Unique: 4NkqrVUHMcyKbKTY7O7XBg-1 X-MC-Unique: kn1J0IgeOn-DpsCmErndTw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uKqnIs9VIez/4n8nNAEBJMfdFOWImZOH4pLXTibob/U=; b=jEMjPqnPuDGnCOQS/8iy/8RT5kg4fFN0WOROKTuSKYsorEq4I9uew5Dhjx1xPFLPln rbuq3FmJWKdMjydcTQKfNN+7B0/pWJJXjRWy24oD7F6reiJRY+yD28ayhZWKAdA6slwN tZAjYJTvIsy5U3nSMEnoShXXcCDQGsoND2dUSd0oxlqiLUbWxgUOkjIT5VB+QNPoYyiF ZdytjZeDqg4U78BbL00/KIWnM1UB2szm8zXuyNcehd1B9qCg7wEfJ+iIdRA4aEXP/kHJ cjscghsipRpiEde+IJtauU3kbYXjMuECzJNO5xl2/weVOhiQxZNLvVncrRlie/5DPaYq 7I9A== X-Gm-Message-State: AGi0Pua5omOyr36jIASu5g+JnuDLm7g2u4lDIsRYUtOpjZBfG067AKFX L4gUotYghdQPJ7JBBb0U+N0mzkUhlXA= X-Google-Smtp-Source: APiQypIIyt6uX1sYcxOuPJPZcsbQxp3bbKUlvAxtVjenED6iFy0zMEUcKdKtqHPrbJgqX49RVX06lA== X-Received: by 2002:a5d:4746:: with SMTP id o6mr4739512wrs.304.1586526942704; Fri, 10 Apr 2020 06:55:42 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 11/43] locking: convert virMutex to GMutex Date: Fri, 10 Apr 2020 15:54:38 +0200 Message-Id: <20200410135510.2148319-12-r4f4rfs@gmail.com> In-Reply-To: <20200410135510.2148319-1-r4f4rfs@gmail.com> References: <20200410135510.2148319-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03ADtlNB023004 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/locking/lock_daemon.c | 32 +++++++++--------------------- src/locking/lock_daemon.h | 2 +- src/locking/lock_daemon_dispatch.c | 32 ++++++++---------------------- 3 files changed, 18 insertions(+), 48 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 4eff63014a..69aa1f688a 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -59,7 +59,7 @@ VIR_LOG_INIT("locking.lock_daemon"); #define VIR_LOCK_DAEMON_NUM_LOCKSPACES 3 =20 struct _virLockDaemon { - virMutex lock; + GMutex lock; virNetDaemonPtr dmn; virHashTablePtr lockspaces; virLockSpacePtr defaultLockspace; @@ -89,7 +89,7 @@ virLockDaemonFree(virLockDaemonPtr lockd) if (!lockd) return; =20 - virMutexDestroy(&lockd->lock); + g_mutex_clear(&lockd->lock); virObjectUnref(lockd->dmn); virHashFree(lockd->lockspaces); virLockSpaceFree(lockd->defaultLockspace); @@ -100,13 +100,13 @@ virLockDaemonFree(virLockDaemonPtr lockd) static inline void virLockDaemonLock(virLockDaemonPtr lockd) { - virMutexLock(&lockd->lock); + g_mutex_lock(&lockd->lock); } =20 static inline void virLockDaemonUnlock(virLockDaemonPtr lockd) { - virMutexUnlock(&lockd->lock); + g_mutex_unlock(&lockd->lock); } =20 static void virLockDaemonLockSpaceDataFree(void *data) @@ -123,12 +123,7 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool p= rivileged) if (VIR_ALLOC(lockd) < 0) return NULL; =20 - if (virMutexInit(&lockd->lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to initialize mutex")); - VIR_FREE(lockd); - return NULL; - } + g_mutex_init(&lockd->lock); =20 if (!(lockd->dmn =3D virNetDaemonNew())) goto error; @@ -220,12 +215,7 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object= , bool privileged) if (VIR_ALLOC(lockd) < 0) return NULL; =20 - if (virMutexInit(&lockd->lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to initialize mutex")); - VIR_FREE(lockd); - return NULL; - } + g_mutex_init(&lockd->lock); =20 if (!(lockd->lockspaces =3D virHashCreate(VIR_LOCK_DAEMON_NUM_LOCKSPAC= ES, virLockDaemonLockSpaceDataFree= ))) @@ -450,7 +440,7 @@ virLockDaemonClientFree(void *opaque) } } =20 - virMutexDestroy(&priv->lock); + g_mutex_clear(&priv->lock); VIR_FREE(priv->ownerName); VIR_FREE(priv); } @@ -469,11 +459,7 @@ virLockDaemonClientNew(virNetServerClientPtr client, if (VIR_ALLOC(priv) < 0) return NULL; =20 - if (virMutexInit(&priv->lock) < 0) { - VIR_FREE(priv); - virReportSystemError(errno, "%s", _("unable to init mutex")); - return NULL; - } + g_mutex_init(&priv->lock); =20 if (virNetServerClientGetUNIXIdentity(client, &clientuid, @@ -508,7 +494,7 @@ virLockDaemonClientNew(virNetServerClientPtr client, return priv; =20 error: - virMutexDestroy(&priv->lock); + g_mutex_clear(&priv->lock); VIR_FREE(priv); return NULL; } diff --git a/src/locking/lock_daemon.h b/src/locking/lock_daemon.h index 7d30551c32..2405ef2036 100644 --- a/src/locking/lock_daemon.h +++ b/src/locking/lock_daemon.h @@ -30,7 +30,7 @@ typedef struct _virLockDaemonClient virLockDaemonClient; typedef virLockDaemonClient *virLockDaemonClientPtr; =20 struct _virLockDaemonClient { - virMutex lock; + GMutex lock; bool restricted; =20 pid_t ownerPid; diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_d= ispatch.c index 1a53772366..1587785606 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -48,8 +48,7 @@ virLockSpaceProtocolDispatchAcquireResource(virNetServerP= tr server G_GNUC_UNUSED virNetServerClientGetPrivateData(client); virLockSpacePtr lockspace; unsigned int newFlags; - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 virCheckFlagsGoto(VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED | VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE,= cleanup); @@ -90,7 +89,6 @@ virLockSpaceProtocolDispatchAcquireResource(virNetServerP= tr server G_GNUC_UNUSED cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } =20 @@ -107,8 +105,7 @@ virLockSpaceProtocolDispatchCreateResource(virNetServer= Ptr server G_GNUC_UNUSED, virLockDaemonClientPtr priv =3D virNetServerClientGetPrivateData(client); virLockSpacePtr lockspace; - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 virCheckFlagsGoto(0, cleanup); =20 @@ -139,7 +136,6 @@ virLockSpaceProtocolDispatchCreateResource(virNetServer= Ptr server G_GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } =20 @@ -156,8 +152,7 @@ virLockSpaceProtocolDispatchDeleteResource(virNetServer= Ptr server G_GNUC_UNUSED, virLockDaemonClientPtr priv =3D virNetServerClientGetPrivateData(client); virLockSpacePtr lockspace; - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 virCheckFlagsGoto(0, cleanup); =20 @@ -188,7 +183,6 @@ virLockSpaceProtocolDispatchDeleteResource(virNetServer= Ptr server G_GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } =20 @@ -205,8 +199,7 @@ virLockSpaceProtocolDispatchNew(virNetServerPtr server = G_GNUC_UNUSED, virLockDaemonClientPtr priv =3D virNetServerClientGetPrivateData(client); virLockSpacePtr lockspace; - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 virCheckFlagsGoto(0, cleanup); =20 @@ -244,7 +237,6 @@ virLockSpaceProtocolDispatchNew(virNetServerPtr server = G_GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } =20 @@ -260,8 +252,7 @@ virLockSpaceProtocolDispatchRegister(virNetServerPtr se= rver G_GNUC_UNUSED, unsigned int flags =3D args->flags; virLockDaemonClientPtr priv =3D virNetServerClientGetPrivateData(client); - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 virCheckFlagsGoto(0, cleanup); =20 @@ -289,7 +280,6 @@ virLockSpaceProtocolDispatchRegister(virNetServerPtr se= rver G_GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } =20 @@ -306,8 +296,7 @@ virLockSpaceProtocolDispatchReleaseResource(virNetServe= rPtr server G_GNUC_UNUSED virLockDaemonClientPtr priv =3D virNetServerClientGetPrivateData(client); virLockSpacePtr lockspace; - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 virCheckFlagsGoto(0, cleanup); =20 @@ -340,7 +329,6 @@ virLockSpaceProtocolDispatchReleaseResource(virNetServe= rPtr server G_GNUC_UNUSED cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } =20 @@ -356,8 +344,7 @@ virLockSpaceProtocolDispatchRestrict(virNetServerPtr se= rver G_GNUC_UNUSED, unsigned int flags =3D args->flags; virLockDaemonClientPtr priv =3D virNetServerClientGetPrivateData(client); - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 virCheckFlagsGoto(0, cleanup); =20 @@ -379,7 +366,6 @@ virLockSpaceProtocolDispatchRestrict(virNetServerPtr se= rver G_GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } =20 @@ -395,8 +381,7 @@ virLockSpaceProtocolDispatchCreateLockSpace(virNetServe= rPtr server G_GNUC_UNUSED virLockDaemonClientPtr priv =3D virNetServerClientGetPrivateData(client); virLockSpacePtr lockspace; - - virMutexLock(&priv->lock); + g_autoptr(GMutexLocker) locker =3D g_mutex_locker_new(&priv->lock); =20 if (priv->restricted) { virReportError(VIR_ERR_OPERATION_DENIED, "%s", @@ -424,6 +409,5 @@ virLockSpaceProtocolDispatchCreateLockSpace(virNetServe= rPtr server G_GNUC_UNUSED cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return rv; } --=20 2.25.2