From nobody Sun Feb 8 17:47:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604412288; cv=none; d=zohomail.com; s=zohoarc; b=Q04fDjNXYImxRnnAyqWHkOSLjN04A19JrIGRC0XWWwVm/+voxAx/N2Db6NmbgpwJfreAb9eWSbaiwYIpu3zGog+7tSwVsmJ/M4sXILw3eNx/chNDXAc7RxbMd+o3pWcCucaE9dMNb9FWg5i5vJqE0auzObG2YtoY1rexU/Z7WFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604412288; 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=YC2TS3VqAycTRmYfO/3l/0PPPilQhWOhqd3f45gFHJI=; b=HJnZjYBsHV1nOTAWiiKI+jmjoomoZOHw7Zq+ht8F+rf9cOtqVmAyy5+Tt9Semr3X5A6XObbagDctaDKKvhpirh8uPYk5eP1t/tcClmqR0dfEnBFzFQwMte3FI7Q3+iCImkpgolnwHEeqyp/VGJzQ2oG9hJX/qcM7PtsblyVfnPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604412288178732.9715724010814; Tue, 3 Nov 2020 06:04:48 -0800 (PST) Received: from localhost ([::1]:33194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZwvV-0008UD-8W for importer@patchew.org; Tue, 03 Nov 2020 09:04:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZwts-0006od-LI for qemu-devel@nongnu.org; Tue, 03 Nov 2020 09:03:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZwtp-0003N3-2x for qemu-devel@nongnu.org; Tue, 03 Nov 2020 09:03:04 -0500 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-182-7dAK9RtPPpOFv1CZ_rcU9g-1; Tue, 03 Nov 2020 09:02:57 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 850C0835B49 for ; Tue, 3 Nov 2020 14:02:56 +0000 (UTC) Received: from fedora.redhat.com (ovpn-115-87.ams2.redhat.com [10.36.115.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id B13FB5B4D6; Tue, 3 Nov 2020 14:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604412179; h=from:from: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; bh=YC2TS3VqAycTRmYfO/3l/0PPPilQhWOhqd3f45gFHJI=; b=PdjH0/U6CwNzRs0ZsOTXvyt6f+Twh8PyvSlCdGGgu8vqxujl34ZS4cgJCsvd7pFIxaL2pC hqMTCNYZ4Y0B22gm9hfo4Mj/M5cgZr9kqbsm1HSMIf9ETuvoVRuBjJ6/iCmNlcONrMLdlo 8XPs8OBbcTIHyfGjrmsiiB8isK4W0c8= X-MC-Unique: 7dAK9RtPPpOFv1CZ_rcU9g-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/11] test-util-sockets: Synchronize properly, don't sleep(1) Date: Tue, 3 Nov 2020 14:02:19 +0000 Message-Id: <20201103140225.496776-6-berrange@redhat.com> In-Reply-To: <20201103140225.496776-1-berrange@redhat.com> References: <20201103140225.496776-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 01:02:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Markus Armbruster The abstract sockets test spawns a thread to listen and accept, and a second one to connect, with a sleep(1) in between to "ensure" the former is listening when the latter tries to connect. Review fail. Risks spurious test failure, say when a heavily loaded machine doesn't schedule the first thread quickly enough. It's also slow. Listen and accept in the main thread, and start the connect thread in between. Look ma, no sleep! Run time drops from 2s wall clock to a few milliseconds. Reviewed-by: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/test-util-sockets.c | 40 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c index 40ff893e64..4cedf622f0 100644 --- a/tests/test-util-sockets.c +++ b/tests/test-util-sockets.c @@ -230,26 +230,6 @@ static void test_socket_fd_pass_num_nocli(void) #endif =20 #ifdef __linux__ -static gpointer unix_server_thread_func(gpointer user_data) -{ - SocketAddress *addr =3D user_data; - int fd; - int connfd; - struct sockaddr_un un; - socklen_t len =3D sizeof(un); - - fd =3D socket_listen(addr, 1, &error_abort); - g_assert_cmpint(fd, >=3D, 0); - g_assert(fd_is_socket(fd)); - - connfd =3D accept(fd, (struct sockaddr *)&un, &len); - g_assert_cmpint(connfd, !=3D, -1); - close(connfd); - - close(fd); - return NULL; -} - static gpointer unix_client_thread_func(gpointer user_data) { SocketAddress *addr =3D user_data; @@ -263,20 +243,26 @@ static gpointer unix_client_thread_func(gpointer user= _data) =20 static void test_socket_unix_abstract_one(SocketAddress *addr) { - GThread *serv, *cli; - - serv =3D g_thread_new("abstract_unix_server", - unix_server_thread_func, - addr); + int fd, connfd; + GThread *cli; + struct sockaddr_un un; + socklen_t len =3D sizeof(un); =20 - sleep(1); + fd =3D socket_listen(addr, 1, &error_abort); + g_assert_cmpint(fd, >=3D, 0); + g_assert(fd_is_socket(fd)); =20 cli =3D g_thread_new("abstract_unix_client", unix_client_thread_func, addr); =20 + connfd =3D accept(fd, (struct sockaddr *)&un, &len); + g_assert_cmpint(connfd, !=3D, -1); + close(connfd); + + close(fd); + g_thread_join(cli); - g_thread_join(serv); } =20 static void test_socket_unix_abstract_good(void) --=20 2.28.0