git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Tan <jonathantanmy@google.com>, git@vger.kernel.org
Subject: [PATCH 2/3] index-pack: drop type_cas mutex
Date: Wed, 7 Oct 2020 14:19:43 -0400	[thread overview]
Message-ID: <20201007181943.GB1976631@coredump.intra.peff.net> (raw)
In-Reply-To: <20201007181708.GA222564@coredump.intra.peff.net>

The type_cas lock lost all of its callers in f08cbf60fe (index-pack:
make quantum of work smaller, 2020-09-08), so we can safely delete it.
The compiler didn't alert us that the variable became unused, because we
still call pthread_mutex_init() and pthread_mutex_destroy() on it.

It's worth considering also whether that commit was in error to remove
the use of the lock. Why don't we need it now, if we did before, as
described in ab791dd138 (index-pack: fix race condition with duplicate
bases, 2014-08-29)? I think the answer is that we now look at and assign
the child_obj->real_type field in the main thread while holding the
work_lock(). So we don't have to worry about racing with the worker
threads.

Signed-off-by: Jeff King <peff@peff.net>
---
 builtin/index-pack.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 0f05533902..f8f1b48e56 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -159,10 +159,6 @@ static pthread_mutex_t deepest_delta_mutex;
 #define deepest_delta_lock()	lock_mutex(&deepest_delta_mutex)
 #define deepest_delta_unlock()	unlock_mutex(&deepest_delta_mutex)
 
-static pthread_mutex_t type_cas_mutex;
-#define type_cas_lock()		lock_mutex(&type_cas_mutex)
-#define type_cas_unlock()	unlock_mutex(&type_cas_mutex)
-
 static pthread_key_t key;
 
 static inline void lock_mutex(pthread_mutex_t *mutex)
@@ -186,7 +182,6 @@ static void init_thread(void)
 	init_recursive_mutex(&read_mutex);
 	pthread_mutex_init(&counter_mutex, NULL);
 	pthread_mutex_init(&work_mutex, NULL);
-	pthread_mutex_init(&type_cas_mutex, NULL);
 	if (show_stat)
 		pthread_mutex_init(&deepest_delta_mutex, NULL);
 	pthread_key_create(&key, NULL);
@@ -209,7 +204,6 @@ static void cleanup_thread(void)
 	pthread_mutex_destroy(&read_mutex);
 	pthread_mutex_destroy(&counter_mutex);
 	pthread_mutex_destroy(&work_mutex);
-	pthread_mutex_destroy(&type_cas_mutex);
 	if (show_stat)
 		pthread_mutex_destroy(&deepest_delta_mutex);
 	for (i = 0; i < nr_threads; i++)
-- 
2.29.0.rc0.520.gccaf68d5cd


  parent reply	other threads:[~2020-10-07 18:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-05 22:41 [ANNOUNCE] Git v2.29.0-rc0 Junio C Hamano
2020-10-05 23:33 ` Bryan Turner
2020-10-05 23:42 ` Randall S. Becker
2020-10-06  3:57 ` Martin Ågren
2020-10-06  6:08   ` Junio C Hamano
2020-10-07  9:54 ` Ævar Arnfjörð Bjarmason
2020-10-07 15:39 ` Jeff King
2020-10-07 15:45   ` Jeff King
2020-10-07 17:38     ` Junio C Hamano
2020-10-07 18:17       ` [PATCH 0/3] jt/threaded-inex-pack leftovers Jeff King
2020-10-07 18:19         ` [PATCH 1/3] index-pack: restore "resolving deltas" progress meter Jeff King
2020-10-07 18:50           ` Junio C Hamano
2020-10-07 18:19         ` Jeff King [this message]
2020-10-07 20:09           ` [PATCH 2/3] index-pack: drop type_cas mutex Jonathan Tan
2020-10-07 18:19         ` [PATCH 3/3] index-pack: stop mentioning find_unresolved_deltas() Jeff King
2020-10-07 18:41       ` [ANNOUNCE] Git v2.29.0-rc0 Jonathan Tan
2020-10-07 18:48         ` Jeff King
2020-10-07 20:16           ` [PATCH] index-pack: make get_base_data() comment clearer Jonathan Tan
2020-10-07 20:46             ` Junio C Hamano
2020-10-07 22:28 ` [ANNOUNCE] Git v2.29.0-rc0 Philippe Blain
2020-10-09 19:51 ` Randall S. Becker

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=20201007181943.GB1976631@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jonathantanmy@google.com \
    /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).