| Age | Commit message (Collapse) | Author |
|---|
|
discussed with deraadt@ and otto@ and millert@
|
|
|
|
|
|
- expand commands earlier, so that we can eventually scan them to take
smarter decisions.
- clean up the select() mask code and rename variables to sensible things.
- quite a few minor renames for readability
- erecalloc
- clean up wait status handling, do not try to rebuild wait status, but
instead parse it early and deal with the parsed code.
tested by lots of people, thanks guys!
|
|
- systematically reorder jobs based on who did output last, so that the
last job to output is *first* to output again.
- better reaction to errors: any job that outputs is checked for termination
directly, and the Error message is printed right afterwards.
- better error messages, giving more useful information in -j mode.
|
|
|
|
Found out by Christian Ehrhardt.
|
|
|
|
This lets suffix rules finally print out where they come from...
|
|
|
|
|
|
Anyways, switch to a growable array for job to do.
Allows us to randomize it.
fix manpage.
do not add delay if just one job to run.
|
|
|
|
jobs in parallel mode.
|
|
|
|
since we might want to make them later.
okay millert@, beck@
|
|
Preparations to fix the engine:
- new function has_been_built(gn), that tells you what's the status of
a given node. Allows us to run Suff_FindDeps later, by updating the number
of unmade children correctly.
- take out the code that handles shell expansions in an expand_children*
set of functions, called by Suff_FindDeps, among others. These must be
called early in the engine to avoid creating bogus nodes.
Engine fixes:
- take the predecessor/successor special handling out, deal with it in
separate functions.
- don't count nodes. Explicitly track them all in a hash table (better
way to deal with non-built issues).
- don't run Suff_FindDeps at start, but just before building an actual node.
This allows make to find all dependencies correctly, as in groff.
Pfiou! now it works.
|
|
|
|
first remove all usage of Varq_Append by building the string directly.
then replace `common' handling with specialized handling for dynamic
strings (since they no longer need a buffer). Finally, identify the place
where the variable value needs to be copied because it's going to be free'd
or erased soon, and finally, use simple char* pointers.
Shaves about 80 bytes off every gnode structure, and kills quite a few
unnecessary malloc()s as well.
|
|
|
|
On the basis that:
- .depend is a bsd extension anyways, changing its semantics doesn't
affect posix compliance.
- it may allow regenerating broken .depend files without needing to
remove them.
approved by miod@, millert@, deraadt@.
|
|
|
|
|
|
to make them easier to find in source files.
|
|
when we cannot find any suffix.
This allows Makefiles like:
.SUFFIXES: .in .sh
all: truc.sh
truc.sh.in:
echo "bonjour" >$@
.in:
sed -e 's/a/b/' <$< >$@
to work (before that, the empty suffix would not be tried, since truc.sh
matches the .sh suffix, even though there is NO transformation).
|
|
Having an `iParents' field is actually backwards, it's ways simpler to
store the pointer in the child, as an impliedsrc, and to set the variable
just in time along with all the rest in DoAllVar.
This is simpler, and it should allow us to call SuffFindDeps much later.
|
|
functions.
Restore a big more debug: if DEBUG(JOB), print commands (unexpanded).
|
|
|
|
|
|
|
|
|
|
no need to duplicate that info at the job level since we can just use
the gn->type.
|
|
|
|
|
|
|
|
|
|
the same as dieing in a sub job, since waiting on sub-jobs won't work.
So keep track of who we are via a state variable.
|
|
a lot of the time.
|
|
|
|
real files get updated anyways, but phony nodes stay around as unmade,
which breaks things in subtle ways, since parallel mode just assumes things
get built.
|
|
|
|
This is a really big step towards getting parallel make to work.
Note that this is not yet complete. There are still a few `details' to
fix before this works 100%. Specifically: sequential make (compat) and
parallel make don't use the same engine, and the parallel engine still
has a few limitations. For instance, some known issues:
- parallel make does not deal with .phony targets correctly all the time.
- some errors are deadly in parallel make mode.
- parallel make NEEDS way more sturdy correspondance of file system paths
and target names, since it often needs to match dependencies to targets
before the corresponding files exist.
- some local variables like $* get set in a bogus way in some cases.
- suffix handling has issues, especially related to the NULL suffix.
So, if you find stuff that does NOT yet work with parallel make, don't go
blindly try to fix the Makefile. It's very likely you might have stumbled
into a make bug. (unless you really, really, understand Makefiles, DON'T
GO CHANGING THEM YET).
Tested by lots of people, thanks go to miod@, and robert@ among other people.
Quick summary of what this does:
- remove `saving commands' extension (it's not really usable, nor used)
- move compat job runner and parallel interrupt handling into engine.c
- tweak the code so that both compat and parallel mode use the same job runner
and the same interrupt handling. Remove the other one.
- optimize job runner so that, in parallel mode, the last command does not
fork if we can avoid it (as it's already running in a sub shell).
- scrape all the code that dealt with creating shell scripts from commands.
- scrape all the code that dealt with recognizing special sequences in
command output to print/not print output.
- fix the parallel job pipe to not keep around file descriptors that are not
needed.
- replace the parallel job buffering with a nicer one, that deals with
non-blocking descriptors to try to agregate as much output from one job in
one go (greed) to unconfuse the users.
- create two pipes per job, so that stdout and stderr stay separate.
- make job token printing a debug option.
- always use the parallel job-runner to `execute' commands, even if we just
print them out.
- store list of errors encountered during parallel make running, and print them
on exit, so that we know what went wrong.
- add a dirty hack to targ.c to deal with paths produced by gccmakedep.
|
|
|
|
Forces make to see the -j4 in MAKEFLAGS and to actually pass it to submakes
|
|
|
|
This way, you can run `make .BEGIN'. Okay, this will run .BEGIN twice.
|
|
|
|
|
|
|
|
JobStart and JobRestart often do the same thing.
Move JobMakeArgv call around for similar reasons.
Introduce new list (queuedJobs) we don't use yet.
|
