Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: trunk/src/base/threading/thread.cc

Issue 24508003: Revert 222826 "Copy the thread name to the stack for debugging p..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/threading/thread.h" 5 #include "base/threading/thread.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/alias.h"
9 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
10 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 9 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
11 #include "base/threading/thread_id_name_manager.h" 10 #include "base/threading/thread_id_name_manager.h"
12 #include "base/threading/thread_local.h" 11 #include "base/threading/thread_local.h"
13 #include "base/threading/thread_restrictions.h" 12 #include "base/threading/thread_restrictions.h"
14 #include "base/synchronization/waitable_event.h" 13 #include "base/synchronization/waitable_event.h"
15 14
16 #if defined(OS_WIN) 15 #if defined(OS_WIN)
17 #include "base/win/scoped_com_initializer.h" 16 #include "base/win/scoped_com_initializer.h"
18 #endif 17 #endif
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 bool Thread::GetThreadWasQuitProperly() { 165 bool Thread::GetThreadWasQuitProperly() {
167 bool quit_properly = true; 166 bool quit_properly = true;
168 #ifndef NDEBUG 167 #ifndef NDEBUG
169 quit_properly = lazy_tls_bool.Pointer()->Get(); 168 quit_properly = lazy_tls_bool.Pointer()->Get();
170 #endif 169 #endif
171 return quit_properly; 170 return quit_properly;
172 } 171 }
173 172
174 void Thread::ThreadMain() { 173 void Thread::ThreadMain() {
175 { 174 {
176 #if defined(OS_MACOSX)
177 // Store the thread name on the stack to debug <http://crbug.com/274705>.
178 // End with a byte sequence of <EOT><BEL><NUL> to make it easier to grep in
179 // the minidump stack dump.
180 const size_t kThreadNameSize = 50;
181 char thread_name[kThreadNameSize];
182 strncpy(thread_name, name_.c_str(), kThreadNameSize);
183 thread_name[kThreadNameSize - 1] = '\0';
184 thread_name[kThreadNameSize - 2] = '\7';
185 thread_name[kThreadNameSize - 3] = '\3';
186 base::debug::Alias(thread_name);
187 #endif
188
189 // The message loop for this thread. 175 // The message loop for this thread.
190 // Allocated on the heap to centralize any leak reports at this line. 176 // Allocated on the heap to centralize any leak reports at this line.
191 scoped_ptr<MessageLoop> message_loop( 177 scoped_ptr<MessageLoop> message_loop(
192 new MessageLoop(startup_data_->options.message_loop_type)); 178 new MessageLoop(startup_data_->options.message_loop_type));
193 179
194 // Complete the initialization of our Thread object. 180 // Complete the initialization of our Thread object.
195 thread_id_ = PlatformThread::CurrentId(); 181 thread_id_ = PlatformThread::CurrentId();
196 PlatformThread::SetName(name_.c_str()); 182 PlatformThread::SetName(name_.c_str());
197 ANNOTATE_THREAD_NAME(name_.c_str()); // Tell the name to race detector. 183 ANNOTATE_THREAD_NAME(name_.c_str()); // Tell the name to race detector.
198 message_loop->set_thread_name(name_); 184 message_loop->set_thread_name(name_);
(...skipping 25 matching lines...) Expand all
224 210
225 #if defined(OS_WIN) 211 #if defined(OS_WIN)
226 com_initializer.reset(); 212 com_initializer.reset();
227 #endif 213 #endif
228 214
229 // Assert that MessageLoop::Quit was called by ThreadQuitHelper. 215 // Assert that MessageLoop::Quit was called by ThreadQuitHelper.
230 DCHECK(GetThreadWasQuitProperly()); 216 DCHECK(GetThreadWasQuitProperly());
231 217
232 // We can't receive messages anymore. 218 // We can't receive messages anymore.
233 message_loop_ = NULL; 219 message_loop_ = NULL;
234
235 #if defined(OS_MACOSX)
236 base::debug::Alias(thread_name);
237 #endif
238 } 220 }
239 } 221 }
240 222
241 } // namespace base 223 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698