From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 07/24] untracked cache: mark what dirs should be recursed/saved Date: Sun, 8 Feb 2015 15:55:31 +0700 Message-ID: <1423385748-19825-8-git-send-email-pclouds@gmail.com> References: <1423385748-19825-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Feb 08 09:56:39 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YKNfR-0002f6-1y for gcvg-git-2@plane.gmane.org; Sun, 08 Feb 2015 09:56:37 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753967AbbBHI4c convert rfc822-to-quoted-printable (ORCPT ); Sun, 8 Feb 2015 03:56:32 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:64169 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753918AbbBHI4c (ORCPT ); Sun, 8 Feb 2015 03:56:32 -0500 Received: by mail-pa0-f48.google.com with SMTP id eu11so5046164pac.7 for ; Sun, 08 Feb 2015 00:56:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=FTYYIFxP1sD1PRwxpKVI/FIPuWCCnXePMN77DEohqms=; b=UabGk4ZYtnTJuWhczIwg+qH2FlPJhzBMjxC62jR7JpOJ84a6wg8uxUf9bZ96kgLGBP MaGEv4JqIujDy2VNLBVjAPIznEV5luBP97/dP3jXHr3xQVvH+TQWE7UYt079opucpNud 42bfyPIHxmNIEa9klXFjMThEsHMLYT4bI5/lObbMqtFoHAfgp3RtxD8oNCGlFPAckGWd XaY8P/sI3a8jeaQUZeebmImxj+BqBLYatbOtmNyXLmKYVhybikrl0SO8JsYTn8nUu4HR 5Q3bflMFkDbO/WoclyVuQ7jEu3OK/oUFf92KxFvuAdTknXobyQt5AmcYfvIhXTRSIrkq H15Q== X-Received: by 10.66.120.67 with SMTP id la3mr19671266pab.66.1423385791701; Sun, 08 Feb 2015 00:56:31 -0800 (PST) Received: from lanh ([115.73.243.52]) by mx.google.com with ESMTPSA id lq2sm13036083pab.34.2015.02.08.00.56.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Feb 2015 00:56:31 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sun, 08 Feb 2015 15:56:39 +0700 X-Mailer: git-send-email 2.3.0.rc1.137.g477eb31 In-Reply-To: <1423385748-19825-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: If we redo this thing in a functional style, we would have one struct untracked_dir as input tree and another as output. The input is used for verification. The output is a brand new tree, reflecting current worktree. But that means recreate a lot of dir nodes even if a lot could be shared between input and output trees in good cases. So we go with the messy but efficient way, combining both input and output trees into one. We need a way to know which node in this combined tree belongs to the output. This is the purpose of this "recurse" flag. "valid" bit can't be used for this because it's about data of the node except the subdirs. When we invalidate a directory, we want to keep cached data of the subdirs intact even though we don't really know what subdir still exists (yet). Then we check worktree to see what actual subdir remains on disk. Those will have 'recurse' bit set again. If cached data for those are still valid, we may be able to avoid computing exclude files for them. Those subdirs that are deleted will have 'recurse' remained clear and their 'valid' bits do not matter. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Junio C Hamano --- dir.c | 14 +++++++++++++- dir.h | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index 8c989e3..02cdc26 100644 --- a/dir.c +++ b/dir.c @@ -615,9 +615,12 @@ static void invalidate_gitignore(struct untracked_= cache *uc, static void invalidate_directory(struct untracked_cache *uc, struct untracked_cache_dir *dir) { + int i; uc->dir_invalidated++; dir->valid =3D 0; dir->untracked_nr =3D 0; + for (i =3D 0; i < dir->dirs_nr; i++) + dir->dirs[i]->recurse =3D 0; } =20 /* @@ -1577,6 +1580,10 @@ static int read_cached_dir(struct cached_dir *cd= ir) } while (cdir->nr_dirs < cdir->untracked->dirs_nr) { struct untracked_cache_dir *d =3D cdir->untracked->dirs[cdir->nr_dir= s]; + if (!d->recurse) { + cdir->nr_dirs++; + continue; + } cdir->ucd =3D d; cdir->nr_dirs++; return 0; @@ -1598,8 +1605,10 @@ static void close_cached_dir(struct cached_dir *= cdir) * We have gone through this directory and found no untracked * entries. Mark it valid. */ - if (cdir->untracked) + if (cdir->untracked) { cdir->untracked->valid =3D 1; + cdir->untracked->recurse =3D 1; + } } =20 /* @@ -1842,6 +1851,9 @@ static struct untracked_cache_dir *validate_untra= cked_cache(struct dir_struct *d invalidate_gitignore(dir->untracked, root); dir->untracked->ss_excludes_file =3D dir->ss_excludes_file; } + + /* Make sure this directory is not dropped out at saving phase */ + root->recurse =3D 1; return root; } =20 diff --git a/dir.h b/dir.h index ff3d99b..95baf01 100644 --- a/dir.h +++ b/dir.h @@ -115,8 +115,9 @@ struct untracked_cache_dir { unsigned int untracked_alloc, dirs_nr, dirs_alloc; unsigned int untracked_nr; unsigned int check_only : 1; - /* all data in this struct are good */ + /* all data except 'dirs' in this struct are good */ unsigned int valid : 1; + unsigned int recurse : 1; /* null SHA-1 means this directory does not have .gitignore */ unsigned char exclude_sha1[20]; char name[FLEX_ARRAY]; --=20 2.3.0.rc1.137.g477eb31