| OLD | NEW |
| 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 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 incremental_marking()->WorthActivating() && | 697 incremental_marking()->WorthActivating() && |
| 698 NextGCIsLikelyToBeFull()) { | 698 NextGCIsLikelyToBeFull()) { |
| 699 incremental_marking()->Start(); | 699 incremental_marking()->Start(); |
| 700 } | 700 } |
| 701 | 701 |
| 702 return next_gc_likely_to_collect_more; | 702 return next_gc_likely_to_collect_more; |
| 703 } | 703 } |
| 704 | 704 |
| 705 | 705 |
| 706 int Heap::NotifyContextDisposed() { | 706 int Heap::NotifyContextDisposed() { |
| 707 if (FLAG_parallel_recompilation) { | 707 if (FLAG_concurrent_recompilation) { |
| 708 // Flush the queued recompilation tasks. | 708 // Flush the queued recompilation tasks. |
| 709 isolate()->optimizing_compiler_thread()->Flush(); | 709 isolate()->optimizing_compiler_thread()->Flush(); |
| 710 } | 710 } |
| 711 flush_monomorphic_ics_ = true; | 711 flush_monomorphic_ics_ = true; |
| 712 return ++contexts_disposed_; | 712 return ++contexts_disposed_; |
| 713 } | 713 } |
| 714 | 714 |
| 715 | 715 |
| 716 void Heap::PerformScavenge() { | 716 void Heap::PerformScavenge() { |
| 717 GCTracer tracer(this, NULL, NULL); | 717 GCTracer tracer(this, NULL, NULL); |
| (...skipping 6166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6884 } else { | 6884 } else { |
| 6885 set_hash_seed(Smi::FromInt(FLAG_hash_seed)); | 6885 set_hash_seed(Smi::FromInt(FLAG_hash_seed)); |
| 6886 } | 6886 } |
| 6887 } | 6887 } |
| 6888 | 6888 |
| 6889 LOG(isolate_, IntPtrTEvent("heap-capacity", Capacity())); | 6889 LOG(isolate_, IntPtrTEvent("heap-capacity", Capacity())); |
| 6890 LOG(isolate_, IntPtrTEvent("heap-available", Available())); | 6890 LOG(isolate_, IntPtrTEvent("heap-available", Available())); |
| 6891 | 6891 |
| 6892 store_buffer()->SetUp(); | 6892 store_buffer()->SetUp(); |
| 6893 | 6893 |
| 6894 if (FLAG_parallel_recompilation) relocation_mutex_ = OS::CreateMutex(); | 6894 if (FLAG_concurrent_recompilation) relocation_mutex_ = OS::CreateMutex(); |
| 6895 #ifdef DEBUG | 6895 #ifdef DEBUG |
| 6896 relocation_mutex_locked_by_optimizer_thread_ = false; | 6896 relocation_mutex_locked_by_optimizer_thread_ = false; |
| 6897 #endif // DEBUG | 6897 #endif // DEBUG |
| 6898 | 6898 |
| 6899 return true; | 6899 return true; |
| 6900 } | 6900 } |
| 6901 | 6901 |
| 6902 | 6902 |
| 6903 bool Heap::CreateHeapObjects() { | 6903 bool Heap::CreateHeapObjects() { |
| 6904 // Create initial maps. | 6904 // Create initial maps. |
| (...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8035 FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(ADJUST_LAST_TIME_OBJECT_COUNT) | 8035 FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(ADJUST_LAST_TIME_OBJECT_COUNT) |
| 8036 #undef ADJUST_LAST_TIME_OBJECT_COUNT | 8036 #undef ADJUST_LAST_TIME_OBJECT_COUNT |
| 8037 | 8037 |
| 8038 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); | 8038 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); |
| 8039 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); | 8039 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); |
| 8040 ClearObjectStats(); | 8040 ClearObjectStats(); |
| 8041 } | 8041 } |
| 8042 | 8042 |
| 8043 | 8043 |
| 8044 Heap::RelocationLock::RelocationLock(Heap* heap) : heap_(heap) { | 8044 Heap::RelocationLock::RelocationLock(Heap* heap) : heap_(heap) { |
| 8045 if (FLAG_parallel_recompilation) { | 8045 if (FLAG_concurrent_recompilation) { |
| 8046 heap_->relocation_mutex_->Lock(); | 8046 heap_->relocation_mutex_->Lock(); |
| 8047 #ifdef DEBUG | 8047 #ifdef DEBUG |
| 8048 heap_->relocation_mutex_locked_by_optimizer_thread_ = | 8048 heap_->relocation_mutex_locked_by_optimizer_thread_ = |
| 8049 heap_->isolate()->optimizing_compiler_thread()->IsOptimizerThread(); | 8049 heap_->isolate()->optimizing_compiler_thread()->IsOptimizerThread(); |
| 8050 #endif // DEBUG | 8050 #endif // DEBUG |
| 8051 } | 8051 } |
| 8052 } | 8052 } |
| 8053 | 8053 |
| 8054 } } // namespace v8::internal | 8054 } } // namespace v8::internal |
| OLD | NEW |