From owner-svn-src-all@freebsd.org Tue Jan 14 15:35:32 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A07721EECA5; Tue, 14 Jan 2020 15:35:32 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47xvfq4VfDz4Hpc; Tue, 14 Jan 2020 15:35:31 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qv1-xf36.google.com with SMTP id z3so5845529qvn.0; Tue, 14 Jan 2020 07:35:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=LLenMMasqN5nFn/F8o6TkbHL3vuiWDS67uq6OHOyrQM=; b=nKTwPMcAF5U+pArVC+H1p3U+3J5QSSzKTJtvk9cPymvyxRr4uzZZC0/JnlrJO1a3nC eWlniZpT3SwxeMEhdebp5phuEMZJghGa5PfweaP1Rje1Jvbntq3W9TyyTaSA1rE+Ds9o 4SyZT4ezASwIfAQLhQDKZFXEm72FZPgPqdoDtBoNpKIzqCFGSgmB4RRc5ZJFXixihrR+ NXZnqqW8gqx/REgpc6AJU9nBZ+2HAs4Oxa9N0iYHB+hruluyXPnM8O/nPoFZwc2vQOz/ ykroH+5lxUaPuOxO7HaAp8fnQixISXJQfXkJvTPxvk04EQWn8Pzr61JcA/V7Ouybp3XA aHkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=LLenMMasqN5nFn/F8o6TkbHL3vuiWDS67uq6OHOyrQM=; b=AOmffEs84BoKIaONXEOif8Yw3xhk7+alBJG8qFOe3w8K+a2Xn5j03kZzz2yMuxBu2/ K5ZEzbqY1iLAmt283lCApIDPjjxVOfwUqKS+aBVRac/7XoWxzrJ6t0+TpkG/0uJAe+0c gzvcY1weH+OSVpAoYcpIP7f+qJFapDRp2YkKWWiV6WTl54r8EJZrpfFtDnTBDf8ZnBQC Y2X+amP79v28w0adaIakzEVK7KiD7fDZyzhKOH9QBSmyjOUUv4JIIEeXdbUUr8X6HONB gzdPwdWjr0edDfbdSfTF95nUtKJnLOamjEr36drs47QGISOar/SDWktGTdSP4i2FOVLr Zbow== X-Gm-Message-State: APjAAAUkLDVqVmxyfjx2sXomBUZKp1BWrmE2zAEkzU3jn7+3HYmge9Gl 80UVflBgyXIvOI690/fXaqO05hfSJ2E= X-Google-Smtp-Source: APXvYqyaoh69NLgc4sDuJacsafSo5XRvUhU3Rad5ZyGOE7SqxSRigMRa22IWH09Ek0Zxr5OVGdaRGA== X-Received: by 2002:ad4:4e6b:: with SMTP id ec11mr21211966qvb.149.1579016125285; Tue, 14 Jan 2020 07:35:25 -0800 (PST) Received: from raichu (toroon0560w-lp130-05-69-158-183-252.dsl.bell.ca. [69.158.183.252]) by smtp.gmail.com with ESMTPSA id d5sm6828765qke.130.2020.01.14.07.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2020 07:35:24 -0800 (PST) Sender: Mark Johnston Date: Tue, 14 Jan 2020 10:35:22 -0500 From: Mark Johnston To: Kyle Evans Cc: Li-Wen Hsu , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r356695 - head/usr.bin/diff Message-ID: <20200114153522.GC46791@raichu> References: <202001131829.00DITmev016747@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 47xvfq4VfDz4Hpc X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=nKTwPMcA; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::f36 as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-3.83 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; IP_SCORE(-2.13)[ip: (-6.69), ipnet: 2607:f8b0::/32(-2.09), asn: 15169(-1.83), country: US(-0.05)]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MIME_TRACE(0.00)[0:+]; MID_RHS_NOT_FQDN(0.50)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2020 15:35:32 -0000 On Tue, Jan 14, 2020 at 08:05:21AM -0600, Kyle Evans wrote: > On Tue, Jan 14, 2020 at 6:12 AM Li-Wen Hsu wrote: > > > > On Tue, Jan 14, 2020 at 2:29 AM Mark Johnston wrote: > > > > > > Author: markj > > > Date: Mon Jan 13 18:29:47 2020 > > > New Revision: 356695 > > > URL: https://svnweb.freebsd.org/changeset/base/356695 > > > > > > Log: > > > Optimize diff -q. > > > > > > Once we know whether the files differ, we don't need to do any further > > > work. > > > > > > PR: 242828 > > > Submitted by: fehmi noyan isi (original version) > > > Reviewed by: bapt, kevans > > > MFC after: 1 week > > > Differential Revision: https://reviews.freebsd.org/D23152 > > > > > > Modified: > > > head/usr.bin/diff/diffreg.c > > > > > > Modified: head/usr.bin/diff/diffreg.c > > > ============================================================================== > > > --- head/usr.bin/diff/diffreg.c Mon Jan 13 18:26:27 2020 (r356694) > > > +++ head/usr.bin/diff/diffreg.c Mon Jan 13 18:29:47 2020 (r356695) > > > @@ -349,6 +349,11 @@ diffreg(char *file1, char *file2, int flags, int capsi > > > goto closem; > > > } > > > > > > + if (diff_format == D_BRIEF) { > > > + rval = D_DIFFER; > > > + status |= 1; > > > + goto closem; > > > + } > > > if ((flags & D_FORCEASCII) == 0 && > > > (!asciifile(f1) || !asciifile(f2))) { > > > rval = D_BINARY; > > > > Hi Mark, > > > > This one seems breaks test case usr.sbin.etcupdate.fbsdid_test.main: > > > > https://ci.freebsd.org/job/FreeBSD-head-amd64-test/13920/testReport/junit/usr.sbin.etcupdate/fbsdid_test/main/ > > > > Revert this can get the case pass. Can you check if the code or the > > test needs to be fixed? > > > > Whoops... that was a bit of an oversight. We can only short-circuit if > ignore_pats == NULL, otherwise we need to regress back to doing > line-by-line comparison. That should still see a benefit for the > majority of cases, though, I would think. Thanks, I tested and committed that change.