From nobody Wed Feb 11 03:02:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1648220642; cv=none; d=zohomail.com; s=zohoarc; b=dVeztY7m1Tbkrmh8Jfp9CEL6cf6IMOe4eESTqgnz3+WXLUPeghTFA4GB/mOHnKdXJxEumon3GO34iFB2ZYynOQvoDnwNDQ9L43aEW/esloW2GzoItLJySJd5f0B0Dt75/SJ+LG60oAiPoTwYoeFBC/r3G3VA51YEJAdZs49/mrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220642; 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=B8HZ4BftDMWb8W8Q2/THcp+4EgPmBtgq9CJ+WfxiHyA=; b=Vd0ZB6e7Lz+UbnbdGZmR1H1AeHLVv+1BxM+0FSjynU7ml6q6esmKlUoMH+0C4BJw5pu0yp9kjbYChttKkxRl8PbaRAMDK0TGOWcHbycmulp1mYqq2T8iYDTtd+E9ZsuYUj0oGOSpyYGBLWA8cJC1L3gRusJ8QKoJZ26GYpWtMp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1648220642983852.0720504915234; Fri, 25 Mar 2022 08:04:02 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-393-gf2euUSfPhGEMSja4ERKsQ-1; Fri, 25 Mar 2022 11:02:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 31E1F866DF4; Fri, 25 Mar 2022 15:02:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E89CC27D8A; Fri, 25 Mar 2022 15:02:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DE0651940358; Fri, 25 Mar 2022 15:02:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C17911940341 for ; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AFCBFC26EA0; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41BE2C27D8A; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220641; 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=B8HZ4BftDMWb8W8Q2/THcp+4EgPmBtgq9CJ+WfxiHyA=; b=MIAaJQuPcf8NOtpr9OcODhGXNsb+ZdZwuy4sUDQTXu7lvP0/z7Tel3pw/A8HozrB3j/aQu fcMw66zRU4eMR01XXx7dU9K/zBzaWM/y2aF1T1D++H1tQRu7k6XwgLcag/oqCibJVUrThs GIhdGYr/Zekz4ebRS1+1/RN8J1af0w4= X-MC-Unique: gf2euUSfPhGEMSja4ERKsQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] datatypes: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:20 +0100 Message-Id: <20220325150222.78919-9-twiederh@redhat.com> In-Reply-To: <20220325150222.78919-1-twiederh@redhat.com> References: <20220325150222.78919-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648220643459100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake --- src/datatypes.c | 63 +++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 44 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index aa614612f9..da8a9970f1 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -217,71 +217,56 @@ void virConnectCloseCallbackDataRegister(virConnectCl= oseCallbackData *closeData, void *opaque, virFreeCallback freecb) { - virObjectLock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 if (closeData->callback !=3D NULL) { - VIR_WARN("Attempt to register callback on armed" - " close callback object %p", closeData); - goto cleanup; + VIR_WARN("Attempt to register callback on armed close callback obj= ect %p", + closeData); + return; } =20 closeData->conn =3D virObjectRef(conn); closeData->callback =3D cb; closeData->opaque =3D opaque; closeData->freeCallback =3D freecb; - - cleanup: - - virObjectUnlock(closeData); } =20 void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackData *cl= oseData, virConnectCloseFunc cb) { - virObjectLock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 if (closeData->callback !=3D cb) { - VIR_WARN("Attempt to unregister different callback on " - " close callback object %p", closeData); - goto cleanup; + VIR_WARN("Attempt to unregister different callback on close callb= ack object %p", + closeData); + return; } =20 virConnectCloseCallbackDataReset(closeData); closeData->callback =3D NULL; - - cleanup: - - virObjectUnlock(closeData); } =20 void virConnectCloseCallbackDataCall(virConnectCloseCallbackData *closeDat= a, int reason) { - virObjectLock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 if (!closeData->conn) - goto exit; + return; =20 VIR_DEBUG("Triggering connection close callback %p reason=3D%d, opaque= =3D%p", closeData->callback, reason, closeData->opaque); closeData->callback(closeData->conn, reason, closeData->opaque); =20 virConnectCloseCallbackDataReset(closeData); - - exit: - virObjectUnlock(closeData); } =20 virConnectCloseFunc virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackData *closeD= ata) { - virConnectCloseFunc cb; - - virObjectLock(closeData); - cb =3D closeData->callback; - virObjectUnlock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 - return cb; + return closeData->callback; } =20 /** @@ -1128,10 +1113,9 @@ static void virAdmConnectCloseCallbackDataDispose(void *obj) { virAdmConnectCloseCallbackData *cb_data =3D obj; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(cb_data); =20 - virObjectLock(cb_data); virAdmConnectCloseCallbackDataReset(cb_data); - virObjectUnlock(cb_data); } =20 void @@ -1150,20 +1134,16 @@ int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackData *c= bdata, virAdmConnectCloseFunc cb) { - int ret =3D -1; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(cbdata); =20 - virObjectLock(cbdata); if (cbdata->callback !=3D cb) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A different callback was requested")); - goto cleanup; + return -1; } =20 virAdmConnectCloseCallbackDataReset(cbdata); - ret =3D 0; - cleanup: - virObjectUnlock(cbdata); - return ret; + return 0; } =20 int @@ -1173,14 +1153,12 @@ virAdmConnectCloseCallbackDataRegister(virAdmConnec= tCloseCallbackData *cbdata, void *opaque, virFreeCallback freecb) { - int ret =3D -1; - - virObjectLock(cbdata); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(cbdata); =20 if (cbdata->callback) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A close callback is already registered")); - goto cleanup; + return -1; } =20 cbdata->conn =3D virObjectRef(conn); @@ -1188,10 +1166,7 @@ virAdmConnectCloseCallbackDataRegister(virAdmConnect= CloseCallbackData *cbdata, cbdata->opaque =3D opaque; cbdata->freeCallback =3D freecb; =20 - ret =3D 0; - cleanup: - virObjectUnlock(conn->closeCallback); - return ret; + return 0; } =20 virAdmServerPtr --=20 2.31.1