Up to [local] / src / usr.bin / make
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.13 / (download) - annotate - [select for diffs], Sun Sep 27 16:58:16 2015 UTC (8 years, 7 months ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2,
OPENBSD_6_1_BASE,
OPENBSD_6_1,
OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9,
HEAD
Changes since 1.12: +9 -5 lines
Diff to previous 1.12 (colored)
Mark all the error printing functions as printf-like; fix two format mismatches this revealed ok espie@
Revision 1.12 / (download) - annotate - [select for diffs], Fri Sep 21 07:55:20 2012 UTC (11 years, 7 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7,
OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5,
OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)
major overhaul of the way make handle jobs, inspired by dpb: instead of forking a "job" per target, and having that job further fork separate commands, have make maintain a list of jobs, indexed by pid of currently running commands, and handle process termination continuation-style. This has lots of benefits: - make is responsible for most printing, so we no longer need pipes nor job control: make -j jobs see the tty. - no more special-casing for jobs that don't really execute anything. - unify code for make -jn and make -B, including signal handlers and job waiting. So make -n, make -q, +cmd now run commands in the same way in all cases. - unified more accurate error-reporting, as make knows precisely which command failed. Commands are tagged with their lines, and we display failing commands in silent mode. - fine-grained "expensive" command handling (recursion limiter). Do it per-command instead of per-target. Moreover, signal response is now simpler, as we just block the signals in a small critical sections, test for events, and sigpause (thanks a lot to guenther@ and millert@), so running make is now almost always paused without any busy-waiting. Thanks to everyone who tested and gave input.
Revision 1.11 / (download) - annotate - [select for diffs], Mon Jul 19 19:46:44 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE,
OPENBSD_5_2,
OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.10: +1 -2 lines
Diff to previous 1.10 (colored)
Correct $OpenBSD$ stuff
Revision 1.10 / (download) - annotate - [select for diffs], Mon Jul 19 19:30:37 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.9: +0 -0 lines
Diff to previous 1.9 (colored)
two small changes: - allow variables in SysV modifiers, as requested by matthieu@ (since recursive variables are an extension, this just extends the extension) - variation on :Q called :QL (quote list), which does quote every character EXCEPT for whitespace. e.g., toto: @for i in ${VAR:QL} ...
Revision 1.9 / (download) - annotate - [select for diffs], Tue Nov 4 07:22:35 2008 UTC (15 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7,
OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5
Changes since 1.8: +0 -1 lines
Diff to previous 1.8 (colored)
changes to get target equivalence to work better. - add new file to create lists of equivalent targets (siblings) - use that for sequential mode to have much better VPATH support - separate checking commands from reporting error, for later. - zap DieHorribly accordingly - renumber existing flags - signal_running_jobs() is simpler than pass_signal_to_jobs() - new debug option -dn for name matching. Similar code to handle parallel make is still missing. thanks to Mark, Miod, Theo, Otto, Todd for tests and/or comments.
Revision 1.8 / (download) - annotate - [select for diffs], Sat Nov 3 10:41:48 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.7: +4 -1 lines
Diff to previous 1.7 (colored)
fix an obnoxious bug: in parallel mode, dieing in the job controller is not 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.
Revision 1.7 / (download) - annotate - [select for diffs], Wed Sep 19 10:58:07 2001 UTC (22 years, 8 months ago) by mpech
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2,
OPENBSD_4_1_BASE,
OPENBSD_4_1,
OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9,
OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7,
OPENBSD_3_6_BASE,
OPENBSD_3_6,
OPENBSD_3_5_BASE,
OPENBSD_3_5,
OPENBSD_3_4_BASE,
OPENBSD_3_4,
OPENBSD_3_3_BASE,
OPENBSD_3_3,
OPENBSD_3_2_BASE,
OPENBSD_3_2,
OPENBSD_3_1_BASE,
OPENBSD_3_1,
OPENBSD_3_0_BASE,
OPENBSD_3_0
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)
occured->occurred idea from deraadt@ via NetBSD millert@ ok p.s. Next commit will fix a typo in the sys/
Revision 1.6 / (download) - annotate - [select for diffs], Wed May 23 12:34:42 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.5: +46 -46 lines
Diff to previous 1.5 (colored)
Mostly clean-up: - cut up those huge include files into separate interfaces for all modules. Put the interface documentation there, and not with the implementation. - light-weight includes for needed concrete types (lst_t.h, timestamp_t.h). - cut out some more logically separate parts: cmd_exec, varname, parsevar, timestamp. - put all error handling functions together, so that we will be able to clean them up. - more systematic naming: functioni to handle interval, function to handle string. - put the init/end code apart to minimize coupling. - kill weird types like ReturnStatus and Boolean. Use standard bool (with a fallback for non-iso systems) - better interface documentation for lots of subsystems. As a result, make compilation goes somewhat faster (5%, even considering the largish BSD copyrights to read). The corresponding preprocessed source goes down from 1,5M to 1M. A few minor code changes as well: Parse_DoVar is no longer destructive. Parse_IsVar functionality is folded into Parse_DoVar (as it knows what an assignment is), a few more interval handling functions. Avoid calling XXX_End when they do nothing, just #define XXX_End to nothing. Parse_DoVar is slightly more general: it will handle compound assignments as long as they make sense, e.g., VAR +!= cmd will work. As a side effect, VAR++=value now triggers an error (two + in assignment). - this stuff doesn't occur in portable Makefiles. - writing VAR++ = value or VAR+ +=value disambiguates it. - this is a good thing, it uncovered a bug in bsd.port.mk. Tested by naddy@. Okayed millert@. I'll handle the fallback if there is any. This went through a full make build anyways, including isakmpd (without mickey's custom binutils, as he didn't see fit to share it with me).
Revision 1.5 / (download) - annotate - [select for diffs], Thu May 3 13:41:05 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.4: +11 -10 lines
Diff to previous 1.4 (colored)
Synch with my current work. Numerous changes: - generate can build several tables - style cleanup - statistics code - use variable names throughout (struct Name) - recursive variables everywhere - faster parser (pass buffer along instead of allocating multiple copies) - correct parser. Handles comments everywhere, and ; correctly - more string intervals - simplified dir.c, less recursion. - extended for loops - sinclude() - finished removing extra junk from Lst_* - handles ${@D} and friends in a simpler way - cleaned up and modular VarModifiers handling. - recognizes some gnu Makefile usages and errors out about them. Additionally, some extra functionality is defined by FEATURES. The set of functionalities is currently hardcoded to OpenBSD defaults, but this may include support for some NetBSD extensions, like ODE modifiers. Backed by miod@ and millert@, who finally got sick of my endless patches...
Revision 1.4 / (download) - annotate - [select for diffs], Fri Oct 13 08:29:20 2000 UTC (23 years, 7 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE,
OPENBSD_2_9,
OPENBSD_2_8_BASE,
OPENBSD_2_8
Changes since 1.3: +2 -1 lines
Diff to previous 1.3 (colored)
esetenv: does a setenv and bails out if error.
Revision 1.3 / (download) - annotate - [select for diffs], Thu Sep 14 13:32:06 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.2: +9 -9 lines
Diff to previous 1.2 (colored)
Some systematic clean-up. - UNUSED macro that expands to __attribute__((unused)) for gcc - move rcsid around so that they can be tagged UNUSED. - activate -Wunused. - use UNUSED instead of kludgy junk for function arguments. - add extern to all extern prototypes. - update comments in lst.h. - clean up var.c a little bit, constifying arguments, updating comments...
Revision 1.2 / (download) - annotate - [select for diffs], Fri Jun 23 16:27:29 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.1: +5 -1 lines
Diff to previous 1.1 (colored)
This is the speed-up patch, which doubles make speed (almost). Use the open hashing functions for global contexts instead of List in var.c. All the preliminary work to trim down local contexts means that we don't suffer from the heavy initialization work that a hash table entails. There is some make kludgery to: - build the hashing functions as a library, - recreate hashconsts.h, even if make depend was not invoked. One point of the hashing scheme written was to separate the computation of the hash function, and the hash lookup itself. This is very convenient for make, because of those pesky special variables. hashconsts.h is there to pre-hash the correct values, which replaces a few expensive string comparisons with quick hash value comparisons, followed by one expensive string comparison. The modulus MAGICSLOTS chosen in the Makefile is ad-hoc: it is small enough to write a small switch without collision, and will need changing if the hash function changes... The function quick_lookup is the most important: it either returns an index, for a local variable, or it does compute a hashing value, and returns -1. Another somewhat controversial decision is the use of string intervals. This avoids either copying a string, or twiddling with a byte for cases such as ${VAR}. Finally, the variable name is stored within the variable itself. Since a given variable name never changes, this makes sense. All that was needed was a hash library with support for this. Note that the hashing table holds only a variable pointer AND the corresponding hashing value, WITHOUT a modulo hashtablesize. Two reasons: - hash resizes can be done faster, without having to recompute hashing values. - locality of access. The hash table fits into memory without problem. Once a candidate slot is found, we check the complete hashing value. Probability of a collision is very small (32 bits...). So bringing up the whole variable in memory at once is good: the name will almost always match, in which case we want the variable value as well, so it makes sense to put them together. The ohash functions implement open hashing, as described in Knuth, but with a variable table size. Choosing powers of 2 sizes does not yield more collisions, but it makes the hashing scheme much simpler. The thresholds at which to expand/shrink the tables seem to work well in practice. The default sizes were chosen such that the tables hardly ever shrink or expand anyways (though I've tried with smaller/larger sizes to verify that the shrinking/expanding worked correctly): larger Makefiles hold roughly 500/600 variables, which fits without trouble into a 1024-sized variable. Disregard #ifdef STATS_HASH, this is some internal scaffolding I'm using to measure make performance. The only known issue with open-hashing is that deletions cannot create empty slots, but do leave slots marked as `occupied once' so that lookup works. We use a well-known optimization which records those pseudo-empty slots while looking up values. If the value is not found, the pseudo-empty slot is returned to be filled. If the value is found, it is swapped with the pseudo-empty slot. This is an improvement in both cases, since this shortens the length of lookup chains, eventually pushing the pseudo-empty slots to the end. Reviewed by millert@ and miod@
Revision 1.1 / (download) - annotate - [select for diffs], Thu Dec 9 18:20:06 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE,
OPENBSD_2_7
Split some allocation/error handling functions out of main.c