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

[heap-snapshot] Declaring progress counter as uint32_t (instead of int)

Browse Source 
A test was overflowing on the progress counter when using int as type.
This CL is fixing the progress counter to use uint32_t, and re-enables
the test.

Why uint32_t instead of size_t?
In the referenced bug, the progress_counter_ (but not the
progress_total_) triggered an overflow; and since these two counters
should be relatively similar (the total count is an estimate, and can
be less than the actual progress count), we do not expect the
count to increase much more than we can already encode with int.


Bug: chromium:1246860
Change-Id: I9769884ef60d352b3787c2223e528ddf33b0b23e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3245116
Commit-Queue: Kim-Anh Tran <kimanh@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/main@{#77551}
This commit is contained in:
Kim-Anh Tran 2021-10-26 10:57:35 +02:00 committed by V8 LUCI CQ
parent 1e0567fb60
commit 8678fc629d
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/v8-profiler.h
View File

@ -603,7 +603,7 @@ class V8_EXPORT ActivityControl {
* Notify about current progress. The activity can be stopped by
* returning kAbort as the callback result.
*/
virtual ControlOption ReportProgressValue(int done, int total) = 0;
virtual ControlOption ReportProgressValue(uint32_t done, uint32_t total) = 0;
};
/**

2
src/inspector/v8-heap-profiler-agent-impl.cc
View File

@ -35,7 +35,7 @@ class HeapSnapshotProgress final : public v8::ActivityControl {
public:
explicit HeapSnapshotProgress(protocol::HeapProfiler::Frontend* frontend)
: m_frontend(frontend) {}
ControlOption ReportProgressValue(int done, int total) override {
ControlOption ReportProgressValue(uint32_t done, uint32_t total) override {
m_frontend->reportHeapSnapshotProgress(done, total,
protocol::Maybe<bool>());
if (done >= total) {

4
src/profiler/heap-snapshot-generator.h
View File

@ -570,8 +570,8 @@ class HeapSnapshotGenerator : public SnapshottingProgressReportingInterface {
HeapEntriesMap entries_map_;
SmiEntriesMap smis_map_;
// Used during snapshot generation.
int progress_counter_;
int progress_total_;
uint32_t progress_counter_;
uint32_t progress_total_;
Heap* heap_;
};

2
test/cctest/test-heap-profiler.cc
View File

@ -1556,7 +1556,7 @@ class TestActivityControl : public v8::ActivityControl {
total_(0),
abort_count_(abort_count),
reported_finish_(false) {}
ControlOption ReportProgressValue(int done, int total) override {
ControlOption ReportProgressValue(uint32_t done, uint32_t total) override {
done_ = done;
total_ = total;
CHECK_LE(done_, total_);

1
test/inspector/inspector.status
View File

@ -414,7 +414,6 @@
'debugger/wasm-stepping-with-source-map': [SKIP],
'debugger/wasm-unnamed-function-names': [SKIP],
'heap-profiler/collect-garbage': [SKIP],
'heap-profiler/console-retaining-path': [SKIP],
'heap-profiler/sampling-heap-profiler': [SKIP],
'heap-profiler/take-heap-snapshot-on-pause': [SKIP],
'json-parse': [SKIP],