From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Speed up project-kill-buffers Date: Mon, 03 May 2021 13:06:35 +0000 Message-ID: <871raoezl0.fsf@posteo.net> References: <87mttcgnke.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28795"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon May 03 15:18:44 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ldYTD-0007Nt-PL for ged-emacs-devel@m.gmane-mx.org; Mon, 03 May 2021 15:18:43 +0200 Original-Received: from localhost ([::1]:54994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldYTC-0006be-Q7 for ged-emacs-devel@m.gmane-mx.org; Mon, 03 May 2021 09:18:42 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldYHc-0003Ac-Uy for emacs-devel@gnu.org; Mon, 03 May 2021 09:06:45 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:34185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldYHY-0004Lt-OO for emacs-devel@gnu.org; Mon, 03 May 2021 09:06:44 -0400 Original-Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 64DB724002B for ; Mon, 3 May 2021 15:06:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620047197; bh=Aru0ClSlXqCXZupQjzHrkLZaUm8wqDgRDURyKcd+dVU=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=ecU6mV8eQJBIwCousBKPAFBAJqzxNSiC1JuVM/kBwRjdItjfWy0HAITD3yDRTT8eJ UEwgIOi1n5paCx3JGwIY90Ywo/hllBcFW2DY5XZdD/PFrJgMHEwm2Oo1cojWgcR4tN nKpX/fgb6H6uZULTR0ojW3kphknMYWygJlOcosvi/2I3KuSViXV3gpHsHyfhEd/HgC KCOhoocDLjanTxt9MZJX2KMRvTuBgW9Je8EbKYSwgXgUuK34zoKRfoH0j353IZLApY 6ToxKvLhXMv/EYIFdIlZqBiQ6Qea5JLQaQs530PMConbWYOUYp/yZcgqTtBhD7sDYp HXAanF2f6RMNQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FYjsm0wvxz9rxq; Mon, 3 May 2021 15:06:35 +0200 (CEST) Autocrypt: addr=philipk@posteo.net; prefer-encrypt=mutual; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB In-Reply-To: (Stefan Monnier's message of "Mon, 03 May 2021 08:46:08 -0400") Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=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: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:268812 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier writes: >> (defun project--buffer-list (pr) >> "Return the list of all buffers in project PR." >> - (let (bufs) >> + (let ((remote-project-p (file-remote-p (project-root pr))) >> + bufs) >> (dolist (buf (buffer-list)) >> - (when (equal pr >> - (with-current-buffer buf >> - (project-current))) >> + (when (and (let ((remote (file-remote-p (buffer-local-value 'default-directory buf)))) >> + (if remote-project-p remote (not remote))) >> + (equal pr >> + (with-current-buffer buf >> + (project-current)))) >> (push buf bufs))) >> (nreverse bufs))) > > How 'bout using `file-in-directory-p`? I didn't know about that function! Just tried it out and it seems that the patch below is even faster, as project-current does not have to be invoked for every buffer, remote or not. > Stefan > -- Philip K. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Reduce-number-of-method-invocations-in-project-buffe.patch >From eb9f32e1007eaa90a1b5487ac009b38182d6260b Mon Sep 17 00:00:00 2001 From: Philip K Date: Mon, 3 May 2021 11:35:41 +0200 Subject: [PATCH] Reduce number of method invocations in project--buffer-list * project.el (project--buffer-list): Use file-in-directory-p --- lisp/progmodes/project.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index d47d9d77e6..aa2fc1690f 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -1120,11 +1120,12 @@ project-kill-buffer-conditions (defun project--buffer-list (pr) "Return the list of all buffers in project PR." - (let (bufs) + (let ((root (project-root pr)) + bufs) (dolist (buf (buffer-list)) - (when (equal pr - (with-current-buffer buf - (project-current))) + (when-let ((file (or (buffer-file-name buf) + (buffer-local-value 'default-directory buf))) + ((file-in-directory-p file root))) (push buf bufs))) (nreverse bufs))) -- 2.30.2 --=-=-=--