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 v2 07/22] untracked cache: mark what dirs should be recursed/saved Date: Sat, 8 Nov 2014 16:39:40 +0700 Message-ID: <1415439595-469-8-git-send-email-pclouds@gmail.com> References: <1414411846-4450-1-git-send-email-pclouds@gmail.com> <1415439595-469-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?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Nov 08 10:40:35 2014 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 1Xn2VX-0000mw-10 for gcvg-git-2@plane.gmane.org; Sat, 08 Nov 2014 10:40:35 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753611AbaKHJk3 convert rfc822-to-quoted-printable (ORCPT ); Sat, 8 Nov 2014 04:40:29 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:33368 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753580AbaKHJk0 (ORCPT ); Sat, 8 Nov 2014 04:40:26 -0500 Received: by mail-pd0-f177.google.com with SMTP id v10so4770837pde.36 for ; Sat, 08 Nov 2014 01:40:25 -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=yIZ8hEjif2IbC81rzUVxILWcIuK+8MTH3+RPwcbuesA=; b=a/Rc9QsiStZKW/z3awMjxYOKphYw92+eoVPTXePTmV2raI0mFlhWXydU6RH1VE49os 4Bx9OrhgUGdrBGb6U9eDKGzfyXhLgdeMb5nnZXvzyWJH+N981Y9xPzvGsG02QPoEKvzO MztamolSk33pnw4rgfWsoc+DnHcyPgGF0yna1NR+TCx1Me3sLGBYcBblCdwvQXpdCQTM ddP2sQQD+8IxJnsY7naerzi3xXUPCx07gRehGXsKjjGPLO+lvroMusBDmMMu+JBHIL+H LkRqYJfBntsczWLua887R1oSXID8tjZNR6rIJzphT3v4orRgWIyX/wLC8iKU/aWYKQUh 8ulA== X-Received: by 10.67.4.167 with SMTP id cf7mr18364812pad.52.1415439625494; Sat, 08 Nov 2014 01:40:25 -0800 (PST) Received: from lanh ([115.73.197.54]) by mx.google.com with ESMTPSA id yc4sm11077907pab.27.2014.11.08.01.40.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Nov 2014 01:40:24 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sat, 08 Nov 2014 16:40:39 +0700 X-Mailer: git-send-email 2.1.0.rc0.78.gc0d8480 In-Reply-To: <1415439595-469-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- dir.c | 14 +++++++++++++- dir.h | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index f590761..32406bf 100644 --- a/dir.c +++ b/dir.c @@ -614,9 +614,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 /* @@ -1576,6 +1579,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; @@ -1597,8 +1604,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 /* @@ -1841,6 +1850,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 a755e49..5c688da 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[1]; --=20 2.1.0.rc0.78.gc0d8480