diff options
| author |  Janak Ramakrishnan <janakr@google.com> | 2016-05-23 21:20:16 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-05-24 11:58:05 +0000 |
| commit | 19fde1fc26d261fa95e115c3a0bfb0bd92f1e13a (patch) | |
| tree | 6daec251962eb8d867413ec31e4b97997c96daca /src/main/cpp/blaze.cc | |
| parent | a3b8f3586f38ccb1dd2197390813514ffccec44a (diff) | |
Separate killing Bazel on OOM using -XX:OnOutOfMemoryError and pessimistically OOMing when GC thrashing. The first seems to make us hang on OOM, which is kind of the opposite of what we want.
These flags are now even more terribly named than they used to be, but a rename can wait until we actually know what we want.
--
MOS_MIGRATED_REVID=123036704
Diffstat (limited to 'src/main/cpp/blaze.cc')
| -rw-r--r-- | src/main/cpp/blaze.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc index 72771a6966..f5eaa74291 100644 --- a/src/main/cpp/blaze.cc +++ b/src/main/cpp/blaze.cc @@ -517,9 +517,9 @@ static vector<string> GetArgumentArray() { } if (globals->options.oom_more_eagerly) { result.push_back("--experimental_oom_more_eagerly"); - result.push_back("--experimental_oom_more_eagerly_threshold=" + - ToString(globals->options.oom_more_eagerly_threshold)); } + result.push_back("--experimental_oom_more_eagerly_threshold=" + + ToString(globals->options.oom_more_eagerly_threshold)); if (globals->options.watchfs) { result.push_back("--watchfs"); |