summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 15:25:54 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 15:25:54 +0000
commitef73044e42948214832dd11dd3326b738f816eb6 (patch)
tree1105589709517fab2cc2ed5d745d82299d510f77 /base/base.gyp
parent6e240d7084c1cecc7fdedabe83f860659888dd2f (diff)
downloadchromium_src-ef73044e42948214832dd11dd3326b738f816eb6.zip
chromium_src-ef73044e42948214832dd11dd3326b738f816eb6.tar.gz
chromium_src-ef73044e42948214832dd11dd3326b738f816eb6.tar.bz2
POSIX: don't allocate memory after forking.
Previously we would allocate memory in the child process. However, the allocation might have happened while the malloc lock was held, resulting in a deadlock. This patch removes allocation from the child but probably makes Mac's startup time slower until a Mac person can implement dir_reader_posix.h. TEST=Unittest for new code BUG=36678 http://codereview.chromium.org/672003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 2eec8e1..30d746d 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -61,7 +61,7 @@
'crypto/signature_verifier_unittest.cc',
'data_pack_unittest.cc',
'debug_util_unittest.cc',
- 'file_watcher_unittest.cc',
+ 'dir_reader_posix_unittest.cc',
'event_trace_consumer_win_unittest.cc',
'event_trace_controller_win_unittest.cc',
'event_trace_provider_win_unittest.cc',
@@ -70,6 +70,7 @@
'file_path_unittest.cc',
'file_util_unittest.cc',
'file_version_info_unittest.cc',
+ 'file_watcher_unittest.cc',
'gfx/rect_unittest.cc',
'gmock_unittest.cc',
'histogram_unittest.cc',
@@ -181,6 +182,7 @@
'../third_party/icu/icu.gyp:icudata',
],
'sources!': [
+ 'dir_reader_posix_unittest.cc',
'file_descriptor_shuffle_unittest.cc',
],
}, { # OS != "win"