From patchwork Fri Nov 15 15:41:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Nicolay X-Patchwork-Id: 11246713 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE8E76C1 for ; Fri, 15 Nov 2019 16:23:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBD0520730 for ; Fri, 15 Nov 2019 16:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727606AbfKOQXc (ORCPT ); Fri, 15 Nov 2019 11:23:32 -0500 Received: from gate3.osm-gmbh.de ([194.77.68.107]:40297 "EHLO gate3.osm-gmbh.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727520AbfKOQXc (ORCPT ); Fri, 15 Nov 2019 11:23:32 -0500 Received: from mail.osm-gmbh.de (vmmail.osm-gmbh.de [193.101.76.128]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by gate3.osm-gmbh.de (Postfix) with ESMTPS id 44F613C0A4; Fri, 15 Nov 2019 17:23:31 +0100 (CET) Received: from wsmn.osm-gmbh.de (wsmn.osm-gmbh.de [193.101.76.193]) by mail.osm-gmbh.de (OSM Mailserver) with ESMTP id 412E33DC01E; Fri, 15 Nov 2019 17:23:31 +0100 (CET) Received: by wsmn.osm-gmbh.de (Postfix, from userid 1002) id 3CD6AD756F; Fri, 15 Nov 2019 17:23:31 +0100 (CET) From: Martin Nicolay Date: Fri, 15 Nov 2019 16:41:20 +0100 Subject: [PATCH] enable a timeout for hold_lock_file_for_update Message-Id: <20191115162331.3CD6AD756F@wsmn.osm-gmbh.de> To: undisclosed-recipients:; Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The new funktion get_files_lock_timeout_ms reads the config core.fileslocktimeout analog get_files_ref_lock_timeout_ms. This value is used in hold_lock_file_for_update instead of the fixed value 0. --- While working with complex scripts invoking git multiple times my editor detects the changes and calls "git status". This leads to aborts in "git-stash". With this patch and an appropriate value core.fileslocktimeout this problem goes away. lockfile.c | 15 +++++++++++++++ lockfile.h | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lockfile.c b/lockfile.c index 8e8ab4f29f..ac19de8937 100644 --- a/lockfile.c +++ b/lockfile.c @@ -145,6 +145,21 @@ static int lock_file_timeout(struct lock_file *lk, const char *path, } } +long get_files_lock_timeout_ms(void) +{ + static int configured = 0; + + /* The default timeout is 100 ms: */ + static int timeout_ms = 100; + + if (!configured) { + git_config_get_int("core.fileslocktimeout", &timeout_ms); + configured = 1; + } + + return timeout_ms; +} + void unable_to_lock_message(const char *path, int err, struct strbuf *buf) { if (err == EEXIST) { diff --git a/lockfile.h b/lockfile.h index 9843053ce8..a0520e6a7b 100644 --- a/lockfile.h +++ b/lockfile.h @@ -163,6 +163,8 @@ int hold_lock_file_for_update_timeout( struct lock_file *lk, const char *path, int flags, long timeout_ms); +long get_files_lock_timeout_ms(void); + /* * Attempt to create a lockfile for the file at `path` and return a * file descriptor for writing to it, or -1 on error. The flags @@ -172,7 +174,7 @@ static inline int hold_lock_file_for_update( struct lock_file *lk, const char *path, int flags) { - return hold_lock_file_for_update_timeout(lk, path, flags, 0); + return hold_lock_file_for_update_timeout(lk, path, flags, get_files_lock_timeout_ms() ); } /*