apply: move lockfile into `apply_state`

We have two users of `struct apply_state` and the related functionality
in apply.c. Each user sets up its `apply_state` by handing over a
pointer to its static `lock_file`. (Before 076aa2cbd (tempfile:
auto-allocate tempfiles on heap, 2017-09-05), we could never free
lockfiles, so making them static was a reasonable approach.)

Other than that, they never directly access their `lock_file`s, which
are instead handled by the functionality in apply.c.

To make life easier for the caller and to make it less tempting for a
future caller to mess with the lock, make apply.c fully responsible for
setting up the `lock_file`. As mentioned above, it is now safe to free a
`lock_file`, so we can make the `struct apply_state` contain an actual
`struct lock_file` instead of a pointer to one.

The user in builtin/apply.c is rather simple. For builtin/am.c, we might
worry that the lock state is actually meant to be inherited across
calls. But the lock is only taken as `apply_all_patches()` executes, and
code inspection shows that it will always be released.

Alternatively, we can observe that the lock itself is never queried
directly. When we decide whether we should lock, we check a related
variable `newfd`. That variable is not inherited, so from the point of
view of apply.c, the state machine really is reset with each call to
`init_apply_state()`. (It would be a bug if `newfd` and the lock status
were not in sync. The duplication of information in `newfd` and the lock
will be addressed in the next patch.)

Signed-off-by: Martin Ågren <>
Signed-off-by: Junio C Hamano <>
This commit is contained in:
Martin Ågren 2017-10-05 22:32:09 +02:00 committed by Junio C Hamano
parent 2954e5ec43
commit 6d058c8826
4 changed files with 9 additions and 17 deletions

View File

@ -75,12 +75,10 @@ static int parse_ignorewhitespace_option(struct apply_state *state,
int init_apply_state(struct apply_state *state,
const char *prefix,
struct lock_file *lock_file)
const char *prefix)
memset(state, 0, sizeof(*state));
state->prefix = prefix;
state->lock_file = lock_file;
state->newfd = -1;
state->apply = 1;
state->line_termination = '\n';
@ -146,8 +144,6 @@ int check_apply_state(struct apply_state *state, int force_apply)
if (state->check_index)
state->unsafe_paths = 0;
if (!state->lock_file)
return error("BUG: state->lock_file should not be NULL");
if (state->apply_verbosity <= verbosity_silent) {
state->saved_error_routine = get_error_routine();
@ -4711,11 +4707,11 @@ static int apply_patch(struct apply_state *state,
state->update_index = state->check_index && state->apply;
if (state->update_index && state->newfd < 0) {
if (state->index_file)
state->newfd = hold_lock_file_for_update(state->lock_file,
state->newfd = hold_lock_file_for_update(&state->lock_file,
state->newfd = hold_locked_index(state->lock_file, LOCK_DIE_ON_ERROR);
state->newfd = hold_locked_index(&state->lock_file, LOCK_DIE_ON_ERROR);
if (state->check_index && read_apply_cache(state) < 0) {
@ -4911,7 +4907,7 @@ int apply_all_patches(struct apply_state *state,
if (state->update_index) {
res = write_locked_index(&the_index, state->lock_file, COMMIT_LOCK);
res = write_locked_index(&the_index, &state->lock_file, COMMIT_LOCK);
if (res) {
error(_("Unable to write new index file"));
res = -128;
@ -4924,7 +4920,7 @@ int apply_all_patches(struct apply_state *state,
if (state->newfd >= 0) {
state->newfd = -1;

View File

@ -37,7 +37,7 @@ struct apply_state {
const char *prefix;
/* These are lock_file related */
struct lock_file *lock_file;
struct lock_file lock_file;
int newfd;
/* These control what gets looked at and modified */
@ -116,8 +116,7 @@ extern int apply_parse_options(int argc, const char **argv,
int *force_apply, int *options,
const char * const *apply_usage);
extern int init_apply_state(struct apply_state *state,
const char *prefix,
struct lock_file *lock_file);
const char *prefix);
extern void clear_apply_state(struct apply_state *state);
extern int check_apply_state(struct apply_state *state, int force_apply);

View File

@ -1488,11 +1488,10 @@ static int run_apply(const struct am_state *state, const char *index_file)
struct argv_array apply_opts = ARGV_ARRAY_INIT;
struct apply_state apply_state;
int res, opts_left;
static struct lock_file lock_file;
int force_apply = 0;
int options = 0;
if (init_apply_state(&apply_state, NULL, &lock_file))
if (init_apply_state(&apply_state, NULL))
die("BUG: init_apply_state() failed");
argv_array_push(&apply_opts, "apply");

View File

@ -9,8 +9,6 @@ static const char * const apply_usage[] = {
static struct lock_file lock_file;
int cmd_apply(int argc, const char **argv, const char *prefix)
int force_apply = 0;
@ -18,7 +16,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
int ret;
struct apply_state state;
if (init_apply_state(&state, prefix, &lock_file))
if (init_apply_state(&state, prefix))
argc = apply_parse_options(argc, argv,