From nobody Tue Feb 10 01:35:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1667317064; cv=none; d=zohomail.com; s=zohoarc; b=hsbHUf/V58mJ1r/QdL/4UDz1CvaTeNRCRY2x1isBIYYWog2asuswumVnugdsC4igkNTx+0KCH/0KScN0cySeymXswOTOA4slkE7+hRDaQtPFAmajKM0PIHfwt5yMLqY2yfMsBh+CtCl5RujqRofJb3ReedA0WTT2EypEyUAdkfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667317064; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SBeCcFuOhLUEwWwrku8ezHj3ySsRMOxBoKQyjJXO/Rw=; b=My6fbIKD7GCcbyBcAN1p6p607cvLAiqPjXd4nxo/zDqWjrVArCNme+x5qkUVKZtrhNK2LTjcpp98g14ZaNDELB+smSBKCaouMgwiHXJuBZRa06MEtmy5ooFcwcacjfMhoRJOd0gHVdL/cfwfSXe57XBAtNyopEin5HIahG8O3gM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1667317064247655.0826157908243; Tue, 1 Nov 2022 08:37:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.434913.687745 (Exim 4.92) (envelope-from ) id 1optKN-0007Ii-22; Tue, 01 Nov 2022 15:37:23 +0000 Received: by outflank-mailman (output) from mailman id 434913.687745; Tue, 01 Nov 2022 15:37:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1optKM-0007Ib-Uv; Tue, 01 Nov 2022 15:37:22 +0000 Received: by outflank-mailman (input) for mailman id 434913; Tue, 01 Nov 2022 15:37:21 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1optCy-0007Tl-Nq for xen-devel@lists.xenproject.org; Tue, 01 Nov 2022 15:29:44 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2001:67c:2178:6::1d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0183a777-59fa-11ed-91b5-6bf2151ebd3b; Tue, 01 Nov 2022 16:29:42 +0100 (CET) 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-out2.suse.de (Postfix) with ESMTPS id F3FA51F8E3; Tue, 1 Nov 2022 15:29:41 +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 C7DC61346F; Tue, 1 Nov 2022 15:29:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id W4FOL2U7YWPvYAAAMHmgww (envelope-from ); Tue, 01 Nov 2022 15:29:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 0183a777-59fa-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1667316582; 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: in-reply-to:in-reply-to:references:references; bh=SBeCcFuOhLUEwWwrku8ezHj3ySsRMOxBoKQyjJXO/Rw=; b=GKHnzEtw0Utvfi1KYA0w3j9knflkiyuEPxBNpn2l9n0YccG2EaIzQKsOPnEcyzTgHKs2xI /VfnGYAfcuqBZH3aP7VUxPEthZNYbq4ikvy+v9S829wbxc9iXLJ/sfJ5N3LuPj2952BFvC +LNPV+7SFeCLpynsKx1ITNzbn9F/KMI= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH 10/20] tools/xenstore: replace watch->relative_path with a prefix length Date: Tue, 1 Nov 2022 16:28:32 +0100 Message-Id: <20221101152842.4257-11-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221101152842.4257-1-jgross@suse.com> References: <20221101152842.4257-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1667317066005100001 Content-Type: text/plain; charset="utf-8" Instead of storing a pointer to the path which is prepended to relative paths in struct watch, just use the length of the prepended path. It should be noted that the now removed special case of the relative path being "" in get_watch_path() can't happen at all. Signed-off-by: Juergen Gross --- tools/xenstore/xenstored_watch.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_wa= tch.c index 75748ac109..8bed967c56 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -39,8 +39,8 @@ struct watch /* Current outstanding events applying to this watch. */ struct list_head events; =20 - /* Is this relative to connnection's implicit path? */ - const char *relative_path; + /* Offset into path for skipping prefix (used for relative paths). */ + unsigned int prefix_len; =20 char *token; char *node; @@ -66,15 +66,7 @@ static bool is_child(const char *child, const char *pare= nt) =20 static const char *get_watch_path(const struct watch *watch, const char *n= ame) { - const char *path =3D name; - - if (watch->relative_path) { - path +=3D strlen(watch->relative_path); - if (*path =3D=3D '/') /* Could be "" */ - path++; - } - - return path; + return name + watch->prefix_len; } =20 /* @@ -211,10 +203,7 @@ static struct watch *add_watch(struct connection *conn= , char *path, char *token, no_quota_check)) goto nomem; =20 - if (relative) - watch->relative_path =3D get_implicit_path(conn); - else - watch->relative_path =3D NULL; + watch->prefix_len =3D relative ? strlen(get_implicit_path(conn)) + 1 : 0; =20 INIT_LIST_HEAD(&watch->events); =20 @@ -316,7 +305,6 @@ const char *dump_state_watches(FILE *fp, struct connect= ion *conn, struct watch *watch; struct xs_state_watch sw; struct xs_state_record_header head; - const char *path; =20 head.type =3D XS_STATE_TYPE_WATCH; =20 @@ -324,8 +312,7 @@ const char *dump_state_watches(FILE *fp, struct connect= ion *conn, head.length =3D sizeof(sw); =20 sw.conn_id =3D conn_id; - path =3D get_watch_path(watch, watch->node); - sw.path_length =3D strlen(path) + 1; + sw.path_length =3D strlen(watch->node + watch->prefix_len) + 1; sw.token_length =3D strlen(watch->token) + 1; head.length +=3D sw.path_length + sw.token_length; head.length =3D ROUNDUP(head.length, 3); @@ -334,7 +321,8 @@ const char *dump_state_watches(FILE *fp, struct connect= ion *conn, if (fwrite(&sw, sizeof(sw), 1, fp) !=3D 1) return "Dump watch state error"; =20 - if (fwrite(path, sw.path_length, 1, fp) !=3D 1) + if (fwrite(watch->node + watch->prefix_len, sw.path_length, + 1, fp) !=3D 1) return "Dump watch path error"; if (fwrite(watch->token, sw.token_length, 1, fp) !=3D 1) return "Dump watch token error"; --=20 2.35.3