summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 19:00:58 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 19:00:58 +0000
commitcd3cf12588560bf1c1ffc780ce7fdeae044b100e (patch)
tree8ab79805aa9e50db3a2eae36e324af2f92bc13d4 /base/base.gyp
parent2fc4c21d0b6cebaf8ebc101cc3fe20ef38407373 (diff)
downloadchromium_src-cd3cf12588560bf1c1ffc780ce7fdeae044b100e.zip
chromium_src-cd3cf12588560bf1c1ffc780ce7fdeae044b100e.tar.gz
chromium_src-cd3cf12588560bf1c1ffc780ce7fdeae044b100e.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@41181 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"