From: Eric Sunshine <sunshine@sunshineco.com> To: Thomas Gummerer <t.gummerer@gmail.com> Cc: "Git List" <git@vger.kernel.org>, "Thomas Rast" <trast@inf.ethz.ch>, "Michael Haggerty" <mhagger@alum.mit.edu>, "Junio C Hamano" <gitster@pobox.com>, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>, "Robin Rosenberg" <robin.rosenberg@dewire.com> Subject: Re: [PATCH 18/22] read-cache: write index-v5 Date: Sun, 7 Jul 2013 16:43:44 -0400 Message-ID: <CAPig+cTEGWPMya=u6JhYh4x+3+cE7T-vZsdo4t-w-_4-tMh5eA@mail.gmail.com> (raw) In-Reply-To: <1373184720-29767-19-git-send-email-t.gummerer@gmail.com> On Sun, Jul 7, 2013 at 4:11 AM, Thomas Gummerer <t.gummerer@gmail.com> wrote: > Write the index version 5 file format to disk. This version doesn't > write the cache-tree data and resolve-undo data to the file. > > The main work is done when filtering out the directories from the > current in-memory format, where in the same turn also the conflicts > and the file data is calculated. > > Helped-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> > Helped-by: Thomas Rast <trast@student.ethz.ch> > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> > --- > diff --git a/read-cache-v5.c b/read-cache-v5.c > index f1ad132..f056f6b 100644 > --- a/read-cache-v5.c > +++ b/read-cache-v5.c > +static int write_index_v5(struct index_state *istate, int newfd) > +{ > + struct cache_version_header hdr; > + struct cache_header hdr_v5; > + struct cache_entry **cache = istate->cache; > + struct directory_entry *de; > + struct ondisk_directory_entry *ondisk; > + int entries = istate->cache_nr; > + int i, removed, non_conflicted, total_dir_len, ondisk_directory_size; > + int total_file_len, conflict_offset, offset_to_offset; > + unsigned int ndir; > + uint32_t crc; > + > + if (istate->partially_read) > + die("BUG: index: cannot write a partially read index"); > + > + for (i = removed = 0; i < entries; i++) { > + if (cache[i]->ce_flags & CE_REMOVE) > + removed++; > + } > + hdr.hdr_signature = htonl(CACHE_SIGNATURE); > + hdr.hdr_version = htonl(istate->version); > + hdr_v5.hdr_nfile = htonl(entries - removed); > + hdr_v5.hdr_nextension = htonl(0); /* Currently no extensions are supported */ > + > + non_conflicted = 0; > + total_dir_len = 0; > + total_file_len = 0; > + de = compile_directory_data(istate, entries, &ndir, &non_conflicted, > + &total_dir_len, &total_file_len); > + hdr_v5.hdr_ndir = htonl(ndir); > + > + /* > + * This is needed because the compiler aligns structs to sizes multipe s/multipe/multiple/ > + * of 4 > + */ > + ondisk_directory_size = sizeof(ondisk->flags) > + + sizeof(ondisk->foffset) > + + sizeof(ondisk->cr) > + + sizeof(ondisk->ncr) > + + sizeof(ondisk->nsubtrees) > + + sizeof(ondisk->nfiles) > + + sizeof(ondisk->nentries) > + + sizeof(ondisk->sha1); > + hdr_v5.hdr_fblockoffset = htonl(sizeof(hdr) + sizeof(hdr_v5) + 4 > + + (ndir + 1) * 4 > + + total_dir_len > + + ndir * (ondisk_directory_size + 4) > + + (non_conflicted + 1) * 4); > + > + crc = 0; > + if (ce_write(&crc, newfd, &hdr, sizeof(hdr)) < 0) > + return -1; > + if (ce_write(&crc, newfd, &hdr_v5, sizeof(hdr_v5)) < 0) > + return -1; > + crc = htonl(crc); > + if (ce_write(NULL, newfd, &crc, 4) < 0) > + return -1; > + > + conflict_offset = sizeof(hdr) + sizeof(hdr_v5) + 4 > + + (ndir + 1) * 4 > + + total_dir_len > + + ndir * (ondisk_directory_size + 4) > + + (non_conflicted + 1) * 4 > + + total_file_len > + + non_conflicted * (sizeof(struct ondisk_cache_entry) + 4); > + if (write_directories(de, newfd, conflict_offset) < 0) > + return -1; > + offset_to_offset = sizeof(hdr) + sizeof(hdr_v5) + 4 > + + (ndir + 1) * 4 > + + total_dir_len > + + ndir * (ondisk_directory_size + 4); > + if (write_entries(istate, de, entries, newfd, offset_to_offset) < 0) > + return -1; > + if (write_conflicts(istate, de, newfd) < 0) > + return -1; > + return ce_flush(newfd); > +} > +
next prev parent reply other threads:[~2013-07-07 20:43 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-07 8:11 [PATCH 00/22] Index v5 Thomas Gummerer 2013-07-07 8:11 ` [PATCH 01/22] t2104: Don't fail for index versions other than [23] Thomas Gummerer 2013-07-07 8:11 ` [PATCH 02/22] read-cache: split index file version specific functionality Thomas Gummerer 2013-07-07 8:11 ` [PATCH 03/22] read-cache: move index v2 specific functions to their own file Thomas Gummerer 2013-07-07 8:11 ` [PATCH 04/22] read-cache: Re-read index if index file changed Thomas Gummerer 2013-07-07 8:11 ` [PATCH 05/22] read-cache: add index reading api Thomas Gummerer 2013-07-08 2:01 ` Duy Nguyen 2013-07-08 11:40 ` Thomas Gummerer 2013-07-08 2:19 ` Duy Nguyen 2013-07-08 11:20 ` Thomas Gummerer 2013-07-08 12:45 ` Duy Nguyen 2013-07-08 13:37 ` Thomas Gummerer 2013-07-08 20:54 ` [PATCH 5.5/22] Add documentation for the index api Thomas Gummerer 2013-07-09 15:42 ` Duy Nguyen 2013-07-09 20:10 ` Thomas Gummerer 2013-07-10 5:28 ` Duy Nguyen 2013-07-11 11:30 ` Thomas Gummerer 2013-07-11 11:42 ` Duy Nguyen 2013-07-11 12:27 ` Duy Nguyen 2013-07-08 16:36 ` [PATCH 05/22] read-cache: add index reading api Junio C Hamano 2013-07-08 20:10 ` Thomas Gummerer 2013-07-08 23:09 ` Junio C Hamano 2013-07-09 20:13 ` Thomas Gummerer 2013-07-07 8:11 ` [PATCH 06/22] make sure partially read index is not changed Thomas Gummerer 2013-07-08 16:31 ` Junio C Hamano 2013-07-08 18:33 ` Thomas Gummerer 2013-07-07 8:11 ` [PATCH 07/22] dir.c: use index api Thomas Gummerer 2013-07-07 8:11 ` [PATCH 08/22] tree.c: " Thomas Gummerer 2013-07-07 8:11 ` [PATCH 09/22] name-hash.c: " Thomas Gummerer 2013-07-07 8:11 ` [PATCH 10/22] grep.c: Use " Thomas Gummerer 2013-07-07 8:11 ` [PATCH 11/22] ls-files.c: use the " Thomas Gummerer 2013-07-07 8:11 ` [PATCH 12/22] read-cache: make read_blob_data_from_index use " Thomas Gummerer 2013-07-07 8:11 ` [PATCH 13/22] documentation: add documentation of the index-v5 file format Thomas Gummerer 2013-07-11 10:39 ` Duy Nguyen 2013-07-11 11:39 ` Thomas Gummerer 2013-07-11 11:47 ` Duy Nguyen 2013-07-11 12:26 ` Thomas Gummerer 2013-07-11 12:50 ` Duy Nguyen 2013-07-07 8:11 ` [PATCH 14/22] read-cache: make in-memory format aware of stat_crc Thomas Gummerer 2013-07-07 8:11 ` [PATCH 15/22] read-cache: read index-v5 Thomas Gummerer 2013-07-07 20:18 ` Eric Sunshine 2013-07-08 11:40 ` Thomas Gummerer 2013-07-07 8:11 ` [PATCH 16/22] read-cache: read resolve-undo data Thomas Gummerer 2013-07-07 8:11 ` [PATCH 17/22] read-cache: read cache-tree in index-v5 Thomas Gummerer 2013-07-07 20:41 ` Eric Sunshine 2013-07-07 8:11 ` [PATCH 18/22] read-cache: write index-v5 Thomas Gummerer 2013-07-07 20:43 ` Eric Sunshine [this message] 2013-07-07 8:11 ` [PATCH 19/22] read-cache: write index-v5 cache-tree data Thomas Gummerer 2013-07-07 8:11 ` [PATCH 20/22] read-cache: write resolve-undo data for index-v5 Thomas Gummerer 2013-07-07 8:11 ` [PATCH 21/22] update-index.c: rewrite index when index-version is given Thomas Gummerer 2013-07-07 8:12 ` [PATCH 22/22] p0003-index.sh: add perf test for the index formats Thomas Gummerer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAPig+cTEGWPMya=u6JhYh4x+3+cE7T-vZsdo4t-w-_4-tMh5eA@mail.gmail.com' \ --to=sunshine@sunshineco.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=mhagger@alum.mit.edu \ --cc=pclouds@gmail.com \ --cc=robin.rosenberg@dewire.com \ --cc=t.gummerer@gmail.com \ --cc=trast@inf.ethz.ch \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git