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

Side by Side Diff: src/cpu-profiler.cc

Issue 1630027: Really fix WebKit buildbot crashes on StopProfiling. (Closed)
Patch Set: Created 10 years, 8 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
« 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 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 246 }
247 247
248 248
249 void CpuProfiler::StartProfiling(String* title) { 249 void CpuProfiler::StartProfiling(String* title) {
250 ASSERT(singleton_ != NULL); 250 ASSERT(singleton_ != NULL);
251 singleton_->StartCollectingProfile(title); 251 singleton_->StartCollectingProfile(title);
252 } 252 }
253 253
254 254
255 CpuProfile* CpuProfiler::StopProfiling(const char* title) { 255 CpuProfile* CpuProfiler::StopProfiling(const char* title) {
256 return singleton_ != NULL ? singleton_->StopCollectingProfile(title) : NULL; 256 return is_profiling() ? singleton_->StopCollectingProfile(title) : NULL;
257 } 257 }
258 258
259 259
260 CpuProfile* CpuProfiler::StopProfiling(String* title) { 260 CpuProfile* CpuProfiler::StopProfiling(String* title) {
261 return singleton_ != NULL ? singleton_->StopCollectingProfile(title) : NULL; 261 return is_profiling() ? singleton_->StopCollectingProfile(title) : NULL;
262 } 262 }
263 263
264 264
265 int CpuProfiler::GetProfilesCount() { 265 int CpuProfiler::GetProfilesCount() {
266 ASSERT(singleton_ != NULL); 266 ASSERT(singleton_ != NULL);
267 return singleton_->profiles_->profiles()->length(); 267 return singleton_->profiles_->profiles()->length();
268 } 268 }
269 269
270 270
271 CpuProfile* CpuProfiler::GetProfile(int index) { 271 CpuProfile* CpuProfiler::GetProfile(int index) {
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 void CpuProfiler::TearDown() { 483 void CpuProfiler::TearDown() {
484 #ifdef ENABLE_LOGGING_AND_PROFILING 484 #ifdef ENABLE_LOGGING_AND_PROFILING
485 if (singleton_ != NULL) { 485 if (singleton_ != NULL) {
486 delete singleton_; 486 delete singleton_;
487 } 487 }
488 singleton_ = NULL; 488 singleton_ = NULL;
489 #endif 489 #endif
490 } 490 }
491 491
492 } } // namespace v8::internal 492 } } // namespace v8::internal
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