From 82e8e2b5b879cd414e48e6418fb1a693093866e2 Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Fri, 12 Nov 2010 21:25:38 +0000 Subject: Disallow Singleton and LazyInstance on non-joinable threads. Fix all known instances or explicitly allow them. Usually the fix involves switching from Default traits to Lazy traits. BUG=61753 TEST=none Review URL: http://codereview.chromium.org/4635012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65996 0039d316-1c4b-4281-b951-d872f2087c98 --- base/platform_thread_win.cc | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'base/platform_thread_win.cc') diff --git a/base/platform_thread_win.cc b/base/platform_thread_win.cc index a4a1b52..ce865da 100644 --- a/base/platform_thread_win.cc +++ b/base/platform_thread_win.cc @@ -5,6 +5,7 @@ #include "base/platform_thread.h" #include "base/logging.h" +#include "base/thread_restrictions.h" #include "base/win/windows_version.h" namespace { @@ -20,9 +21,17 @@ typedef struct tagTHREADNAME_INFO { DWORD dwFlags; // Reserved for future use, must be zero. } THREADNAME_INFO; -DWORD __stdcall ThreadFunc(void* closure) { - PlatformThread::Delegate* delegate = - static_cast(closure); +struct ThreadParams { + PlatformThread::Delegate* delegate; + bool joinable; +}; + +DWORD __stdcall ThreadFunc(void* params) { + ThreadParams* thread_params = static_cast(params); + PlatformThread::Delegate* delegate = thread_params->delegate; + if (!thread_params->joinable) + base::ThreadRestrictions::SetSingletonAllowed(false); + delete thread_params; delegate->ThreadMain(); return NULL; } @@ -66,7 +75,8 @@ void PlatformThread::SetName(const char* name) { // static bool PlatformThread::Create(size_t stack_size, Delegate* delegate, - PlatformThreadHandle* thread_handle) { + PlatformThreadHandle* out_thread_handle) { + PlatformThreadHandle thread_handle; unsigned int flags = 0; if (stack_size > 0 && base::win::GetVersion() >= base::win::VERSION_XP) { flags = STACK_SIZE_PARAM_IS_A_RESERVATION; @@ -74,22 +84,32 @@ bool PlatformThread::Create(size_t stack_size, Delegate* delegate, stack_size = 0; } + ThreadParams* params = new ThreadParams; + params->delegate = delegate; + params->joinable = out_thread_handle != NULL; + // Using CreateThread here vs _beginthreadex makes thread creation a bit // faster and doesn't require the loader lock to be available. Our code will // have to work running on CreateThread() threads anyway, since we run code // on the Windows thread pool, etc. For some background on the difference: // http://www.microsoft.com/msj/1099/win32/win321099.aspx - *thread_handle = CreateThread( - NULL, stack_size, ThreadFunc, delegate, flags, NULL); - return *thread_handle != NULL; + thread_handle = CreateThread( + NULL, stack_size, ThreadFunc, params, flags, NULL); + if (!thread_handle) { + delete params; + return false; + } + + if (out_thread_handle) + *out_thread_handle = thread_handle; + else + CloseHandle(thread_handle); + return true; } // static bool PlatformThread::CreateNonJoinable(size_t stack_size, Delegate* delegate) { - PlatformThreadHandle thread_handle; - bool result = Create(stack_size, delegate, &thread_handle); - CloseHandle(thread_handle); - return result; + return Create(stack_size, delegate, NULL); } // static -- cgit v1.1