diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:40:00 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:40:00 +0000 |
commit | 7d038c3ed504066d9e39e3306281bb5dd047cfd2 (patch) | |
tree | df768ce2f474305f0e6c7f99eb9a0458b8cd46bd /chrome/browser/browser_process_impl.cc | |
parent | aa64c82121827c0943380f9c2c1063c1337af018 (diff) | |
download | chromium_src-7d038c3ed504066d9e39e3306281bb5dd047cfd2.zip chromium_src-7d038c3ed504066d9e39e3306281bb5dd047cfd2.tar.gz chromium_src-7d038c3ed504066d9e39e3306281bb5dd047cfd2.tar.bz2 |
Reland r68893 after fixing allowing blocking IO on shutdown.
This time I just turned off the checking for Chrome/Windows because Chrome/Windows shutdown is a clusterf***. TODO(willchan): Give a shit about Windows, get a machine that runs Windows, debug Chrome shutdown on Windows, enable this ThreadRestrictions for Chrome/Windows.
Consider PlatformThread::Join() to be blocking IO.
Marks PlatformThread::Join() as blocking IO using ThreadRestrictions.
Whitelists existing spots where we join on the UI/IO threads.
Also noteworthy is I allow blocking IO on shutdown.
BUG=65530, 66077, 66082
TEST=existing
Review URL: http://codereview.chromium.org/5750003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
-rw-r--r-- | chrome/browser/browser_process_impl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 53d44d8..756aa6c 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -13,6 +13,7 @@ #include "base/path_service.h" #include "base/task.h" #include "base/thread.h" +#include "base/thread_restrictions.h" #include "base/waitable_event.h" #include "chrome/browser/appcache/chrome_appcache_service.h" #include "chrome/browser/automation/automation_provider_list.h" @@ -252,6 +253,12 @@ unsigned int BrowserProcessImpl::ReleaseModule() { DCHECK_NE(0u, module_ref_count_); module_ref_count_--; if (0 == module_ref_count_) { + // Allow UI and IO threads to do blocking IO on shutdown, since we do a lot + // of it on shutdown for valid reasons. + base::ThreadRestrictions::SetIOAllowed(true); + io_thread()->message_loop()->PostTask( + FROM_HERE, + NewRunnableFunction(&base::ThreadRestrictions::SetIOAllowed, true)); MessageLoop::current()->PostTask( FROM_HERE, NewRunnableFunction(DidEndMainMessageLoop)); MessageLoop::current()->Quit(); |