From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] Make locked paths absolute when current directory is changed
Date: Fri, 18 Jul 2014 10:47:02 -0700 [thread overview]
Message-ID: <xmqqmwc6mueh.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1405688937-22925-1-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Fri, 18 Jul 2014 20:08:57 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> Locked paths are saved in a linked list so that if something wrong
> happens, *.lock are removed. This works fine if we keep cwd the same,
> which is true 99% of time except:
>
> - update-index and read-tree hold the lock on $GIT_DIR/index really
> early, then later on may call setup_work_tree() to move cwd.
>
> - Suppose a lock is being held (e.g. by "git add") then somewhere
> down the line, somebody calls real_path (e.g. "link_alt_odb_entry"),
> which temporarily moves cwd away and back.
>
> During that time when cwd is moved (either permanently or temporarily)
> and we decide to die(), attempts to remove relative *.lock will fail,
> and the next operation will complain that some files are still locked.
>
> Avoid this case by turning relative paths to absolute when chdir() is
> called (or soon to be called, in setup_git_directory_gently case).
The rationale makes sense.
> +extern void make_locked_paths_absolute(void);
> +static inline int chdir_safe(const char *path)
> +{
> + make_locked_paths_absolute();
> + return chdir(path);
> +}
Clever ;-). Instead of making paths absolute when you receive
requests to lock them, you lazily turn the ones relative to cwd()
absolute just before they are about to become invalid/problematic
because the program wants to chdir.
> diff --git a/lockfile.c b/lockfile.c
> index 8fbcb6a..a70d107 100644
> --- a/lockfile.c
> +++ b/lockfile.c
> @@ -280,3 +280,19 @@ void rollback_lock_file(struct lock_file *lk)
> }
> lk->filename[0] = 0;
> }
> +
> +void make_locked_paths_absolute(void)
> +{
> + struct lock_file *lk;
> + const char *abspath;
> + for (lk = lock_file_list; lk != NULL; lk = lk->next) {
> + if (!lk->filename[0] || lk->filename[0] == '/')
> + continue;
Do we have to worry about Windows?
> + abspath = absolute_path(lk->filename);
> + if (strlen(abspath) >= sizeof(lk->filename))
> + warning("locked path %s is relative when current directory "
> + "is changed", lk->filename);
Shouldn't this be a die() or an error return (which will kill the
caller anyway)?
> @@ -636,6 +636,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
> die_errno("Unable to read current working directory");
> offset = len = strlen(cwd);
>
> + make_locked_paths_absolute();
Just being curious, but this early in the start-up sequence, what
files do we have locks on?
next prev parent reply other threads:[~2014-07-18 17:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 13:08 [PATCH] Make locked paths absolute when current directory is changed Nguyễn Thái Ngọc Duy
2014-07-18 17:47 ` Junio C Hamano [this message]
2014-07-19 12:40 ` Duy Nguyen
2014-07-18 20:44 ` Johannes Sixt
2014-07-20 12:13 ` [PATCH v2 1/2] lockfile.c: remove PATH_MAX limitation (except in resolve_symlink) Nguyễn Thái Ngọc Duy
2014-07-20 12:13 ` [PATCH v2 2/2] Make locked paths absolute when current directory is changed Nguyễn Thái Ngọc Duy
2014-07-21 13:27 ` Ramsay Jones
2014-07-21 13:47 ` Duy Nguyen
2014-07-21 14:23 ` Ramsay Jones
2014-07-21 17:04 ` Junio C Hamano
2014-07-23 11:55 ` Duy Nguyen
2014-07-31 3:01 ` Yue Lin Ho
2014-07-31 9:58 ` Duy Nguyen
2014-07-20 12:47 ` [PATCH v2 1/2] lockfile.c: remove PATH_MAX limitation (except in resolve_symlink) Philip Oakley
2014-07-20 12:50 ` Duy Nguyen
2014-07-31 13:43 ` [PATCH v3 0/3] Keep .lock file paths absolute Nguyễn Thái Ngọc Duy
2014-07-31 13:43 ` [PATCH v3 1/3] lockfile.c: remove PATH_MAX limitation (except in resolve_symlink) Nguyễn Thái Ngọc Duy
2014-08-01 16:53 ` Junio C Hamano
2014-08-01 17:55 ` Junio C Hamano
2014-08-02 18:13 ` Torsten Bögershausen
2014-08-04 10:13 ` Duy Nguyen
2014-08-04 17:42 ` Junio C Hamano
2014-08-05 16:10 ` Michael Haggerty
2014-09-03 8:00 ` Yue Lin Ho
2014-08-01 17:34 ` Junio C Hamano
2014-07-31 13:43 ` [PATCH v3 2/3] lockfile.c: remove PATH_MAX limit in resolve_symlink() Nguyễn Thái Ngọc Duy
2014-07-31 13:43 ` [PATCH v3 3/3] lockfile.c: store absolute path Nguyễn Thái Ngọc Duy
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmwc6mueh.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox