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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/class_table.cc

Issue 2974233002: VM: Re-format to use at most one newline between functions (Closed)
Patch Set: Rebase and merge Created 3 years, 5 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/class_finalizer_test.cc ('k') | runtime/vm/clustered_snapshot.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/class_table.cc
diff --git a/runtime/vm/class_table.cc b/runtime/vm/class_table.cc
index b71efb7c5d621feee0f4db87639df32b597bd3af..0bf1d1a02f4b62a2d63186b76887a8fefd161b42 100644
--- a/runtime/vm/class_table.cc
+++ b/runtime/vm/class_table.cc
@@ -59,7 +59,6 @@ ClassTable::ClassTable()
#endif // !PRODUCT
}
-
ClassTable::ClassTable(ClassTable* original)
: top_(original->top_),
capacity_(original->top_),
@@ -69,7 +68,6 @@ ClassTable::ClassTable(ClassTable* original)
NOT_IN_PRODUCT(predefined_class_heap_stats_table_ = NULL);
}
-
ClassTable::~ClassTable() {
if (old_tables_ != NULL) {
FreeOldTables();
@@ -84,34 +82,29 @@ ClassTable::~ClassTable() {
}
}
-
void ClassTable::AddOldTable(RawClass** old_table) {
ASSERT(Thread::Current()->IsMutatorThread());
old_tables_->Add(old_table);
}
-
void ClassTable::FreeOldTables() {
while (old_tables_->length() > 0) {
free(old_tables_->RemoveLast());
}
}
-
#ifndef PRODUCT
void ClassTable::SetTraceAllocationFor(intptr_t cid, bool trace) {
ClassHeapStats* stats = PreliminaryStatsAt(cid);
stats->set_trace_allocation(trace);
}
-
bool ClassTable::TraceAllocationFor(intptr_t cid) {
ClassHeapStats* stats = PreliminaryStatsAt(cid);
return stats->trace_allocation();
}
#endif // !PRODUCT
-
void ClassTable::Register(const Class& cls) {
ASSERT(Thread::Current()->IsMutatorThread());
intptr_t index = cls.id();
@@ -162,7 +155,6 @@ void ClassTable::Register(const Class& cls) {
}
}
-
void ClassTable::AllocateIndex(intptr_t index) {
if (index >= capacity_) {
// Grow the capacity of the class table.
@@ -197,7 +189,6 @@ void ClassTable::AllocateIndex(intptr_t index) {
}
}
-
void ClassTable::RegisterAt(intptr_t index, const Class& cls) {
ASSERT(Thread::Current()->IsMutatorThread());
ASSERT(index != kIllegalCid);
@@ -207,14 +198,12 @@ void ClassTable::RegisterAt(intptr_t index, const Class& cls) {
table_[index] = cls.raw();
}
-
#if defined(DEBUG)
void ClassTable::Unregister(intptr_t index) {
table_[index] = 0;
}
#endif
-
void ClassTable::Remap(intptr_t* old_to_new_cid) {
ASSERT(Thread::Current()->no_safepoint_scope_depth() > 0);
intptr_t num_cids = NumCids();
@@ -228,13 +217,11 @@ void ClassTable::Remap(intptr_t* old_to_new_cid) {
delete[] cls_by_old_cid;
}
-
void ClassTable::VisitObjectPointers(ObjectPointerVisitor* visitor) {
ASSERT(visitor != NULL);
visitor->VisitPointers(reinterpret_cast<RawObject**>(&table_[0]), top_);
}
-
void ClassTable::Validate() {
Class& cls = Class::Handle();
for (intptr_t cid = kNumPredefinedCids; cid < top_; cid++) {
@@ -253,7 +240,6 @@ void ClassTable::Validate() {
}
}
-
void ClassTable::Print() {
Class& cls = Class::Handle();
String& name = String::Handle();
@@ -270,7 +256,6 @@ void ClassTable::Print() {
}
}
-
#ifndef PRODUCT
void ClassTable::PrintToJSONObject(JSONObject* object) {
if (!FLAG_support_service) {
@@ -289,7 +274,6 @@ void ClassTable::PrintToJSONObject(JSONObject* object) {
}
}
-
void ClassHeapStats::Initialize() {
pre_gc.Reset();
post_gc.Reset();
@@ -302,7 +286,6 @@ void ClassHeapStats::Initialize() {
USE(align_);
}
-
void ClassHeapStats::ResetAtNewGC() {
Verify();
pre_gc.new_count = post_gc.new_count + recent.new_count;
@@ -317,7 +300,6 @@ void ClassHeapStats::ResetAtNewGC() {
old_pre_new_gc_size_ = recent.old_size;
}
-
void ClassHeapStats::ResetAtOldGC() {
Verify();
pre_gc.old_count = post_gc.old_count + recent.old_count;
@@ -330,7 +312,6 @@ void ClassHeapStats::ResetAtOldGC() {
recent.ResetOld();
}
-
void ClassHeapStats::Verify() {
pre_gc.Verify();
post_gc.Verify();
@@ -339,7 +320,6 @@ void ClassHeapStats::Verify() {
last_reset.Verify();
}
-
void ClassHeapStats::UpdateSize(intptr_t instance_size) {
pre_gc.UpdateSize(instance_size);
post_gc.UpdateSize(instance_size);
@@ -350,7 +330,6 @@ void ClassHeapStats::UpdateSize(intptr_t instance_size) {
old_pre_new_gc_size_ = old_pre_new_gc_count_ * instance_size;
}
-
void ClassHeapStats::ResetAccumulator() {
// Remember how much was allocated so we can subtract this from the result
// when printing.
@@ -361,13 +340,11 @@ void ClassHeapStats::ResetAccumulator() {
accumulated.Reset();
}
-
void ClassHeapStats::UpdatePromotedAfterNewGC() {
promoted_count = recent.old_count - old_pre_new_gc_count_;
promoted_size = recent.old_size - old_pre_new_gc_size_;
}
-
void ClassHeapStats::PrintToJSONObject(const Class& cls,
JSONObject* obj) const {
if (!FLAG_support_service) {
@@ -405,7 +382,6 @@ void ClassHeapStats::PrintToJSONObject(const Class& cls,
obj->AddProperty("promotedBytes", promoted_size);
}
-
void ClassTable::UpdateAllocatedNew(intptr_t cid, intptr_t size) {
ClassHeapStats* stats = PreliminaryStatsAt(cid);
ASSERT(stats != NULL);
@@ -413,7 +389,6 @@ void ClassTable::UpdateAllocatedNew(intptr_t cid, intptr_t size) {
stats->recent.AddNew(size);
}
-
void ClassTable::UpdateAllocatedOld(intptr_t cid, intptr_t size) {
ClassHeapStats* stats = PreliminaryStatsAt(cid);
ASSERT(stats != NULL);
@@ -421,12 +396,10 @@ void ClassTable::UpdateAllocatedOld(intptr_t cid, intptr_t size) {
stats->recent.AddOld(size);
}
-
bool ClassTable::ShouldUpdateSizeForClassId(intptr_t cid) {
return !RawObject::IsVariableSizeClassId(cid);
}
-
ClassHeapStats* ClassTable::PreliminaryStatsAt(intptr_t cid) {
ASSERT(cid > 0);
if (cid < kNumPredefinedCids) {
@@ -436,7 +409,6 @@ ClassHeapStats* ClassTable::PreliminaryStatsAt(intptr_t cid) {
return &class_heap_stats_table_[cid];
}
-
ClassHeapStats* ClassTable::StatsWithUpdatedSize(intptr_t cid) {
if (!HasValidClassAt(cid) || (cid == kFreeListElement) ||
(cid == kForwardingCorpse) || (cid == kSmiCid)) {
@@ -455,7 +427,6 @@ ClassHeapStats* ClassTable::StatsWithUpdatedSize(intptr_t cid) {
return stats;
}
-
void ClassTable::ResetCountersOld() {
for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
predefined_class_heap_stats_table_[i].ResetAtOldGC();
@@ -465,7 +436,6 @@ void ClassTable::ResetCountersOld() {
}
}
-
void ClassTable::ResetCountersNew() {
for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
predefined_class_heap_stats_table_[i].ResetAtNewGC();
@@ -475,7 +445,6 @@ void ClassTable::ResetCountersNew() {
}
}
-
void ClassTable::UpdatePromoted() {
for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
predefined_class_heap_stats_table_[i].UpdatePromotedAfterNewGC();
@@ -485,25 +454,21 @@ void ClassTable::UpdatePromoted() {
}
}
-
ClassHeapStats** ClassTable::TableAddressFor(intptr_t cid) {
return (cid < kNumPredefinedCids) ? &predefined_class_heap_stats_table_
: &class_heap_stats_table_;
}
-
intptr_t ClassTable::TableOffsetFor(intptr_t cid) {
return (cid < kNumPredefinedCids)
? OFFSET_OF(ClassTable, predefined_class_heap_stats_table_)
: OFFSET_OF(ClassTable, class_heap_stats_table_);
}
-
intptr_t ClassTable::ClassOffsetFor(intptr_t cid) {
return cid * sizeof(ClassHeapStats); // NOLINT
}
-
intptr_t ClassTable::CounterOffsetFor(intptr_t cid, bool is_new_space) {
const intptr_t class_offset = ClassOffsetFor(cid);
const intptr_t count_field_offset =
@@ -512,12 +477,10 @@ intptr_t ClassTable::CounterOffsetFor(intptr_t cid, bool is_new_space) {
return class_offset + count_field_offset;
}
-
intptr_t ClassTable::StateOffsetFor(intptr_t cid) {
return ClassOffsetFor(cid) + ClassHeapStats::state_offset();
}
-
intptr_t ClassTable::SizeOffsetFor(intptr_t cid, bool is_new_space) {
const uword class_offset = ClassOffsetFor(cid);
const uword size_field_offset =
@@ -526,7 +489,6 @@ intptr_t ClassTable::SizeOffsetFor(intptr_t cid, bool is_new_space) {
return class_offset + size_field_offset;
}
-
void ClassTable::AllocationProfilePrintJSON(JSONStream* stream) {
if (!FLAG_support_service) {
return;
@@ -566,7 +528,6 @@ void ClassTable::AllocationProfilePrintJSON(JSONStream* stream) {
}
}
-
void ClassTable::ResetAllocationAccumulators() {
for (intptr_t i = 1; i < top_; i++) {
ClassHeapStats* stats = StatsWithUpdatedSize(i);
@@ -576,7 +537,6 @@ void ClassTable::ResetAllocationAccumulators() {
}
}
-
void ClassTable::UpdateLiveOld(intptr_t cid, intptr_t size, intptr_t count) {
ClassHeapStats* stats = PreliminaryStatsAt(cid);
ASSERT(stats != NULL);
@@ -585,7 +545,6 @@ void ClassTable::UpdateLiveOld(intptr_t cid, intptr_t size, intptr_t count) {
stats->post_gc.AddOld(size, count);
}
-
void ClassTable::UpdateLiveNew(intptr_t cid, intptr_t size) {
ClassHeapStats* stats = PreliminaryStatsAt(cid);
ASSERT(stats != NULL);
@@ -594,5 +553,4 @@ void ClassTable::UpdateLiveNew(intptr_t cid, intptr_t size) {
}
#endif // !PRODUCT
-
} // namespace dart
« no previous file with comments | « runtime/vm/class_finalizer_test.cc ('k') | runtime/vm/clustered_snapshot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698