From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#25243: 26.0.50; ffap-guesser very slow w/ region active in large diff files Date: Thu, 22 Dec 2016 13:31:25 +0900 Message-ID: <87vauclh42.fsf@gmail.com> References: <87k2at2t28.fsf@gmail.com> <36cb0896-f437-41f6-92d1-1f8897ff141d@default> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1482381142 15696 195.159.176.226 (22 Dec 2016 04:32:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 22 Dec 2016 04:32:22 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: 25243@debbugs.gnu.org, tino.calancha@gmail.com To: Drew Adams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 22 05:32:13 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJv34-0002hO-G2 for geb-bug-gnu-emacs@m.gmane.org; Thu, 22 Dec 2016 05:32:10 +0100 Original-Received: from localhost ([::1]:60368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cJv37-0006bf-CH for geb-bug-gnu-emacs@m.gmane.org; Wed, 21 Dec 2016 23:32:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cJv2z-0006Uj-9J for bug-gnu-emacs@gnu.org; Wed, 21 Dec 2016 23:32:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cJv2w-0005QC-4m for bug-gnu-emacs@gnu.org; Wed, 21 Dec 2016 23:32:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:35379) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cJv2w-0005Q6-0f for bug-gnu-emacs@gnu.org; Wed, 21 Dec 2016 23:32:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cJv2v-00043O-PX for bug-gnu-emacs@gnu.org; Wed, 21 Dec 2016 23:32:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 22 Dec 2016 04:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25243 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 25243-submit@debbugs.gnu.org id=B25243.148238109915552 (code B ref 25243); Thu, 22 Dec 2016 04:32:01 +0000 Original-Received: (at 25243) by debbugs.gnu.org; 22 Dec 2016 04:31:39 +0000 Original-Received: from localhost ([127.0.0.1]:50778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJv2Z-00042m-3T for submit@debbugs.gnu.org; Wed, 21 Dec 2016 23:31:39 -0500 Original-Received: from mail-pg0-f68.google.com ([74.125.83.68]:34513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJv2X-00042X-9A for 25243@debbugs.gnu.org; Wed, 21 Dec 2016 23:31:37 -0500 Original-Received: by mail-pg0-f68.google.com with SMTP id b1so18613123pgc.1 for <25243@debbugs.gnu.org>; Wed, 21 Dec 2016 20:31:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=s6EUWmZnPmMCz5XmDxDFeYWAucuSQZjIwBbBHNxAf1s=; b=jXJ++/gmF7YY+kvVF1td5C/bUhUR1JQKzIyOrQtWP08SHr46Bsc9F5D8Njur5rmrYf RWlgOGYW3Zp7RXSpk/g71ziMAR/0FcVCAGfruj0ebAEpqHv8Gj30RFrTK1teo1tXpa3Z r4MPQSA9olqEppxdkCkhyINN8vZv7NtflGI1zfvcC+urE7U5t/KxV2gXKklc7fPBntHg vEO92Gv1KvcC5bmTargty+eeL6WZ726HX7DEqZaLCEcxeqQdt55aCG9rTpCTSZi3laQW tHXLWsLcN2m9vjNyFH2MaxiAR5i0WJGWpbxFk3i1WSZquIiD2d4oMDWO1HJoQZsIlG4I tD4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=s6EUWmZnPmMCz5XmDxDFeYWAucuSQZjIwBbBHNxAf1s=; b=TGEsWBFwj0a/MgvQRWT20Of7wUj5m+Wz7+vi93qnGOzPA+7qJMxMQy4zSkZ8HC4sV9 /OPS17Y065y3HjaQ3qy7rOAhEbOG0FJESVE1q7PY4/tWOhYVgcVYK6vvBplzzvaW05WM QhqR/bNWZ7YozlOawPiQe9/fatCNUeajlkGHDjU0+vsCoqtgQxwgsYV/eD0UL4xXWv8t cZ0eZw/hKgs3t+rQ4YwOsDwNvkpwhzNxaXWxwNyWORDqI4xu25BpeqaQvHKLcbT0pbwp 4Hr+b/RYXfShIUTmPESYT4/PuwgYSrmKdA5AUDBXZnTvbyyi/Tb1SGjDe3iTQJP8Ch4e EWLw== X-Gm-Message-State: AIkVDXL3mNtx02aufVOlS3IujtBch0N/3TKOLKSSaaHb6VPBJ/IY2Jzyd8cOmrHwjgiadg== X-Received: by 10.98.76.129 with SMTP id e1mr3773617pfj.149.1482381091349; Wed, 21 Dec 2016 20:31:31 -0800 (PST) Original-Received: from calancha-pc (177.192.218.133.dy.bbexcite.jp. [133.218.192.177]) by smtp.gmail.com with ESMTPSA id w11sm50258687pfk.75.2016.12.21.20.31.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2016 20:31:30 -0800 (PST) In-Reply-To: <36cb0896-f437-41f6-92d1-1f8897ff141d@default> (Drew Adams's message of "Wed, 21 Dec 2016 08:22:19 -0800 (PST)") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:127314 Archived-At: Drew Adams writes: > Amusing backstory: Thank you very much for adding more info to the report! > Wrt the proposed patch: > > 1. It is `ffap-string-at-point' that picks up the active > region text as a string and removes its properties. > Since that is what is slow, I think it is in that > function that preventing this from happening should > occur. The patch tries to control this only in > `ffap-file-at-point', and it does so _after_ calling > `ffap-string-at-point', which is too late (AFAICS). > > I think that `ffap-string-at-point' should control > this. It should not try to pick up a file name from > a 14 KB diff buffer. Agreed. See updated patch below. > 2. I'm not sure that a user option is really what's called > for here. I'd suggest a defvar, but only because Emacs > Dev does not really like programs to bind option values > (I have little problem with that, myself), and that is > the main place where I expect the value to be changed: > programmatically. Agreed. It's good to follow an uniform style throughout core packages. I've updated the patch to use a defvar instead. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 46507ea7de34bd54154b9ecb05e607104ef99d67 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Thu, 22 Dec 2016 13:14:22 +0900 Subject: [PATCH] ffap-string-at-point: Limit max length of active region Do not spend time checking large strings which are likely not valid candidates (Bug#25243). * lisp/ffap.el (ffap-max-region-length): New variable. (ffap-string-at-point): Use it. * test/lisp/ffap-tests.el: New test suite. (ffap-tests-25243): Add test for this bug. --- lisp/ffap.el | 17 +++++++++++----- test/lisp/ffap-tests.el | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 test/lisp/ffap-tests.el diff --git a/lisp/ffap.el b/lisp/ffap.el index 3d7cebadcf..ad4b70d737 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -203,6 +203,9 @@ ffap-foo-at-bar-prefix ) :group 'ffap) +(defvar ffap-max-region-length 1024 + "Maximum allowed region length in `ffap-string-at-point'.") + ;;; Peanut Gallery (More User Variables): ;; @@ -1119,11 +1122,15 @@ ffap-string-at-point (save-excursion (skip-chars-forward (car args)) (skip-chars-backward (nth 2 args) pt) - (point))))) - (setq ffap-string-at-point - (buffer-substring-no-properties - (setcar ffap-string-at-point-region beg) - (setcar (cdr ffap-string-at-point-region) end))))) + (point)))) + (region-len (- (max beg end) (min beg end)))) + (if (or (null ffap-max-region-length) + (< region-len ffap-max-region-length)) ; Bug#25243. + (setf ffap-string-at-point-region (list beg end) + ffap-string-at-point + (buffer-substring-no-properties beg end)) + (setf ffap-string-at-point-region (list 1 1) + ffap-string-at-point "")))) (defun ffap-string-around () ;; Sometimes useful to decide how to treat a string. diff --git a/test/lisp/ffap-tests.el b/test/lisp/ffap-tests.el new file mode 100644 index 0000000000..ca6a1f4d78 --- /dev/null +++ b/test/lisp/ffap-tests.el @@ -0,0 +1,53 @@ +;;; ffap-tests.el --- Test suite for ffap.el -*- lexical-binding: t -*- + +;; Copyright (C) 2016 Free Software Foundation, Inc. + +;; Author: Tino Calancha + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: + +(require 'ert) +(require 'ffap) + +(ert-deftest ffap-tests-25243 () + "Test for http://debbugs.gnu.org/25243 ." + (let ((file (make-temp-file "test-Bug#25243"))) + (unwind-protect + (with-temp-file file + (let ((str "diff --git b/lisp/ffap.el a/lisp/ffap.el +index 3d7cebadcf..ad4b70d737 100644 +--- b/lisp/ffap.el ++++ a/lisp/ffap.el +@@ -203,6 +203,9 @@ ffap-foo-at-bar-prefix +")) + (transient-mark-mode 1) + (insert + (concat + str + (make-string ffap-max-region-length #xa) + (format "%s ENDS HERE" file))) + (mark-whole-buffer) + (should (equal "" (ffap-string-at-point))) + (should (equal '(1 1) ffap-string-at-point-region)))) + (and (file-exists-p file) (delete-file file))))) + +(provide 'ffap-tests) + +;;; ffap-tests.el ends here -- 2.11.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.4) of 2016-12-22 Repository revision: de0671096706bf7404cddce277b918c8d769f17b