[Isolates] Merge 6500:6700 from bleeding_edge to isolates.

src/isolate.cc

 // Copyright 2006-2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 159 matching lines @@
 
 
 Isolate* Isolate::default_isolate_ = NULL;
 Thread::LocalStorageKey Isolate::isolate_key_;
 Thread::LocalStorageKey Isolate::thread_id_key_;
 Thread::LocalStorageKey Isolate::per_isolate_thread_data_key_;
 Mutex* Isolate::process_wide_mutex_ = OS::CreateMutex();
 Isolate::ThreadDataTable* Isolate::thread_data_table_ = NULL;
 Isolate::ThreadId Isolate::highest_thread_id_ = 0;
 
+void Isolate::RunStaticInitializers() {
+  LAllocator::Setup();
+}
+
 class IsolateInitializer {
  public:
   IsolateInitializer() {
     Isolate::EnsureDefaultIsolate();
+    Isolate::RunStaticInitializers();

[Vitaly Repeshko, 2011/03/02 18:27:27]

Consider doing this before the default isolate is pre-inited.

   }
 };
 
 static IsolateInitializer* EnsureDefaultIsolateAllocated() {
   // TODO(isolates): Use the system threading API to do this once?
   static IsolateInitializer static_initializer;
   return &static_initializer;
 }
 
 // This variable only needed to trigger static intialization.
@@ skipping 511 matching lines @@
   // stack guard.
   heap_.SetStackLimits();
 
   // Setup the CPU support. Must be done after heap setup and after
   // any deserialization because we have to have the initial heap
   // objects in place for creating the code object used for probing.
   CPU::Setup();
 
   OProfileAgent::Initialize();
   deoptimizer_data_ = new DeoptimizerData;
-  LAllocator::Setup();
   runtime_profiler_ = new RuntimeProfiler(this);
   runtime_profiler_->Setup();
 
   // If we are deserializing, log non-function code objects and compiled
   // functions found in the snapshot.
   if (des != NULL && FLAG_log_code) {
     HandleScope scope;
     LOG(LogCodeObjects());
     LOG(LogCompiledFunctions());
   }
@@ skipping 72 matching lines @@
   // Reinit the current thread for the isolate it was running before this one.
   SetIsolateThreadLocals(previous_isolate, previous_thread_data);
 }
 
 
 void Isolate::ResetEagerOptimizingData() {
   compilation_cache_->ResetEagerOptimizingData();
 }
 
 } }  // namespace v8::internal