Rename "OptimizingCompiler" to the more suitable "RecompileJob".

src/optimizing-compiler-thread.cc

 // Copyright 2012 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 76 matching lines @@
     CompileNext();
 
     if (FLAG_trace_concurrent_recompilation) {
       time_spent_compiling_ += compiling_timer.Elapsed();
     }
   }
 }
 
 
 void OptimizingCompilerThread::CompileNext() {
-  OptimizingCompiler* optimizing_compiler = NULL;
-  bool result = input_queue_.Dequeue(&optimizing_compiler);
+  RecompileJob* job = NULL;
+  bool result = input_queue_.Dequeue(&job);
   USE(result);
   ASSERT(result);
   Barrier_AtomicIncrement(&queue_length_, static_cast<Atomic32>(-1));
 
   // The function may have already been optimized by OSR.  Simply continue.
-  OptimizingCompiler::Status status = optimizing_compiler->OptimizeGraph();
+  RecompileJob::Status status = job->OptimizeGraph();
   USE(status);   // Prevent an unused-variable error in release mode.
-  ASSERT(status != OptimizingCompiler::FAILED);
+  ASSERT(status != RecompileJob::FAILED);
 
   // The function may have already been optimized by OSR.  Simply continue.
   // Use a mutex to make sure that functions marked for install
   // are always also queued.
   LockGuard<Mutex> access_queue(&queue_mutex_);
-  output_queue_.Enqueue(optimizing_compiler);
+  output_queue_.Enqueue(job);
   isolate_->stack_guard()->RequestInstallCode();
 }
 
 
