OLD | NEW |
1 // Copyright 2006-2011 the V8 project authors. All rights reserved. | 1 // Copyright 2006-2011 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 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
678 instance_->Start(); | 678 instance_->Start(); |
679 } else { | 679 } else { |
680 ASSERT(instance_->interval_ == sampler->interval()); | 680 ASSERT(instance_->interval_ == sampler->interval()); |
681 } | 681 } |
682 } | 682 } |
683 | 683 |
684 static void RemoveActiveSampler(Sampler* sampler) { | 684 static void RemoveActiveSampler(Sampler* sampler) { |
685 ScopedLock lock(mutex_); | 685 ScopedLock lock(mutex_); |
686 SamplerRegistry::RemoveActiveSampler(sampler); | 686 SamplerRegistry::RemoveActiveSampler(sampler); |
687 if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) { | 687 if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) { |
688 RuntimeProfiler::WakeUpRuntimeProfilerThreadBeforeShutdown(); | 688 RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_); |
689 instance_->Join(); | |
690 delete instance_; | 689 delete instance_; |
691 instance_ = NULL; | 690 instance_ = NULL; |
692 | 691 |
693 // Restore the old signal handler. | 692 // Restore the old signal handler. |
694 if (signal_handler_installed_) { | 693 if (signal_handler_installed_) { |
695 sigaction(SIGPROF, &old_signal_handler_, 0); | 694 sigaction(SIGPROF, &old_signal_handler_, 0); |
696 signal_handler_installed_ = false; | 695 signal_handler_installed_ = false; |
697 } | 696 } |
698 } | 697 } |
699 } | 698 } |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
815 | 814 |
816 void Sampler::Stop() { | 815 void Sampler::Stop() { |
817 ASSERT(IsActive()); | 816 ASSERT(IsActive()); |
818 SignalSender::RemoveActiveSampler(this); | 817 SignalSender::RemoveActiveSampler(this); |
819 SetActive(false); | 818 SetActive(false); |
820 } | 819 } |
821 | 820 |
822 #endif // ENABLE_LOGGING_AND_PROFILING | 821 #endif // ENABLE_LOGGING_AND_PROFILING |
823 | 822 |
824 } } // namespace v8::internal | 823 } } // namespace v8::internal |
OLD | NEW |