Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(710)

Side by Side Diff: src/v8.cc

Issue 64543004: Disable concurrent osr when concurrent recompilation is disabled. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: git cl dcommit Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/optimizing-compiler-thread.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 FlagList::EnforceFlagImplications(); 199 FlagList::EnforceFlagImplications();
200 if (FLAG_stress_compaction) { 200 if (FLAG_stress_compaction) {
201 FLAG_force_marking_deque_overflows = true; 201 FLAG_force_marking_deque_overflows = true;
202 FLAG_gc_global = true; 202 FLAG_gc_global = true;
203 FLAG_max_new_space_size = (1 << (kPageSizeBits - 10)) * 2; 203 FLAG_max_new_space_size = (1 << (kPageSizeBits - 10)) * 2;
204 } 204 }
205 205
206 if (FLAG_concurrent_recompilation && 206 if (FLAG_concurrent_recompilation &&
207 (FLAG_trace_hydrogen || FLAG_trace_hydrogen_stubs)) { 207 (FLAG_trace_hydrogen || FLAG_trace_hydrogen_stubs)) {
208 FLAG_concurrent_recompilation = false; 208 FLAG_concurrent_recompilation = false;
209 FLAG_concurrent_osr = false;
209 PrintF("Concurrent recompilation has been disabled for tracing.\n"); 210 PrintF("Concurrent recompilation has been disabled for tracing.\n");
210 } 211 }
211 212
212 if (FLAG_sweeper_threads <= 0) { 213 if (FLAG_sweeper_threads <= 0) {
213 if (FLAG_concurrent_sweeping) { 214 if (FLAG_concurrent_sweeping) {
214 FLAG_sweeper_threads = SystemThreadManager:: 215 FLAG_sweeper_threads = SystemThreadManager::
215 NumberOfParallelSystemThreads( 216 NumberOfParallelSystemThreads(
216 SystemThreadManager::CONCURRENT_SWEEPING); 217 SystemThreadManager::CONCURRENT_SWEEPING);
217 } else if (FLAG_parallel_sweeping) { 218 } else if (FLAG_parallel_sweeping) {
218 FLAG_sweeper_threads = SystemThreadManager:: 219 FLAG_sweeper_threads = SystemThreadManager::
219 NumberOfParallelSystemThreads( 220 NumberOfParallelSystemThreads(
220 SystemThreadManager::PARALLEL_SWEEPING); 221 SystemThreadManager::PARALLEL_SWEEPING);
221 } 222 }
222 if (FLAG_sweeper_threads == 0) { 223 if (FLAG_sweeper_threads == 0) {
223 FLAG_concurrent_sweeping = false; 224 FLAG_concurrent_sweeping = false;
224 FLAG_parallel_sweeping = false; 225 FLAG_parallel_sweeping = false;
225 } 226 }
226 } else if (!FLAG_concurrent_sweeping && !FLAG_parallel_sweeping) { 227 } else if (!FLAG_concurrent_sweeping && !FLAG_parallel_sweeping) {
227 FLAG_sweeper_threads = 0; 228 FLAG_sweeper_threads = 0;
228 } 229 }
229 230
230 if (FLAG_concurrent_recompilation && 231 if (FLAG_concurrent_recompilation &&
231 SystemThreadManager::NumberOfParallelSystemThreads( 232 SystemThreadManager::NumberOfParallelSystemThreads(
232 SystemThreadManager::PARALLEL_RECOMPILATION) == 0) { 233 SystemThreadManager::CONCURRENT_RECOMPILATION) == 0) {
233 FLAG_concurrent_recompilation = false; 234 FLAG_concurrent_recompilation = false;
235 FLAG_concurrent_osr = false;
234 } 236 }
235 237
236 Sampler::SetUp(); 238 Sampler::SetUp();
237 CPU::SetUp(); 239 CPU::SetUp();
238 OS::PostSetUp(); 240 OS::PostSetUp();
239 ElementsAccessor::InitializeOncePerProcess(); 241 ElementsAccessor::InitializeOncePerProcess();
240 LOperand::SetUpCaches(); 242 LOperand::SetUpCaches();
241 SetUpJSCallerSavedCodeData(); 243 SetUpJSCallerSavedCodeData();
242 ExternalReference::SetUp(); 244 ExternalReference::SetUp();
243 Bootstrapper::InitializeOncePerProcess(); 245 Bootstrapper::InitializeOncePerProcess();
244 } 246 }
245 247
246 248
247 void V8::InitializeOncePerProcess() { 249 void V8::InitializeOncePerProcess() {
248 CallOnce(&init_once, &InitializeOncePerProcessImpl); 250 CallOnce(&init_once, &InitializeOncePerProcessImpl);
249 } 251 }
250 252
251 } } // namespace v8::internal 253 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/optimizing-compiler-thread.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698