-static void DisposeOptimizingCompiler(OptimizingCompiler* compiler,
-                                      bool restore_function_code) {
+static void DisposeRecompileJob(RecompileJob* compiler,
+                                bool restore_function_code) {
   CompilationInfo* info = compiler->info();
   if (restore_function_code) {
     Handle<JSFunction> function = info->closure();
     function->ReplaceCode(function->shared()->code());
   }
   delete info;
 }
 
 
 void OptimizingCompilerThread::FlushInputQueue(bool restore_function_code) {
-  OptimizingCompiler* optimizing_compiler;
+  RecompileJob* job;
   // The optimizing compiler is allocated in the CompilationInfo's zone.

[mvstanton, 2013/09/25 09:22:25]

To // "The recompile job"

-  while (input_queue_.Dequeue(&optimizing_compiler)) {
+  while (input_queue_.Dequeue(&job)) {
     // This should not block, since we have one signal on the input queue
     // semaphore corresponding to each element in the input queue.
     input_queue_semaphore_.Wait();
-    if (optimizing_compiler->info()->osr_ast_id().IsNone()) {
+    if (job->info()->osr_ast_id().IsNone()) {
       // OSR jobs are dealt with separately.
-      DisposeOptimizingCompiler(optimizing_compiler, restore_function_code);
+      DisposeRecompileJob(job, restore_function_code);
     }
   }
   Release_Store(&queue_length_, static_cast<AtomicWord>(0));
 }
 
 
 void OptimizingCompilerThread::FlushOutputQueue(bool restore_function_code) {
-  OptimizingCompiler* optimizing_compiler;
+  RecompileJob* job;
   // The optimizing compiler is allocated in the CompilationInfo's zone.

[mvstanton, 2013/09/25 09:22:25]

Address this comment too.

   while (true) {
     { LockGuard<Mutex> access_queue(&queue_mutex_);
-      if (!output_queue_.Dequeue(&optimizing_compiler)) break;
+      if (!output_queue_.Dequeue(&job)) break;
     }
-    if (optimizing_compiler->info()->osr_ast_id().IsNone()) {
+    if (job->info()->osr_ast_id().IsNone()) {
       // OSR jobs are dealt with separately.
-      DisposeOptimizingCompiler(optimizing_compiler, restore_function_code);
+      DisposeRecompileJob(job, restore_function_code);
     }
   }
 }
 
 
 void OptimizingCompilerThread::FlushOsrBuffer(bool restore_function_code) {
-  OptimizingCompiler* optimizing_compiler;
+  RecompileJob* job;
   for (int i = 0; i < osr_buffer_size_; i++) {
-    optimizing_compiler = osr_buffer_[i];
-    if (optimizing_compiler != NULL) {
-      DisposeOptimizingCompiler(optimizing_compiler, restore_function_code);
-    }
+    job = osr_buffer_[i];
+    if (job != NULL) DisposeRecompileJob(job, restore_function_code);
   }
   osr_cursor_ = 0;
 }
 
 
 void OptimizingCompilerThread::Flush() {
   ASSERT(!IsOptimizerThread());
   Release_Store(&stop_thread_, static_cast<AtomicWord>(FLUSH));
   input_queue_semaphore_.Signal();
   stop_semaphore_.Wait();
@@ skipping 32 matching lines @@
   }
 
   Join();
 }
 
 
 void OptimizingCompilerThread::InstallOptimizedFunctions() {
   ASSERT(!IsOptimizerThread());
   HandleScope handle_scope(isolate_);
 
-  OptimizingCompiler* compiler;
+  RecompileJob* job;
   while (true) {
     { LockGuard<Mutex> access_queue(&queue_mutex_);
-      if (!output_queue_.Dequeue(&compiler)) break;
+      if (!output_queue_.Dequeue(&job)) break;
     }
-    CompilationInfo* info = compiler->info();
+    CompilationInfo* info = job->info();
     if (info->osr_ast_id().IsNone()) {
-      Compiler::InstallOptimizedCode(compiler);
+      Compiler::InstallOptimizedCode(job);
     } else {
       if (FLAG_trace_osr) {
         PrintF("[COSR - ");
         info->closure()->PrintName();
         PrintF(" is ready for install and entry at AST id %d]\n",
                info->osr_ast_id().ToInt());
       }
-      compiler->WaitForInstall();
+      job->WaitForInstall();
       BackEdgeTable::RemoveStackCheck(info);
     }
   }
 }
 
 
-void OptimizingCompilerThread::QueueForOptimization(
-    OptimizingCompiler* optimizing_compiler) {
+void OptimizingCompilerThread::QueueForOptimization(RecompileJob* job) {
   ASSERT(IsQueueAvailable());
   ASSERT(!IsOptimizerThread());
   Barrier_AtomicIncrement(&queue_length_, static_cast<Atomic32>(1));
-  CompilationInfo* info = optimizing_compiler->info();
+  CompilationInfo* info = job->info();
   if (info->osr_ast_id().IsNone()) {
     info->closure()->MarkInRecompileQueue();
   } else {
     if (FLAG_trace_concurrent_recompilation) {
       PrintF("  ** Queueing ");
       info->closure()->PrintName();
       PrintF(" for concurrent on-stack replacement.\n");
     }
-    AddToOsrBuffer(optimizing_compiler);
+    AddToOsrBuffer(job);
     osr_attempts_++;
     BackEdgeTable::AddStackCheck(info);
   }
-  input_queue_.Enqueue(optimizing_compiler);
+  input_queue_.Enqueue(job);
   input_queue_semaphore_.Signal();
 }
 
 
-OptimizingCompiler* OptimizingCompilerThread::FindReadyOSRCandidate(
+RecompileJob* OptimizingCompilerThread::FindReadyOSRCandidate(
     Handle<JSFunction> function, uint32_t osr_pc_offset) {
   ASSERT(!IsOptimizerThread());
-  OptimizingCompiler* result = NULL;
+  RecompileJob* result = NULL;
   for (int i = 0; i < osr_buffer_size_; i++) {
     result = osr_buffer_[i];
     if (result == NULL) continue;
     if (result->IsWaitingForInstall() &&
         result->info()->HasSameOsrEntry(function, osr_pc_offset)) {
       osr_hits_++;
       osr_buffer_[i] = NULL;
       return result;
     }
   }
@@ skipping 19 matching lines @@
   for (int i = 0; i < osr_buffer_size_; i++) {
     if (osr_buffer_[i] != NULL &&
         *osr_buffer_[i]->info()->closure() == function) {
       return !osr_buffer_[i]->IsWaitingForInstall();
     }
   }
   return false;
 }
 
 
-void OptimizingCompilerThread::AddToOsrBuffer(OptimizingCompiler* compiler) {
+void OptimizingCompilerThread::AddToOsrBuffer(RecompileJob* job) {
   ASSERT(!IsOptimizerThread());
   // Store into next empty slot or replace next stale OSR job that's waiting
   // in vain.  Dispose in the latter case.
-  OptimizingCompiler* stale;
+  RecompileJob* stale;
   while (true) {
     stale = osr_buffer_[osr_cursor_];
     if (stale == NULL) break;
     if (stale->IsWaitingForInstall()) {
       CompilationInfo* info = stale->info();
       if (FLAG_trace_osr) {
         PrintF("[COSR - Discarded ");
         info->closure()->PrintName();
         PrintF(", AST id %d]\n", info->osr_ast_id().ToInt());
       }
       BackEdgeTable::RemoveStackCheck(info);
-      DisposeOptimizingCompiler(stale, false);
+      DisposeRecompileJob(stale, false);
       break;
     }
     AdvanceOsrCursor();
   }
 
-  osr_buffer_[osr_cursor_] = compiler;
+  osr_buffer_[osr_cursor_] = job;
   AdvanceOsrCursor();
 }
 
 
 #ifdef DEBUG
 bool OptimizingCompilerThread::IsOptimizerThread() {
   if (!FLAG_concurrent_recompilation) return false;
   LockGuard<Mutex> lock_guard(&thread_id_mutex_);
   return ThreadId::Current().ToInteger() == thread_id_;
 }
 #endif
 
 
 } }  // namespace v8::internal