summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | add commentScott Graham2015-04-241-0/+3
| | | | |
| | * | | Fix pool use count going unbalancedScott Graham2015-04-233-9/+40
| | | | |
| * | | | Forward interruption signal to child processes.Nicolas Despres2015-04-242-29/+34
| | | | |
| * | | | Allow SIGTERM for interruption.Nicolas Despres2015-04-243-6/+38
| |/ / / | | | | | | | | | | | | | | | | Default signal sent by many other programs (mainly kill(1)) to gently terminates another one is SIGTERM.
| * | | Run more than 34 processes on Win32 if we have 32+ cores.Rui Ueyama2015-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For compatiblity reason, dwNumberOfProcessors in Win32 is capped at 32. So even if your machine has more than 32 cores, Ninja spawns at most 34 subprocesses. This patch fixes the issue by using GetNativeSystemInfo, which returns the system info from Wow64 point of view, instead of GetSystemInfo.
| * | | Merge pull request #954 from nico/fixNico Weber2015-04-091-1/+1
| |\ \ \ | | | | | | | | | | Fix an assert (and tests in --debug mode) after #921.
| | * | | Fix an assert (and tests in --debug mode) after #921.Nico Weber2015-04-091-1/+1
| | | | |
| * | | | Fix backslashes in graphviz causing incorrect rendering on windows.Spencer Judge2015-04-081-1/+4
| |/ / /
| * | | Don't get stuck on cyclic graphs where one edge has multiple outputs.Nico Weber2015-04-012-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #934. Plan::AddSubTarget() tracks in want_ if each edge has been visited and visits every edge only once. But Plan::CheckDependencyCycle() worked on nodes however, so if a cycle was entered through an edge with multiple outputs, ninja would fail to detect that cycle. Move cycle detection to look for duplicate edges instead of nodes to fix this. The extra jump makes CheckDependencyCycle() a bit slower: for a synthetic build file with 10000 serial build steps, `ninja -n` now takes 0.32s instead of 0.26s before on my laptop. In practice, projects have a dependency change length on the order of 50, so there shouldn't be a noticeable slowdown in practice. (If this does end up being a problem: CheckDependencyCycle() currently does O(n) work and is called O(m) times from AddSubTarget(), so I think cycle checking is O(n^2) in the build depth. So instead of worrying about constant overhead, we could use a set<> instead of a stack<>. But it doesn't seem to be a problem in practice.)
| * | | Cleanup: Don't search stack for cycle elements twice.Nico Weber2015-04-011-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The common case is that there is no cycle. In that case, CheckDependencyCycle() searched the stack for a dupe from the back, wouldn't find one, and return false. If there was a cycle, it would then search again from the front (probably because the push_back() that used to be here would invalidate the ri iterator). Since the push_back() is gone, just search from the front once. No intended behavior change.
| * | | Cleanup: Make stack a const ref now that it's no longer modified.Nico Weber2015-04-012-8/+10
| | | |
| * | | Cleanup: Don't modify during cycle checking.Nico Weber2015-04-011-6/+2
| | | |
| * | | Let Stat() have an err outparam instead of writing to stderr.Nico Weber2015-03-3112-138/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also check for Stat() failure in a few more places. This way, ninja doesn't print two "ninja: error: " lines if stat() fails during a build. It also makes it easier to keep the stat tests quiet. Every caller of Stat() needs to explicitly log the error string if that's desired.
| * | | Add an opt-in flag to make duplicate edges an error (`-w dupbuild=err`).Nico Weber2015-03-244-9/+65
| | | | | | | | | | | | | | | | | | | | This is step 1 on #931. Duplicated edges will become an error by default in the future.
| * | | Swap order of -k and -l in help output, to keep the list alphabetized.Nico Weber2015-03-241-1/+1
| | | |
| * | | Make tests quiet again.Nico Weber2015-03-242-5/+9
| | | |
| * | | Move warning emission on dupe edges from State to ManifestParser.Nico Weber2015-03-243-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to optionally make this an error (because ManifestParser has a way of printing errors), and it'll also make it easier to make the tests quiet again. No behavior change.
| * | | Preallocate edge node vectors. ~1% faster.Nico Weber2015-03-211-0/+2
| | | |
| * | | Recover slowdown for cyclic rule bindings fix.Nico Weber2015-03-211-9/+17
| | | |
| * | | Don't crash on cyclic references between rule bindings.Nico Weber2015-03-211-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #902. This dynamically detects cycles. I like this approach less than detecting them statically when parsing rules [1], but it has the advantage that it doesn't break existing ninja manifest files. It has the disadvantage that it slows down manifest_parser_perftest by 3.9%. 1: https://github.com/martine/ninja/commit/cc6f54d6d436047
| * | | Another crash fix for duplicate edges. Fixes #939.Nico Weber2015-03-194-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch #933 fixed a crash with duplicate edges by not adding edges to the graph if all the edge's outputs are already built by other edges. However, it added the edge to the out_edges of the edge's input nodes before deleting it, letting inputs refer to dead edges. To fix, move the check for deleting an edge above the code that adds inputs. Expand VerifyGraph() to check that nodes don't refer to edges that aren't present in the state.
| * | | Make failing stat() calls abort the build.Nico Weber2015-03-196-40/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #830, fixes #904. In practice, this either happens with 64-bit inodes and a 32-bit userspace when building without -D_FILE_OFFSET_BITS=64 in CFLAGS, or when a filename is longer than the system file length limit. Since DiskInterface::Stat() returns -1 on error, and Node used -1 on "stat state unknown", not aborting the build lead to ninja stat()ing the same file over and over again, until it finally ran out of stack. That's now fixed. * Change RecomputeOutputsDirty() to return success instead of dirty state (like RecomputeDirty()) and return the dirty state in a bool outparam * Node::Stat()s old return value wasn't used anywhere, change the function to return success instead and add an |err| outparam * Node::StatIfNecessary()'s old return value was used only in one place. Change that place to explicitly check status_known() and make StatIfNecessary() return success and add an |err| outparam * Plan::CleanNode() can now fail, make it return bool and add an |err| outparam
| * | | Add a missing &. (No behavior change, only used in tests.)Nico Weber2015-03-182-2/+2
| | | |
| * | | Env should only be about variables. No behavior change.Nico Weber2015-03-182-8/+2
| | | |
| * | | Merge pull request #930 from nico/depcolonNico Weber2015-03-175-6/+31
| |\ \ \ | | | | | | | | | | On unexpected output in a .d file, rebuild instead erroring.
| | * | | On unexpected output in a .d file, rebuild instead erroring.Nico Weber2015-03-122-3/+21
| | | | | | | | | | | | | | | | | | | | Fixes #417.
| | * | | Reject depfiles that don't contain a : after the target name.Nico Weber2015-03-124-3/+10
| | | | | | | | | | | | | | | | | | | | This is a prerequisite for fixing #417.
| * | | | Build self-consistent graphs for dupe edges with multiple outputs.Nico Weber2015-03-155-1/+46
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #867, both the crashes and "[stuck]" issues. The problem was that a duplicate edge would modify the in_edge of the outputs of the new build rule, but the edge corresponding to the old build rule would still think that the in_edge points to itself. `old_edge->outputs_[0]->in_edge()` would not return `old_edge`, which confused the scan logic. As fix, let `State::AddOut()` reject changing in_edge if it's already set. This changes behavior in a minor way: Previously, if there were multiple edges for a single output, the last edge would be kept. Now, the first edge is kept. This only had mostly-well-defined semantics if all duplicate edges are the same (which is the only case I've seen in practice), and for that case the behavior doesn't change. For testing, add a VerifyGraph() function and call that every time any test graph is parsed. That's a bit more code than just copying the test cases from the bug into build_test.cc, but it also yields better test coverage overall.
| * | | Merge pull request #917 from pinotree/rlimitNico Weber2015-03-091-2/+2
| |\ \ \ | | | | | | | | | | subprocess_test: gracefully handle rlim.rlim_cur < kNumProcs
| | * | | subprocess_test: gracefully handle rlim.rlim_cur < kNumProcsPino Toscano2015-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of expecting that the number of open files is well above kNumProcs, simply "skip" the test in that case, still printing the message about the test limit (adding the current system limit too).
| * | | | Merge pull request #910 from jlnt/masterNico Weber2015-03-092-5/+33
| |\ \ \ \ | | | | | | | | | | | | POSIX: detach background subprocesses from terminal.
| | * | | | POSIX: detach background subprocesses from terminal.Julien Tinnes2015-01-292-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put background subprocesses (i.e. subprocesses with no access to the console) in their own session and detach them from the terminal. This fixes martine/ninja#909.
| * | | | | Fix build with libc++ after #921.Nico Weber2015-03-091-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It failed with error: field has incomplete type 'EvalString' note: in instantiation of exception specification for 'map' requested here explicit Rule(const string& name) : name_(name) {} ^
| * | | | | Merge pull request #921 from mohamed/masterNico Weber2015-03-0910-87/+117
| |\ \ \ \ \ | | | | | | | | | | | | | | Allow scoping rules through subninja
| | * | | | | Added a new test to illustrate scoped rulesMohamed Bamakhrama2015-03-081-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new test shows the added value of scoped rules by demonstrating a multi-level build where a single rules file gets included at all the levels. By scoping rules, this is possible.
| | * | | | | Allow scoping rules through subninjaMohamed Bamakhrama2015-03-0110-87/+104
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja didn't support scoping rules through subninja and assumed a unique rule name in the whole namespace. With this change, this behavior is changed to allow scoping rules. Two rules can have the same name if they belong to two different scopes. However, two rules can NOT have the same name in the same scope.
| * | | | | Directly pass the string instead of char * to Truncate util function. It ↵Pierre Schweitzer2015-03-071-1/+1
| |/ / / / | | | | | | | | | | | | | | | will prevent useless conversions.
| * | | | Typo fix in graph.cctzik2015-02-061-1/+1
| | | | |
| * | | | Allow manifest rebuild to loop up to 100 timesColin Cross2015-02-031-14/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja generators that bootstrap themselves with Ninja may need to rebuild build.ninja multiple times. Replace the 2 cycle loop with a 100 cycle loop, and print the pass number each time it restarts. Original-author: Jamie Gennis <jgennis@gmail.com>
| * | | Merge pull request #897 from tzik/pendingNico Weber2015-01-241-0/+21
| |\ \ \ | | | | | | | | | | Check pending SIGINT after ppoll/pselect
| | * | | Check pending SIGINT after ppoll/pselectTaiju Tsuiki2015-01-191-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ppoll/pselect prioritizes file descriptor events over a signal delivery. So a flood of events prevents ninja from reacting keyboard interruption by the user. This CL adds a check for pending keyboard interruptions after file descriptor events.
| * | | | Remove an incorrect assert.Nico Weber2015-01-202-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert fires on cyclic manifests (found by afl-fuzz). Since there was explicit error handing for this case already, just remove the assert.
| * | | | Merge pull request #894 from tfarina/has-indentNico Weber2015-01-141-4/+4
| |\ \ \ \ | | |/ / / | |/| | | Cleanup: Fix 'hasIdent' variable name/style.
| | * | | Cleanup: Fix 'hasIdent' variable name/style.Thiago Farina2015-01-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems more correct to name it has_indent_token and to use the unix_hacker style. Signed-off-by: Thiago Farina <tfarina@chromium.org>
| * | | | Try to simplify d1e6a29 a bit.Nico Weber2015-01-041-3/+3
| | | | |
| * | | | Remove unused hash<std::string>.Nico Weber2015-01-041-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | ExternalStringHashMap used to store std::strings long ago. Since it doesn't anymore, this specialization isn't needed. No behavior change.
| * | | | Fix compilation errors on Visual Studio 2015 (_MSC_VER 1900).Beren Minor2014-12-312-4/+21
| |/ / /
| * | | Remove 'Recompacting...' messages.Nico Weber2014-12-186-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recompacting the build log used to be slow, so it made sense to print this message. We then made recompaction much faster, but didn't remove this message back then. The deps log only has it because the build log had it. Since both steps are effectively instant in practice, remove these log messages.
| * | | Let DependencyScan::RecomputeDirty() work correclty with cyclic graphs.Nico Weber2014-12-083-4/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecomputDirty(edge) currently works roughly like this: RecomputeDirty(edge): LoadDeps(edge) for in in edge.inputs: if in.StatIfNecessary(): RecomputeDirty(in.in_edge) # recurse into inputs for out in edge.outputs: out.StatIfNecessary() # mark outputs as visited It uses the stat state of each node to mark nodes as visited and doesn't traverse across nodes that have been visited already. For cyclic graphs with an edge with multiple outputs on the cycle, nothing prevents an edge to be visited more than once if the cycle is entered through an output that isn't on the cycle. In other words, RecomputeDirty() for the same edge can be on the call stack more than once. This is bad for at least two reasons: 1. Deps are added multiple times, making the graph confusing to reason about. 2. LoadDeps() will insert into the inputs_ of an edge that's iterated over in a callframe higher up. This can invalidate the iterator, which causes a crash when the callframe with the loop over the now-invalidated iterator resumes. To fix this, let RecomputeDirty() mark all outputs of an edge as visited as the first thing it does. This way, even if the edge is on a cycle with several outputs, each output is already marked and no edge will have its deps loaded more than once. Fixes the crashes in #875. (In practice, it turns the crashes into "stuck [this is a bug]" messages for now, due to the example without duplicate rules in #867)
| * | | Rename a few iterators. No behavior change.Nico Weber2014-12-072-67/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It confused me that the iterator iterating over `outputs_` was called `i` -- this always made me think of "input", not "iterator". Call iterators over edge outputs "o", iterators over edge inputs "i", iterators over node input edges "oe", and general iterators over edges "e".
generated by cgit v0.12 at 2025-04-22 21:00:10 (GMT)