summaryrefslogtreecommitdiff
path: root/deps/v8/src/platform-freebsd.cc
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2010-12-17 09:29:19 -0800
committerRyan Dahl <ry@tinyclouds.org>2010-12-17 09:47:55 -0800
commit7d425a0a160e65b357ed1ad8b35dc01855b5f479 (patch)
tree5d1c940b27eeea7bbe420361e667ad7304b84a33 /deps/v8/src/platform-freebsd.cc
parent9eaf2329e7d1e7c2de20ab7e4461bf55b18595c2 (diff)
downloadnode-new-7d425a0a160e65b357ed1ad8b35dc01855b5f479.tar.gz
Upgrade V8 to 3.0.3
Diffstat (limited to 'deps/v8/src/platform-freebsd.cc')
-rw-r--r--deps/v8/src/platform-freebsd.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/deps/v8/src/platform-freebsd.cc b/deps/v8/src/platform-freebsd.cc
index 3c454d4c3a..b58d0662fb 100644
--- a/deps/v8/src/platform-freebsd.cc
+++ b/deps/v8/src/platform-freebsd.cc
@@ -500,16 +500,6 @@ class FreeBSDMutex : public Mutex {
return result;
}
- virtual bool TryLock() {
- int result = pthread_mutex_trylock(&mutex_);
- // Return false if the lock is busy and locking failed.
- if (result == EBUSY) {
- return false;
- }
- ASSERT(result == 0); // Verify no other errors.
- return true;
- }
-
private:
pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms.
};
@@ -587,12 +577,14 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
TickSample sample;
+ // We always sample the VM state.
+ sample.state = VMState::current_state();
+
// If profiling, we extract the current pc and sp.
if (active_sampler_->IsProfiling()) {
// Extracting the sample from the context is extremely machine dependent.
ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
mcontext_t& mcontext = ucontext->uc_mcontext;
- sample.state = Top::current_vm_state();
#if V8_HOST_ARCH_IA32
sample.pc = reinterpret_cast<Address>(mcontext.mc_eip);
sample.sp = reinterpret_cast<Address>(mcontext.mc_esp);