[Isolates] Merge 6700:7030 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 22 matching lines @@
 #include "bootstrapper.h"
 #include "codegen.h"
 #include "compilation-cache.h"
 #include "debug.h"
 #include "deoptimizer.h"
 #include "heap-profiler.h"
 #include "hydrogen.h"
 #include "isolate.h"
 #include "lithium-allocator.h"
 #include "log.h"
-#include "oprofile-agent.h"
 #include "regexp-stack.h"
 #include "runtime-profiler.h"
 #include "scanner.h"
 #include "scopeinfo.h"
 #include "serialize.h"
 #include "simulator.h"
 #include "spaces.h"
 #include "stub-cache.h"
 #include "version.h"
 
@@ skipping 378 matching lines @@
   if (state_ == INITIALIZED) {
     TRACE_ISOLATE(deinit);
 
     if (FLAG_time_hydrogen) HStatistics::Instance()->Print();
 
     // We must stop the logger before we tear down other components.
     logger_->EnsureTickerStopped();
 
     delete deoptimizer_data_;
     deoptimizer_data_ = NULL;
-    OProfileAgent::TearDown();
     if (FLAG_preemption) {
       v8::Locker locker;
       v8::Locker::StopPreemption();
     }
     builtins_.TearDown();
     bootstrapper_->TearDown();
 
     // Remove the external reference to the preallocated stack memory.
     delete preallocated_message_space_;
     preallocated_message_space_ = NULL;
@@ skipping 251 matching lines @@
 
   // Deserializing may put strange things in the root array's copy of the
   // 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;
   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 73 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