languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-04 16:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[vm, gc] Fix the type for the heap usage accessors.

Browse source 
The underlying storage is only intptr_t.

TEST=ci
Change-Id: Ibb687707eb4935d71080193e55ec4366c5b9c8e0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/314320
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ryan Macnak 2023-07-18 19:33:37 +00:00 committed by Commit Queue
parent 130d6199c3
commit ba1577ce85
5 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime/vm/dart.cc
View file

@ -440,7 +440,7 @@ char* Dart::DartInit(const Dart_InitializeParams* params) {
tbes.SetNumArguments(2);
tbes.FormatArgument(0, "snapshotSize", "%" Pd, snapshot->length());
tbes.FormatArgument(
1, "heapSize", "%" Pd64,
1, "heapSize", "%" Pd,
vm_isolate_group()->heap()->UsedInWords(Heap::kOld) * kWordSize);
}
#endif // !defined(PRODUCT)
@ -860,7 +860,7 @@ ErrorPtr Dart::InitIsolateGroupFromSnapshot(
if (tbes.enabled()) {
tbes.SetNumArguments(2);
tbes.FormatArgument(0, "snapshotSize", "%" Pd, snapshot->length());
tbes.FormatArgument(1, "heapSize", "%" Pd64,
tbes.FormatArgument(1, "heapSize", "%" Pd,
IG->heap()->UsedInWords(Heap::kOld) * kWordSize);
}
#endif // defined(SUPPORT_TIMELINE)

17
runtime/vm/heap/heap.cc
View file

@ -799,36 +799,35 @@ bool Heap::VerifyGC(const char* msg, MarkExpectation mark_expectation) {
void Heap::PrintSizes() const {
OS::PrintErr(
"New space (%" Pd64 "k of %" Pd64
"k) "
"Old space (%" Pd64 "k of %" Pd64 "k)\n",
"New space (%" Pd "k of %" Pd "k) "
"Old space (%" Pd "k of %" Pd "k)\n",
(UsedInWords(kNew) / KBInWords), (CapacityInWords(kNew) / KBInWords),
(UsedInWords(kOld) / KBInWords), (CapacityInWords(kOld) / KBInWords));
}
int64_t Heap::UsedInWords(Space space) const {
intptr_t Heap::UsedInWords(Space space) const {
return space == kNew ? new_space_.UsedInWords() : old_space_.UsedInWords();
}
int64_t Heap::CapacityInWords(Space space) const {
intptr_t Heap::CapacityInWords(Space space) const {
return space == kNew ? new_space_.CapacityInWords()
: old_space_.CapacityInWords();
}
int64_t Heap::ExternalInWords(Space space) const {
intptr_t Heap::ExternalInWords(Space space) const {
return space == kNew ? new_space_.ExternalInWords()
: old_space_.ExternalInWords();
}
int64_t Heap::TotalUsedInWords() const {
intptr_t Heap::TotalUsedInWords() const {
return UsedInWords(kNew) + UsedInWords(kOld);
}
int64_t Heap::TotalCapacityInWords() const {
intptr_t Heap::TotalCapacityInWords() const {
return CapacityInWords(kNew) + CapacityInWords(kOld);
}
int64_t Heap::TotalExternalInWords() const {
intptr_t Heap::TotalExternalInWords() const {
return ExternalInWords(kNew) + ExternalInWords(kOld);
}

12
runtime/vm/heap/heap.h
View file

@ -163,13 +163,13 @@ class Heap {
void PrintSizes() const;
// Return amount of memory used and capacity in a space, excluding external.
int64_t UsedInWords(Space space) const;
int64_t CapacityInWords(Space space) const;
int64_t ExternalInWords(Space space) const;
intptr_t UsedInWords(Space space) const;
intptr_t CapacityInWords(Space space) const;
intptr_t ExternalInWords(Space space) const;
int64_t TotalUsedInWords() const;
int64_t TotalCapacityInWords() const;
int64_t TotalExternalInWords() const;
intptr_t TotalUsedInWords() const;
intptr_t TotalCapacityInWords() const;
intptr_t TotalExternalInWords() const;
// Return the amount of GCing in microseconds.
int64_t GCTimeInMicros(Space space) const;

4
runtime/vm/heap/pages.h
View file

@ -186,8 +186,8 @@ class PageSpace {
page_space_controller_.EvaluateAfterLoading(usage_);
}
int64_t UsedInWords() const { return usage_.used_in_words; }
int64_t CapacityInWords() const {
intptr_t UsedInWords() const { return usage_.used_in_words; }
intptr_t CapacityInWords() const {
MutexLocker ml(&pages_lock_);
return usage_.capacity_in_words;
}

6
runtime/vm/heap/scavenger.h
View file

@ -152,12 +152,12 @@ class Scavenger {
// Collect the garbage in this scavenger.
void Scavenge(Thread* thread, GCType type, GCReason reason);
int64_t UsedInWords() const {
intptr_t UsedInWords() const {
MutexLocker ml(&space_lock_);
return to_->used_in_words();
}
int64_t CapacityInWords() const { return to_->max_capacity_in_words(); }
int64_t ExternalInWords() const { return external_size_ >> kWordSizeLog2; }
intptr_t CapacityInWords() const { return to_->max_capacity_in_words(); }
intptr_t ExternalInWords() const { return external_size_ >> kWordSizeLog2; }
SpaceUsage GetCurrentUsage() const {
SpaceUsage usage;
usage.used_in_words = UsedInWords();