Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1263270 - Sort census reports by smallest node ID counted, rather than number of nodes counted. r=jimb

Browse Source
This commit is contained in:
Nick Fitzgerald 2016-04-08 16:21:00 -04:00
parent 9de749f7f5
commit 03303bde0d
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/public/UbiNodeCensus.h
View File

@ -9,6 +9,8 @@
#include "mozilla/Move.h"
#include <algorithm>
#include "jsapi.h"
#include "js/UbiNode.h"
@ -125,11 +127,31 @@ class CountBase {
~CountBase() { }
public:
explicit CountBase(CountType& type) : type(type), total_(0) { }
explicit CountBase(CountType& type)
: type(type)
, total_(0)
, smallestNodeIdCounted_(SIZE_MAX)
{ }
// Categorize and count |node| as appropriate for this count's type.
bool count(mozilla::MallocSizeOf mallocSizeOf, const Node& node) {
return type.count(*this, mallocSizeOf, node);
total_++;
auto id = node.identifier();
if (id < smallestNodeIdCounted_) {
smallestNodeIdCounted_ = id;
}
#ifdef DEBUG
size_t oldTotal = total_;
#endif
bool ret = type.count(*this, mallocSizeOf, node);
MOZ_ASSERT(total_ == oldTotal,
"CountType::count should not increment total_, CountBase::count handles that");
return ret;
}
// Construct a JavaScript object reporting the counts recorded in this
@ -147,6 +169,10 @@ class CountBase {
void trace(JSTracer* trc) { type.traceCount(*this, trc); }
size_t total_;
// The smallest JS::ubi::Node::identifier() passed to this instance's
// count() method. This provides a stable way to sort sets.
Node::Id smallestNodeIdCounted_;
};
class RootedCount : JS::CustomAutoRooter {

18
js/src/vm/UbiNodeCensus.cpp
View File

@ -85,7 +85,6 @@ bool
SimpleCount::count(CountBase& countBase, mozilla::MallocSizeOf mallocSizeOf, const Node& node)
{
Count& count = static_cast<Count&>(countBase);
count.total_++;
if (reportBytes)
count.totalBytes_ += node.size(mallocSizeOf);
return true;
@ -262,7 +261,6 @@ bool
ByCoarseType::count(CountBase& countBase, mozilla::MallocSizeOf mallocSizeOf, const Node& node)
{
Count& count = static_cast<Count&>(countBase);
count.total_++;
switch (node.coarseType()) {
case JS::ubi::CoarseType::Object:
@ -313,17 +311,17 @@ ByCoarseType::report(JSContext* cx, CountBase& countBase, MutableHandleValue rep
}
// Comparison function for sorting hash table entries by total count. The
// Comparison function for sorting hash table entries by the smallest node ID
// they counted. Node IDs are stable and unique, which ensures ordering of
// results never depends on hash table placement or sort algorithm vagaries. The
// arguments are doubly indirect: they're pointers to elements in an array of
// pointers to table entries.
template<typename Entry>
static int compareEntries(const void* lhsVoid, const void* rhsVoid) {
size_t lhs = (*static_cast<const Entry* const*>(lhsVoid))->value()->total_;
size_t rhs = (*static_cast<const Entry* const*>(rhsVoid))->value()->total_;
auto lhs = (*static_cast<const Entry* const*>(lhsVoid))->value()->smallestNodeIdCounted_;
auto rhs = (*static_cast<const Entry* const*>(rhsVoid))->value()->smallestNodeIdCounted_;
// qsort sorts in "ascending" order, so we should describe entries with
// smaller counts as being "greater than" entries with larger counts. We
// don't want to just subtract the counts, as they're unsigned.
// We don't want to just subtract the values, as they're unsigned.
if (lhs < rhs)
return 1;
if (lhs > rhs)
@ -457,7 +455,6 @@ bool
ByObjectClass::count(CountBase& countBase, mozilla::MallocSizeOf mallocSizeOf, const Node& node)
{
Count& count = static_cast<Count&>(countBase);
count.total_++;
const char* className = node.jsObjectClassName();
if (!className)
@ -551,7 +548,6 @@ bool
ByUbinodeType::count(CountBase& countBase, mozilla::MallocSizeOf mallocSizeOf, const Node& node)
{
Count& count = static_cast<Count&>(countBase);
count.total_++;
const char16_t* key = node.typeName();
MOZ_ASSERT(key);
@ -706,7 +702,6 @@ bool
ByAllocationStack::count(CountBase& countBase, mozilla::MallocSizeOf mallocSizeOf, const Node& node)
{
Count& count = static_cast<Count&>(countBase);
count.total_++;
// If we do have an allocation stack for this node, include it in the
// count for that stack.
@ -875,7 +870,6 @@ bool
ByFilename::count(CountBase& countBase, mozilla::MallocSizeOf mallocSizeOf, const Node& node)
{
Count& count = static_cast<Count&>(countBase);
count.total_++;
const char* filename = node.scriptFilename();
if (!filename)