AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm] Merge ScheduleCodeLogging into OnFinishedUnit

Browse Source 
They happen right after each other anyway. Merging them saves one mutex
scope.

R=ahaas@chromium.org

Change-Id: Id3ed564e6f7d8dce78022e6ded238d41c6beb333
Reviewed-on: https://chromium-review.googlesource.com/c/1405858
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58772}
This commit is contained in:
Clemens Hammacher 2019-01-11 10:38:41 +01:00 committed by Commit Bot
parent 9034437b1b
commit 5e87da67d1
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wasm/module-compiler.cc
View File

@ -87,8 +87,7 @@ class CompilationStateImpl {
bool HasCompilationUnitToFinish();
void OnFinishedUnit(ExecutionTier);
void ScheduleCodeLogging(WasmCode*);
void OnFinishedUnit(ExecutionTier, WasmCode*);
void OnBackgroundTaskStopped(const WasmFeatures& detected);
void PublishDetectedFeatures(Isolate* isolate, const WasmFeatures& detected);
@ -700,10 +699,7 @@ bool FetchAndExecuteCompilationUnit(CompilationEnv* env,
ExecutionTier tier = unit->tier();
unit->ExecuteCompilation(env, compilation_state->GetSharedWireBytesStorage(),
counters, detected);
if (WasmCode* result = unit->result()) {
compilation_state->ScheduleCodeLogging(result);
}
compilation_state->OnFinishedUnit(tier);
compilation_state->OnFinishedUnit(tier, unit->result());
return true;
}
@ -3167,7 +3163,7 @@ bool CompilationStateImpl::HasCompilationUnitToFinish() {
return !finish_units().empty();
}
void CompilationStateImpl::OnFinishedUnit(ExecutionTier tier) {
void CompilationStateImpl::OnFinishedUnit(ExecutionTier tier, WasmCode* code) {
// This mutex guarantees that events happen in the right order.
base::MutexGuard guard(&mutex_);
@ -3220,18 +3216,16 @@ void CompilationStateImpl::OnFinishedUnit(ExecutionTier tier) {
foreground_task_runner_->PostTask(
MakeCancelableTask(&foreground_task_manager_, notify_events));
}
}
void CompilationStateImpl::ScheduleCodeLogging(WasmCode* code) {
if (!should_log_code_) return;
base::MutexGuard guard(&mutex_);
if (log_codes_task_ == nullptr) {
auto new_task = base::make_unique<LogCodesTask>(&foreground_task_manager_,
this, isolate_);
log_codes_task_ = new_task.get();
foreground_task_runner_->PostTask(std::move(new_task));
if (should_log_code_ && code != nullptr) {
if (log_codes_task_ == nullptr) {
auto new_task = base::make_unique<LogCodesTask>(&foreground_task_manager_,
this, isolate_);
log_codes_task_ = new_task.get();
foreground_task_runner_->PostTask(std::move(new_task));
}
log_codes_task_->AddCode(code);
}
log_codes_task_->AddCode(code);
}
void CompilationStateImpl::OnBackgroundTaskStopped(