From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 30 08:14:49 2014 Received: (at submit) by debbugs.gnu.org; 30 Mar 2014 12:14:49 +0000 Received: from localhost ([127.0.0.1]:56791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WUEdU-0002E2-Ix for submit@debbugs.gnu.org; Sun, 30 Mar 2014 08:14:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42061) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WUEdQ-0002Dq-M6 for submit@debbugs.gnu.org; Sun, 30 Mar 2014 08:14:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUEdJ-0007JE-4H for submit@debbugs.gnu.org; Sun, 30 Mar 2014 08:14:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:32966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUEdJ-0007JA-1Y for submit@debbugs.gnu.org; Sun, 30 Mar 2014 08:14:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUEdC-00080q-Hn for bug-grep@gnu.org; Sun, 30 Mar 2014 08:14:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUEd6-0007HI-9s for bug-grep@gnu.org; Sun, 30 Mar 2014 08:14:30 -0400 Received: from pbsg500.nifty.com ([202.248.238.70]:56187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUEd5-0007Gz-Rz for bug-grep@gnu.org; Sun, 30 Mar 2014 08:14:24 -0400 Received: from [10.120.1.60] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) (authenticated) by pbsg500.nifty.com with ESMTP id s2UCE11V024339 for ; Sun, 30 Mar 2014 21:14:02 +0900 X-Nifty-SrcIP: [118.21.128.66] Date: Sun, 30 Mar 2014 21:14:03 +0900 From: Norihiro Tanaka To: bug-grep@gnu.org Subject: [PATCH] grep: speed-up for line matching in fgrep Message-Id: <20140330211403.605C.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_531AAC47000000000212_MULTIPART_MIXED_" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.65.07 [ja] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --------_531AAC47000000000212_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit If fails in line matching at a position found by kwsexec(), the line never matches in line matching. So the line is skipped. Norihiro --------_531AAC47000000000212_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 RnJvbSBiOGYyNGRkZWI3ZGRmMjExYTRkY2U2NjI3MzRlZjQzODdkNDhiNGMyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBTdW4sIDMwIE1hciAyMDE0IDIxOjAzOjU4ICswOTAwClN1YmplY3Q6IFtQQVRDSF0gZ3Jl cDogc3BlZWQtdXAgZm9yIGxpbmUgbWF0Y2hpbmcgaW4gZmdyZXAKCklmIGZhaWxzIGluIGxpbmUg bWF0Y2hpbmcgYXQgYSBwb3NpdGlvbiBmb3VuZCBieSBrd3NleGVjKCksIHRoZSBsaW5lCm5ldmVy IG1hdGNoZXMgaW4gbGluZSBtYXRjaGluZy4gIFNvIHRoZSBsaW5lIGlzIHNraXBwZWQuCgoqIHNy Yy9rd3NlYXJjaC5jIChGZXhlY3V0ZSk6IHNwZWVkLXVwIGZvciBsaW5lIG1hdGNoaW5nLgotLS0K IHNyYy9rd3NlYXJjaC5jIHwgOCArKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9u cygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMva3dzZWFyY2guYyBiL3NyYy9r d3NlYXJjaC5jCmluZGV4IGRkMDE1MTguLjAzN2I3OGMgMTAwNjQ0Ci0tLSBhL3NyYy9rd3NlYXJj aC5jCisrKyBiL3NyYy9rd3NlYXJjaC5jCkBAIC0xNDEsMTEgKzE0MSw5IEBAIEZleGVjdXRlIChj aGFyIGNvbnN0ICpidWYsIHNpemVfdCBzaXplLCBzaXplX3QgKm1hdGNoX3NpemUsCiAgICAgICAg IGdvdG8gc3VjY2Vzc19pbl9iZWdfYW5kX2xlbjsKICAgICAgIGlmIChtYXRjaF9saW5lcykKICAg ICAgICAgewotICAgICAgICAgIGlmIChiZWcgPiBidWYgJiYgYmVnWy0xXSAhPSBlb2wpCi0gICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICBpZiAoYmVnICsgbGVuIDwgYnVmICsgc2l6ZSAm JiBiZWdbbGVuXSAhPSBlb2wpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICBnb3Rv IHN1Y2Nlc3M7CisgICAgICAgICAgaWYgKGJlZ1stMV0gPT0gZW9sICYmIGJlZ1tsZW5dID09IGVv bCkKKyAgICAgICAgICAgIGdvdG8gc3VjY2VzczsKKyAgICAgICAgICBiZWcgPSBtZW1jaHIgKGJl ZywgZW9sLCBidWYgKyBzaXplIC0gYmVnKTsKICAgICAgICAgfQogICAgICAgZWxzZSBpZiAobWF0 Y2hfd29yZHMpCiAgICAgICAgIGZvciAodHJ5ID0gYmVnOyA7ICkKLS0gCjEuOS4xCgo= --------_531AAC47000000000212_MULTIPART_MIXED_-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 01 04:45:19 2014 Received: (at 17143) by debbugs.gnu.org; 1 Apr 2014 08:45:19 +0000 Received: from localhost ([127.0.0.1]:58711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WUuJr-0004J3-60 for submit@debbugs.gnu.org; Tue, 01 Apr 2014 04:45:19 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:47361) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WUuJo-0004Ir-LU for 17143@debbugs.gnu.org; Tue, 01 Apr 2014 04:45:18 -0400 Received: by mail-wg0-f51.google.com with SMTP id k14so6928291wgh.34 for <17143@debbugs.gnu.org>; Tue, 01 Apr 2014 01:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=U3cXvtPNXLjmCI6lrC0uPV+9g/iF1Zlf79bF7firzBY=; b=eRNLmS7z1l8gX6AP+1gcpHiUxo8jDI0pT2ONCk9oF2muZ+sx2/gTGljnWeYky28T/E nKRZsxclfp61A5Jay+4vtqtOvWxrwreuh3apj46NOZo4ChT0bf08iZMYC5q6qGJWtW85 C5ATm5I/LuftHcMFMYgDCf5ACHPS2WHV+xfA7ievg/Ww5HtVnK58aLmg+AlUpK5StCvt fHKW2/RrVUxBn0VKDOwWWchy9SHJfydREl+vmmo6o/t4Wo58HZCyGGii5tk98SQ7aakM SDuYqliBlP8ABVlewrlKJPHrfvtBP5065MrjwRDlvgg0Ep3l6miDWXQisSn964Ob4RBu elBg== X-Received: by 10.180.87.233 with SMTP id bb9mr16352026wib.10.1396341915335; Tue, 01 Apr 2014 01:45:15 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-37-117-156-129.cust.vodafonedsl.it. [37.117.156.129]) by mx.google.com with ESMTPSA id p8sm38990443eef.26.2014.04.01.01.45.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 01:45:14 -0700 (PDT) Message-ID: <533A7C98.6090008@gnu.org> Date: Tue, 01 Apr 2014 10:45:12 +0200 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Norihiro Tanaka , 17143@debbugs.gnu.org Subject: Re: bug#17143: [PATCH] grep: speed-up for line matching in fgrep References: <20140330211403.605C.27F6AC2D@kcn.ne.jp> In-Reply-To: <20140330211403.605C.27F6AC2D@kcn.ne.jp> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 17143 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Il 30/03/2014 14:14, Norihiro Tanaka ha scritto: > - if (beg > buf && beg[-1] != eol) > - continue; > - if (beg + len < buf + size && beg[len] != eol) > - continue; > - goto success; > + if (beg[-1] == eol && beg[len] == eol) > + goto success; > + beg = memchr (beg, eol, buf + size - beg); > } Are we sure that beg > buf && beg + len < buf + size? Perhaps we need if (beg > buf && beg[-1] == eol && beg + len < buf + size && beg[len] == eol) goto success; beg = memchr (beg, eol, buf + size - beg); Otherwise, the patch is an obvious improvement. Thanks! Paolo From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 06 06:04:34 2014 Received: (at 17143) by debbugs.gnu.org; 6 Apr 2014 10:04:34 +0000 Received: from localhost ([127.0.0.1]:37439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWjwH-00078Q-SL for submit@debbugs.gnu.org; Sun, 06 Apr 2014 06:04:34 -0400 Received: from pbsg501.nifty.com ([202.248.238.71]:21122) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWjwF-00078F-2Z for 17143@debbugs.gnu.org; Sun, 06 Apr 2014 06:04:32 -0400 Received: from [10.120.1.62] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) (authenticated) by pbsg501.nifty.com with ESMTP id s36A44qg002341 for <17143@debbugs.gnu.org>; Sun, 6 Apr 2014 19:04:05 +0900 X-Nifty-SrcIP: [118.21.128.66] Date: Sun, 06 Apr 2014 19:04:05 +0900 From: Norihiro Tanaka To: 17143@debbugs.gnu.org Subject: bug#17143: [PATCH] grep: speed-up for line matching in fgrep In-Reply-To: <533A7C98.6090008@gnu.org> References: <20140330211403.605C.27F6AC2D@kcn.ne.jp> <533A7C98.6090008@gnu.org> Message-Id: <20140406190404.BABF.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.65.07 [ja] X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 17143 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) Paolo, thanks for the review of the patch. However, I found the better solution than this patch in bug#17204 for this bug. Please close this bug without appling the patch. Norihiro From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 06 11:05:11 2014 Received: (at 17143-done) by debbugs.gnu.org; 6 Apr 2014 15:05:12 +0000 Received: from localhost ([127.0.0.1]:38185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWodD-0000AJ-DR for submit@debbugs.gnu.org; Sun, 06 Apr 2014 11:05:11 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:60983) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWodA-0000AA-LG for 17143-done@debbugs.gnu.org; Sun, 06 Apr 2014 11:05:09 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id A28F539E8018; Sun, 6 Apr 2014 08:05:07 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tYEB0CAFQZKJ; Sun, 6 Apr 2014 08:05:03 -0700 (PDT) Received: from [192.168.1.9] (pool-108-0-233-62.lsanca.fios.verizon.net [108.0.233.62]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id EA5E939E8015; Sun, 6 Apr 2014 08:05:02 -0700 (PDT) Message-ID: <53416D1A.6010400@cs.ucla.edu> Date: Sun, 06 Apr 2014 08:04:58 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Norihiro Tanaka , 17143-done@debbugs.gnu.org Subject: Re: bug#17143: [PATCH] grep: speed-up for line matching in fgrep References: <20140330211403.605C.27F6AC2D@kcn.ne.jp> <533A7C98.6090008@gnu.org> <20140406190404.BABF.27F6AC2D@kcn.ne.jp> In-Reply-To: <20140406190404.BABF.27F6AC2D@kcn.ne.jp> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 17143-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Norihiro Tanaka wrote: > Please close this bug Thanks, done. By the way, you can do this yourself, by sending email to the address . From unknown Sat Jun 21 03:24:52 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 05 May 2014 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator