Browse Source

Patch V8 to compile on solaris

v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
c9d3a81db0
  1. 49
      deps/v8/src/platform-solaris.cc
  2. 1
      deps/v8/src/v8utils.h
  3. 3
      wscript

49
deps/v8/src/platform-solaris.cc

@ -45,6 +45,7 @@
#include <errno.h> #include <errno.h>
#include <ieeefp.h> // finite() #include <ieeefp.h> // finite()
#include <signal.h> // sigemptyset(), etc #include <signal.h> // sigemptyset(), etc
#include <sys/kdi_regs.h>
#undef MAP_TYPE #undef MAP_TYPE
@ -481,6 +482,16 @@ class SolarisMutex : public Mutex {
int Unlock() { return pthread_mutex_unlock(&mutex_); } int Unlock() { return pthread_mutex_unlock(&mutex_); }
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: private:
pthread_mutex_t mutex_; pthread_mutex_t mutex_;
}; };
@ -572,21 +583,37 @@ Semaphore* OS::CreateSemaphore(int count) {
#ifdef ENABLE_LOGGING_AND_PROFILING #ifdef ENABLE_LOGGING_AND_PROFILING
static Sampler* active_sampler_ = NULL; static Sampler* active_sampler_ = NULL;
static pthread_t vm_tid_ = 0;
static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
USE(info); USE(info);
if (signal != SIGPROF) return; if (signal != SIGPROF) return;
if (active_sampler_ == NULL) return; if (active_sampler_ == NULL || !active_sampler_->IsActive()) return;
if (vm_tid_ != pthread_self()) return;
TickSample sample;
sample.pc = 0; TickSample sample_obj;
sample.sp = 0; TickSample* sample = CpuProfiler::TickSampleEvent();
sample.fp = 0; if (sample == NULL) sample = &sample_obj;
// We always sample the VM state. // Extracting the sample from the context is extremely machine dependent.
sample.state = VMState::current_state(); ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
mcontext_t& mcontext = ucontext->uc_mcontext;
active_sampler_->Tick(&sample); sample->state = Top::current_vm_state();
#if V8_HOST_ARCH_IA32
sample->pc = reinterpret_cast<Address>(mcontext.gregs[KDIREG_EIP]);
sample->sp = reinterpret_cast<Address>(mcontext.gregs[KDIREG_ESP]);
sample->fp = reinterpret_cast<Address>(mcontext.gregs[KDIREG_EBP]);
#elif V8_HOST_ARCH_X64
sample->pc = reinterpret_cast<Address>(mcontext.gregs[KDIREG_RIP]);
sample->sp = reinterpret_cast<Address>(mcontext.gregs[KDIREG_RSP]);
sample->fp = reinterpret_cast<Address>(mcontext.gregs[KDIREG_RBP]);
#else
UNIMPLEMENTED();
#endif
active_sampler_->SampleStack(sample);
active_sampler_->Tick(sample);
} }

1
deps/v8/src/v8utils.h

@ -29,6 +29,7 @@
#define V8_V8UTILS_H_ #define V8_V8UTILS_H_
#include "utils.h" #include "utils.h"
#include <stdarg.h>
namespace v8 { namespace v8 {
namespace internal { namespace internal {

3
wscript

@ -178,7 +178,8 @@ def configure(conf):
o = Options.options o = Options.options
conf.env["USE_DEBUG"] = o.debug conf.env["USE_DEBUG"] = o.debug
conf.env["SNAPSHOT_V8"] = not o.without_snapshot if sys.platform.startswith("sunos"):
conf.env["SNAPSHOT_V8"] = False
conf.env["USE_PROFILING"] = o.profile conf.env["USE_PROFILING"] = o.profile
conf.env["USE_SHARED_V8"] = o.shared_v8 or o.shared_v8_includes or o.shared_v8_libpath or o.shared_v8_libname conf.env["USE_SHARED_V8"] = o.shared_v8 or o.shared_v8_includes or o.shared_v8_libpath or o.shared_v8_libname

Loading…
Cancel
Save