git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Johan Herland <johan@herland.net>,
	Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
	git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v3 12/12] refs: do not invalidate the packed-refs cache unnecessarily
Date: Thu, 20 Jun 2013 10:37:54 +0200	[thread overview]
Message-ID: <1371717474-28942-13-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1371717474-28942-1-git-send-email-mhagger@alum.mit.edu>

Now that we keep track of the packed-refs file metadata, we can detect
when the packed-refs file has been modified since we last read it, and
we do so automatically every time that get_packed_ref_cache() is
called.  So there is no need to invalidate the cache automatically
when lock_packed_refs() is called; usually the old copy will still be
valid.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/refs.c b/refs.c
index 787cc1c..038e5c7 100644
--- a/refs.c
+++ b/refs.c
@@ -2136,11 +2136,14 @@ int lock_packed_refs(int flags)
 {
 	struct packed_ref_cache *packed_ref_cache;
 
-	/* Discard the old cache because it might be invalid: */
-	clear_packed_ref_cache(&ref_cache);
 	if (hold_lock_file_for_update(&packlock, git_path("packed-refs"), flags) < 0)
 		return -1;
-	/* Read the current packed-refs while holding the lock: */
+	/*
+	 * Get the current packed-refs while holding the lock.  If the
+	 * packed-refs file has been modified since we last read it,
+	 * this will automatically invalidate the cache and re-read
+	 * the packed-refs file.
+	 */
 	packed_ref_cache = get_packed_ref_cache(&ref_cache);
 	packed_ref_cache->lock = &packlock;
 	/* Increment the reference count to prevent it from being freed: */
-- 
1.8.3.1

      parent reply	other threads:[~2013-06-20  8:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-20  8:37 [PATCH v3 00/12] Fix some reference-related races Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 01/12] repack_without_ref(): split list curation and entry writing Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 02/12] pack_refs(): split creation of packed refs " Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 03/12] refs: wrap the packed refs cache in a level of indirection Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 04/12] refs: implement simple transactions for the packed-refs file Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 05/12] refs: manage lifetime of packed refs cache via reference counting Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 06/12] do_for_each_entry(): increment the packed refs cache refcount Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 07/12] packed_ref_cache: increment refcount when locked Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 08/12] Extract a struct stat_data from cache_entry Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 09/12] add a stat_validity struct Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 10/12] get_packed_ref_cache: reload packed-refs file when it changes Michael Haggerty
2013-06-20  8:37 ` [PATCH v3 11/12] for_each_ref: load all loose refs before packed refs Michael Haggerty
2013-06-20  8:37 ` Michael Haggerty [this message]

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=1371717474-28942-13-git-send-email-mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johan@herland.net \
    --cc=peff@peff.net \
    --cc=ramsay@ramsay1.demon.co.uk \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).