Force non-joinable SimpleThreads to be leaked.

base/threading/simple_thread.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/threading/simple_thread.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_restrictions.h"
 
 namespace base {
 
 SimpleThread::SimpleThread(const std::string& name_prefix)
     : SimpleThread(name_prefix, Options()) {}
 
 SimpleThread::SimpleThread(const std::string& name_prefix,
                            const Options& options)
     : name_prefix_(name_prefix),
       name_(name_prefix),
       options_(options),
       event_(WaitableEvent::ResetPolicy::MANUAL,
              WaitableEvent::InitialState::NOT_SIGNALED) {}
 
 SimpleThread::~SimpleThread() {
+  DCHECK(options_.joinable) << "A non-joinable thread must be leaked.";
   DCHECK(HasBeenStarted()) << "SimpleThread was never started.";
-  DCHECK(thread_.is_null()) << "Joinable SimpleThread destroyed without being "
-                            << "Join()ed.";
+  DCHECK(HasBeenJoined()) << "Joinable SimpleThread destroyed without being "
+                          << "Join()ed.";
 }
 
 void SimpleThread::Start() {
   DCHECK(!HasBeenStarted()) << "Tried to Start a thread multiple times.";
   bool success = options_.joinable
       ? PlatformThread::CreateWithPriority(options_.stack_size, this,
                                            &thread_, options_.priority)
       : PlatformThread::CreateNonJoinableWithPriority(
             options_.stack_size, this, options_.priority);
   DCHECK(success);
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   event_.Wait();  // Wait for the thread to complete initialization.
 }
 
 void SimpleThread::Join() {
+  DCHECK(options_.joinable) << "A non-joinable thread can't be joined.";
   DCHECK(HasBeenStarted()) << "Tried to Join a never-started thread.";
   DCHECK(!HasBeenJoined()) << "Tried to Join a thread multiple times.";
-  DCHECK(!thread_.is_null()) << "A non-joinable thread can't be joined.";
   PlatformThread::Join(thread_);
   thread_ = PlatformThreadHandle();
   joined_ = true;
 }
 
 bool SimpleThread::HasBeenStarted() {
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   return event_.IsSignaled();
 }
 
@@ skipping 100 matching lines @@
 
     // A NULL delegate pointer signals us to quit.
     if (!work)
       break;
 
     work->Run();
   }
 }
 
 }  // namespace base