Index: src/platform-solaris.cc |
=================================================================== |
--- src/platform-solaris.cc (revision 11005) |
+++ src/platform-solaris.cc (working copy) |
@@ -733,7 +733,7 @@ |
} |
static void AddActiveSampler(Sampler* sampler) { |
- ScopedLock lock(mutex_); |
+ ScopedLock lock(mutex_.Pointer()); |
SamplerRegistry::AddActiveSampler(sampler); |
if (instance_ == NULL) { |
// Start a thread that will send SIGPROF signal to VM threads, |
@@ -746,7 +746,7 @@ |
} |
static void RemoveActiveSampler(Sampler* sampler) { |
- ScopedLock lock(mutex_); |
+ ScopedLock lock(mutex_.Pointer()); |
SamplerRegistry::RemoveActiveSampler(sampler); |
if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) { |
RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_); |
@@ -840,7 +840,7 @@ |
RuntimeProfilerRateLimiter rate_limiter_; |
// Protects the process wide state below. |
- static Mutex* mutex_; |
+ static LazyMutex mutex_; |
static SignalSender* instance_; |
static bool signal_handler_installed_; |
static struct sigaction old_signal_handler_; |
@@ -849,7 +849,7 @@ |
DISALLOW_COPY_AND_ASSIGN(SignalSender); |
}; |
-Mutex* SignalSender::mutex_ = OS::CreateMutex(); |
+LazyMutex SignalSender::mutex_ = LAZY_MUTEX_INITIALIZER; |
SignalSender* SignalSender::instance_ = NULL; |
struct sigaction SignalSender::old_signal_handler_; |
bool SignalSender::signal_handler_installed_ = false; |