From patchwork Tue Jun 14 15:31:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 12881256 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7813C43334 for ; Tue, 14 Jun 2022 15:32:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.349153.575333 (Exim 4.92) (envelope-from ) id 1o18WL-0000vc-WA; Tue, 14 Jun 2022 15:31:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 349153.575333; Tue, 14 Jun 2022 15:31:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o18WL-0000vV-T6; Tue, 14 Jun 2022 15:31:57 +0000 Received: by outflank-mailman (input) for mailman id 349153; Tue, 14 Jun 2022 15:31:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o18WL-0000vP-32 for xen-devel@lists.xenproject.org; Tue, 14 Jun 2022 15:31:57 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1f3d3e40-ebf7-11ec-a26a-b96bd03d9e80; Tue, 14 Jun 2022 17:31:55 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 53FF821B9F; Tue, 14 Jun 2022 15:31:55 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 21B411361C; Tue, 14 Jun 2022 15:31:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ipcIBuupqGKrYQAAMHmgww (envelope-from ); Tue, 14 Jun 2022 15:31:55 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1f3d3e40-ebf7-11ec-a26a-b96bd03d9e80 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1655220715; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=v3nOr0/TQ7TPym3sBGUMzU6nbzZrs0YvMJej6BkqOj0=; b=EG9+QAEDInNklGzH5J+3OEpiM7Vn53KhK5AKoNZNj7+rB+bo4Yu5gwlSCtiws34BfFYxWL P+WI1H1dspbtwututv0Tih0CgsGF3LRUssxiaZdL3OvzcxrPH/jTQojEPZNPQk7iw72iGk mmEjGX/s5zNgpnibKfs8LxUKk7cg3z0= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH] tools/xenstore: simplify loop handling connection I/O Date: Tue, 14 Jun 2022 17:31:52 +0200 Message-Id: <20220614153152.25919-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 The loop handling input and output of connections of xenstored is open coding list_for_each_entry_safe() in an incredibly complicated way. Use list_for_each_entry_safe() instead, making it much more clear how the code is working. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 6e4022e5da..fa733e714e 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2368,16 +2368,8 @@ int main(int argc, char *argv[]) } } - next = list_entry(connections.next, typeof(*conn), list); - if (&next->list != &connections) - talloc_increase_ref_count(next); - while (&next->list != &connections) { - conn = next; - - next = list_entry(conn->list.next, - typeof(*conn), list); - if (&next->list != &connections) - talloc_increase_ref_count(next); + list_for_each_entry_safe(conn, next, &connections, list) { + talloc_increase_ref_count(conn); if (conn_can_read(conn)) handle_input(conn);