Chromium Code Reviews| Index: test/cctest/test-heap-profiler.cc |
| diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc |
| index 7e48a87a7ee10e7d015543da3a6a4e80cdc1f69d..18846f33c9546644de38cd4eda111311014bf42c 100644 |
| --- a/test/cctest/test-heap-profiler.cc |
| +++ b/test/cctest/test-heap-profiler.cc |
| @@ -704,6 +704,7 @@ class TestStatsStream : public v8::OutputStream { |
| : eos_signaled_(0), |
| numbers_written_(0), |
| entries_count_(0), |
| + entries_size_(0), |
| intervals_count_(0), |
| first_interval_index_(-1) { } |
| TestStatsStream(const TestStatsStream& stream) |
| @@ -711,6 +712,7 @@ class TestStatsStream : public v8::OutputStream { |
| eos_signaled_(stream.eos_signaled_), |
| numbers_written_(stream.numbers_written_), |
| entries_count_(stream.entries_count_), |
| + entries_size_(stream.entries_size_), |
| intervals_count_(stream.intervals_count_), |
| first_interval_index_(stream.first_interval_index_) { } |
| virtual ~TestStatsStream() {} |
| @@ -726,14 +728,17 @@ class TestStatsStream : public v8::OutputStream { |
| entries_count_ = 0; |
| if (first_interval_index_ == -1 && numbers_written != 0) |
| first_interval_index_ = buffer[0]; |
| - for (int i = 1; i < numbers_written; i += 2) |
| - entries_count_ += buffer[i]; |
| + for (int i = 0; i < numbers_written; i += 3) { |
| + entries_count_ += buffer[i+1]; |
|
mnaganov (inactive)
2012/04/13 14:36:41
Still not considering defining the stream structur
|
| + entries_size_ += buffer[i+2]; |
| + } |
| return kContinue; |
| } |
| int eos_signaled() { return eos_signaled_; } |
| int numbers_written() { return numbers_written_; } |
| uint32_t entries_count() const { return entries_count_; } |
| + uint32_t entries_size() const { return entries_size_; } |
| int intervals_count() const { return intervals_count_; } |
| int first_interval_index() const { return first_interval_index_; } |
| @@ -741,6 +746,7 @@ class TestStatsStream : public v8::OutputStream { |
| int eos_signaled_; |
| int numbers_written_; |
| uint32_t entries_count_; |
| + uint32_t entries_size_; |
| int intervals_count_; |
| int first_interval_index_; |
| }; |
| @@ -770,7 +776,8 @@ TEST(HeapSnapshotObjectsStats) { |
| // Single chunk of data expected in update. Initial data. |
| TestStatsStream stats_update = GetHeapStatsUpdate(); |
| CHECK_EQ(1, stats_update.intervals_count()); |
| - CHECK_EQ(2, stats_update.numbers_written()); |
| + CHECK_EQ(3, stats_update.numbers_written()); |
| + CHECK_LT(0, stats_update.entries_size()); |
| CHECK_EQ(0, stats_update.first_interval_index()); |
| } |
| @@ -783,7 +790,8 @@ TEST(HeapSnapshotObjectsStats) { |
| // Single chunk of data with one new entry expected in update. |
| TestStatsStream stats_update = GetHeapStatsUpdate(); |
| CHECK_EQ(1, stats_update.intervals_count()); |
| - CHECK_EQ(2, stats_update.numbers_written()); |
| + CHECK_EQ(3, stats_update.numbers_written()); |
| + CHECK_LT(0, stats_update.entries_size()); |
| CHECK_EQ(1, stats_update.entries_count()); |
| CHECK_EQ(2, stats_update.first_interval_index()); |
| } |
| @@ -804,7 +812,8 @@ TEST(HeapSnapshotObjectsStats) { |
| // Single chunk of data with three new entries expected in update. |
| TestStatsStream stats_update = GetHeapStatsUpdate(); |
| CHECK_EQ(1, stats_update.intervals_count()); |
| - CHECK_EQ(2, stats_update.numbers_written()); |
| + CHECK_EQ(3, stats_update.numbers_written()); |
| + CHECK_LT(0, stats_update.entries_size()); |
| CHECK_EQ(3, stats_update.entries_count()); |
| CHECK_EQ(4, stats_update.first_interval_index()); |
| } |
| @@ -814,7 +823,8 @@ TEST(HeapSnapshotObjectsStats) { |
| // Single chunk of data with two left entries expected in update. |
| TestStatsStream stats_update = GetHeapStatsUpdate(); |
| CHECK_EQ(1, stats_update.intervals_count()); |
| - CHECK_EQ(2, stats_update.numbers_written()); |
| + CHECK_EQ(3, stats_update.numbers_written()); |
| + CHECK_LT(0, stats_update.entries_size()); |
|
mnaganov (inactive)
2012/04/13 14:36:41
I think you can store the previous value of size a
|
| CHECK_EQ(1, stats_update.entries_count()); |
| // Two strings from forth interval were released. |
| CHECK_EQ(4, stats_update.first_interval_index()); |
| @@ -825,7 +835,8 @@ TEST(HeapSnapshotObjectsStats) { |
| // Single chunk of data with 0 left entries expected in update. |
| TestStatsStream stats_update = GetHeapStatsUpdate(); |
| CHECK_EQ(1, stats_update.intervals_count()); |
| - CHECK_EQ(2, stats_update.numbers_written()); |
| + CHECK_EQ(3, stats_update.numbers_written()); |
| + CHECK_EQ(0, stats_update.entries_size()); |
| CHECK_EQ(0, stats_update.entries_count()); |
| // The last string from forth interval was released. |
| CHECK_EQ(4, stats_update.first_interval_index()); |
| @@ -835,7 +846,8 @@ TEST(HeapSnapshotObjectsStats) { |
| // Single chunk of data with 0 left entries expected in update. |
| TestStatsStream stats_update = GetHeapStatsUpdate(); |
| CHECK_EQ(1, stats_update.intervals_count()); |
| - CHECK_EQ(2, stats_update.numbers_written()); |
| + CHECK_EQ(3, stats_update.numbers_written()); |
| + CHECK_EQ(0, stats_update.entries_size()); |
| CHECK_EQ(0, stats_update.entries_count()); |
| // The only string from the second interval was released. |
| CHECK_EQ(2, stats_update.first_interval_index()); |