github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2024-12-29 14:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SV 54233] Preserve higher command_state values on also_make targets.

Browse Source 
If multiple pattern rules have the same pattern as also-make targets
and we attempt to run them at the same time, we might downgrade the
command state from 'running' to 'deps_running'; this will prevent
that also_make from being considered complete causing make to wait
forever for it to finish.

Ensure that set_command_state never downgrades the state of a target.

* src/file.c (set_command_state): Don't downgrade command_state.
* src/filedef.h (struct file): Document the order prerequisite.
* test/scripts/features/patternrules: Test the behavior.
This commit is contained in:
Paul Smith 2018-08-04 19:07:59 -04:00
parent e2234bc1ab
commit 05769ca009
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/file.c
View File

@ -788,7 +788,9 @@ snap_deps (void)
#endif
}
/* Set the 'command_state' member of FILE and all its 'also_make's. */
/* Set the 'command_state' member of FILE and all its 'also_make's.
Don't decrease the state of also_make's (e.g., don't downgrade a 'running'
also_make to a 'deps_running' also_make). */
void
set_command_state (struct file *file, enum cmd_state state)
@ -798,7 +800,8 @@ set_command_state (struct file *file, enum cmd_state state)
file->command_state = state;
for (d = file->also_make; d != 0; d = d->next)
d->file->command_state = state;
if (state > d->file->command_state)
d->file->command_state = state;
}
/* Convert an external file timestamp to internal form. */

2
src/filedef.h
View File

@ -68,7 +68,7 @@ struct file
us_question, /* Needs to be updated (-q is is set). */
us_failed /* Update failed. */
} update_status ENUM_BITFIELD (2);
enum cmd_state /* State of the commands. */
enum cmd_state /* State of commands. ORDER IS IMPORTANT! */
{
cs_not_started = 0, /* Not yet started. Must be 0! */
cs_deps_running, /* Dep commands running. */

16
tests/scripts/features/patternrules
View File

@ -220,6 +220,22 @@ all: foo.x foo-mt.x
1;
# Test pattern rules building the same targets
# See SV 54233. Rely on our standard test timeout to break the loop
touch('a.c');
run_make_test(q!
all: a.elf a.dbg
%.elf %.lnk: %.c ; : $*.elf $*.lnk
%.elf %.dbg: %.lnk ; : $*.elf $*.dbg
!,
'-j2', ": a.elf a.lnk\n: a.elf a.dbg\n");
unlink('a.c');
# This tells the test driver that the perl test script executed properly.
1;