From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gummerer Subject: [PATCH 11/16] Read cache-tree in index-v5 Date: Thu, 2 Aug 2012 13:02:01 +0200 Message-ID: <1343905326-23790-12-git-send-email-t.gummerer@gmail.com> References: <1343905326-23790-1-git-send-email-t.gummerer@gmail.com> Cc: trast@student.ethz.ch, mhagger@alum.mit.edu, gitster@pobox.com, pclouds@gmail.com, robin.rosenberg@dewire.com, Thomas Gummerer To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Aug 02 13:03:40 2012 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 1SwtBm-0005Lo-Lf for gcvg-git-2@plane.gmane.org; Thu, 02 Aug 2012 13:03:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754630Ab2HBLDN (ORCPT ); Thu, 2 Aug 2012 07:03:13 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:40752 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754375Ab2HBLDL (ORCPT ); Thu, 2 Aug 2012 07:03:11 -0400 Received: by mail-ee0-f46.google.com with SMTP id l10so2331137eei.19 for ; Thu, 02 Aug 2012 04:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=p2S4j/g7sIPPYfdvylikR2FPDBKg9PlzNqWdaTW4QPM=; b=k5FEX90nco/Rmi87Ze25j1F3xtnzCfMtk6/PVRtarvJAvoAeJCLiyiTmCHII5LM3FK jsWTtzq6mh8fIrvJK3CjY236CZNdH/clSsYhGSli8GG7pPP0PpsotkvU9fQcJCxBzqZA jXgZSCOzRb/glIHKPKr4EBb4MMg/RBNoph7ltJCDGGhtgYkWHqrQBhGhfPB25O8PSprE bcGGy8zoX1ZnRYM62rHCcrEBF1R03bZjCSnibbbDeEkc003pKZxEK8JCvWTcybE67l0b TwD2sB6UmAz69UjQwReH8xyBWiSajuxJUozHWr0/olOXjlWepfkL8gavclHYXqO2Yh9Y yDbg== Received: by 10.14.207.9 with SMTP id m9mr541502eeo.5.1343905390527; Thu, 02 Aug 2012 04:03:10 -0700 (PDT) Received: from localhost ([2a01:7e00::f03c:91ff:fedf:f4db]) by mx.google.com with ESMTPS id o47sm16474580eem.0.2012.08.02.04.03.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Aug 2012 04:03:08 -0700 (PDT) X-Mailer: git-send-email 1.7.10.886.gdf6792c.dirty In-Reply-To: <1343905326-23790-1-git-send-email-t.gummerer@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Since the cache-tree data is saved as part of the directory data, we have already read it, when we want to read the cache-tree. The cache-tree then only has to be converted from the directory data. The cache-tree isn't lexically sorted, but after the pathlen at each level, therefore the directories have to be reordered with respect to the ondisk layout. Signed-off-by: Thomas Gummerer --- cache-tree.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ cache-tree.h | 6 ++++ read-cache.c | 1 + 3 files changed, 100 insertions(+) diff --git a/cache-tree.c b/cache-tree.c index 28ed657..6a314aa 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -519,6 +519,99 @@ struct cache_tree *cache_tree_read(const char *buffer, unsigned long size) return read_one(&buffer, &size); } +struct cache_tree *convert_one(struct directory_queue *queue, int dirnr) +{ + int i, subtree_nr; + struct cache_tree *it; + struct directory_queue *down; + + it = cache_tree(); + it->entry_count = queue[dirnr].de->de_nentries; + subtree_nr = queue[dirnr].de->de_nsubtrees; + if (0 <= it->entry_count) + hashcpy(it->sha1, queue[dirnr].de->sha1); + + /* + * Just a heuristic -- we do not add directories that often but + * we do not want to have to extend it immediately when we do, + * hence +2. + */ + it->subtree_alloc = subtree_nr + 2; + it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *)); + down = queue[dirnr].down; + for (i = 0; i < subtree_nr; i++) { + struct cache_tree *sub; + struct cache_tree_sub *subtree; + char *buf, *name; + + name = ""; + buf = strtok(down[i].de->pathname, "/"); + while (buf) { + name = buf; + buf = strtok(NULL, "/"); + } + sub = convert_one(down, i); + if(!sub) + goto free_return; + subtree = cache_tree_sub(it, name); + subtree->cache_tree = sub; + } + if (subtree_nr != it->subtree_nr) + die("cache-tree: internal error"); + return it; + free_return: + cache_tree_free(&it); + return NULL; +} + +static int compare_cache_tree_elements(const void *a, const void *b) +{ + const struct directory_entry *de1, *de2; + + de1 = ((const struct directory_queue *)a)->de; + de2 = ((const struct directory_queue *)b)->de; + return subtree_name_cmp(de1->pathname, de1->de_pathlen, + de2->pathname, de2->de_pathlen); +} + +static struct directory_entry *sort_directories(struct directory_entry *de, + struct directory_queue *queue) +{ + int i, nsubtrees; + + nsubtrees = de->de_nsubtrees; + for (i = 0; i < nsubtrees; i++) { + struct directory_entry *new_de; + de = de->next; + new_de = xmalloc(directory_entry_size(de->de_pathlen)); + memcpy(new_de, de, directory_entry_size(de->de_pathlen)); + queue[i].de = new_de; + if (de->de_nsubtrees) { + queue[i].down = xcalloc(de->de_nsubtrees, + sizeof(struct directory_queue)); + de = sort_directories(de, + queue[i].down); + } + } + qsort(queue, nsubtrees, sizeof(struct directory_queue), + compare_cache_tree_elements); + return de; +} + +struct cache_tree *cache_tree_convert_v5(struct directory_entry *de) +{ + struct directory_queue *queue; + + if (!de->de_nentries) + return NULL; + queue = xcalloc(1, sizeof(struct directory_queue)); + queue[0].de = de; + queue[0].down = xcalloc(de->de_nsubtrees, sizeof(struct directory_queue)); + + sort_directories(de, queue[0].down); + return convert_one(queue, 0); +} + static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path) { if (!it) diff --git a/cache-tree.h b/cache-tree.h index d8cb2e9..f4131a6 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -20,6 +20,11 @@ struct cache_tree { struct cache_tree_sub **down; }; +struct directory_queue { + struct directory_queue *down; + struct directory_entry *de; +}; + struct cache_tree *cache_tree(void); void cache_tree_free(struct cache_tree **); void cache_tree_invalidate_path(struct cache_tree *, const char *); @@ -27,6 +32,7 @@ struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *); void cache_tree_write(struct strbuf *, struct cache_tree *root); struct cache_tree *cache_tree_read(const char *buffer, unsigned long size); +struct cache_tree *cache_tree_convert_v5(struct directory_entry *de); int cache_tree_fully_valid(struct cache_tree *); int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int); diff --git a/read-cache.c b/read-cache.c index cef9a4e..fd095ec 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2054,6 +2054,7 @@ void read_index_v5(struct index_state *istate, void *mmap, int mmap_size, int fd while (de) de = read_entries_v5(istate, de, &entry_offset, &mmap, mmap_size, &nr, &foffsetblock, fd); + istate->cache_tree = cache_tree_convert_v5(root_directory); } /* remember to discard_cache() before reading a different cache! */ -- 1.7.10.886.gdf6792c.dirty