|
|
|
|
@ -19,6 +19,7 @@
|
|
|
|
|
|
|
|
|
|
#include <deque>
|
|
|
|
|
#include <map>
|
|
|
|
|
#include <unordered_map>
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
|
|
#include <media/nblog/ReportPerformance.h>
|
|
|
|
|
@ -27,6 +28,127 @@ namespace android {
|
|
|
|
|
|
|
|
|
|
class String8;
|
|
|
|
|
|
|
|
|
|
// TODO make this a templated class and put it in a separate file.
|
|
|
|
|
// The templated parameters would be bin size and low limit.
|
|
|
|
|
/*
|
|
|
|
|
* Histogram provides a way to store numeric data in histogram format and read it as a serialized
|
|
|
|
|
* string. The terms "bin" and "bucket" are used interchangeably.
|
|
|
|
|
*
|
|
|
|
|
* This class is not thread-safe.
|
|
|
|
|
*/
|
|
|
|
|
class Histogram {
|
|
|
|
|
public:
|
|
|
|
|
struct Config {
|
|
|
|
|
const double binSize; // TODO template type
|
|
|
|
|
const size_t numBins;
|
|
|
|
|
const double low; // TODO template type
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Histograms are constructed with fixed configuration numbers. Dynamic configuration based
|
|
|
|
|
// the data is possible but complex because
|
|
|
|
|
// - data points are added one by one, not processed as a batch.
|
|
|
|
|
// - Histograms with different configuration parameters are tricky to aggregate, and they
|
|
|
|
|
// will need to be aggregated at the Media Metrics cloud side.
|
|
|
|
|
// - not providing limits theoretically allows for infinite number of buckets.
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \brief Creates a Histogram object.
|
|
|
|
|
*
|
|
|
|
|
* \param binSize the width of each bin of the histogram.
|
|
|
|
|
* Units are whatever data the caller decides to store.
|
|
|
|
|
* \param numBins the number of bins desired in the histogram range.
|
|
|
|
|
* \param low the lower bound of the histogram bucket values.
|
|
|
|
|
* Units are whatever data the caller decides to store.
|
|
|
|
|
* Note that the upper bound can be calculated by the following:
|
|
|
|
|
* upper = lower + binSize * numBins.
|
|
|
|
|
*/
|
|
|
|
|
Histogram(double binSize, size_t numBins, double low = 0.)
|
|
|
|
|
: mBinSize(binSize), mNumBins(numBins), mLow(low), mBins(mNumBins) {}
|
|
|
|
|
|
|
|
|
|
Histogram(const Config &c)
|
|
|
|
|
: Histogram(c.binSize, c.numBins, c.low) {}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \brief Add a data point to the histogram. The value of the data point
|
|
|
|
|
* is rounded to the nearest multiple of the bin size (before accounting
|
|
|
|
|
* for the lower bound offset, which may not be a multiple of the bin size).
|
|
|
|
|
*
|
|
|
|
|
* \param value the value of the data point to add.
|
|
|
|
|
*/
|
|
|
|
|
void add(double value);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \brief Removes all data points from the histogram.
|
|
|
|
|
*/
|
|
|
|
|
void clear();
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \brief Returns the total number of data points added to the histogram.
|
|
|
|
|
*
|
|
|
|
|
* \return the total number of data points in the histogram.
|
|
|
|
|
*/
|
|
|
|
|
uint64_t totalCount() const;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \brief Serializes the histogram into a string. The format is chosen to be compatible with
|
|
|
|
|
* the histogram representation to send to the Media Metrics service.
|
|
|
|
|
*
|
|
|
|
|
* The string is as follows:
|
|
|
|
|
* binSize,numBins,low,{-1|lowCount,...,binIndex|count,...,numBins|highCount}
|
|
|
|
|
*
|
|
|
|
|
* - binIndex is an integer with 0 <= binIndex < numBins.
|
|
|
|
|
* - count is the number of occurrences of the (rounded) value
|
|
|
|
|
* low + binSize * bucketIndex.
|
|
|
|
|
* - lowCount is the number of (rounded) values less than low.
|
|
|
|
|
* - highCount is the number of (rounded) values greater than or equal to
|
|
|
|
|
* low + binSize * numBins.
|
|
|
|
|
* - a binIndex may be skipped if its count is 0.
|
|
|
|
|
*
|
|
|
|
|
* \return the histogram serialized as a string.
|
|
|
|
|
*/
|
|
|
|
|
std::string serializeToString() const;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
const double mBinSize; // Size of each bucket
|
|
|
|
|
const size_t mNumBins; // Number of buckets in histogram range
|
|
|
|
|
const double mLow; // Lower bound of values
|
|
|
|
|
std::vector<int> mBins; // Data structure to store the actual histogram
|
|
|
|
|
|
|
|
|
|
int mLowCount = 0; // Number of values less than mLow
|
|
|
|
|
int mHighCount = 0; // Number of values >= mLow + mBinSize * mNumBins
|
|
|
|
|
uint64_t mTotalCount = 0; // Total number of values recorded
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// TODO For now this is a holder of audio performance metrics. The idea is essentially the same
|
|
|
|
|
// as PerformanceAnalysis, but the design structure is different. There is a PerformanceAnalysis
|
|
|
|
|
// instance for each thread writer (see PerformanceAnalysisMap later in this file), while a
|
|
|
|
|
// PerformanceData instance already takes into account each thread writer in its calculations.
|
|
|
|
|
// Eventually, this class should be merged with PerformanceAnalysis into some single entity.
|
|
|
|
|
/*
|
|
|
|
|
* PerformanceData stores audio performance data from audioflinger threads as histograms,
|
|
|
|
|
* time series, or counts, and outputs them in a machine-readable format.
|
|
|
|
|
*/
|
|
|
|
|
class PerformanceData {
|
|
|
|
|
public:
|
|
|
|
|
void addCycleTimeEntry(int author, double cycleTimeMs);
|
|
|
|
|
void addLatencyEntry(int author, double latencyMs);
|
|
|
|
|
void addWarmupTimeEntry(int author, double warmupTimeMs);
|
|
|
|
|
void addWarmupCyclesEntry(int author, double warmupCycles);
|
|
|
|
|
void dump(int fd, int indent = 0);
|
|
|
|
|
private:
|
|
|
|
|
// Values based on mUnderrunNs and mOverrunNs in FastMixer.cpp for frameCount = 192 and
|
|
|
|
|
// mSampleRate = 48000, which correspond to 2 and 7 seconds.
|
|
|
|
|
static constexpr Histogram::Config kCycleTimeConfig = { 0.25, 20, 2.};
|
|
|
|
|
std::unordered_map<int /*author, i.e. thread number*/, Histogram> mCycleTimeMsHists;
|
|
|
|
|
|
|
|
|
|
// Values based on trial and error logging. Need a better way to determine
|
|
|
|
|
// bin size and lower/upper limits.
|
|
|
|
|
static constexpr Histogram::Config kLatencyConfig = { 2., 10, 10.};
|
|
|
|
|
std::unordered_map<int, Histogram> mLatencyMsHists;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
namespace ReportPerformance {
|
|
|
|
|
|
|
|
|
|
class PerformanceAnalysis;
|
|
|
|
|
|
Eric Tan
6 years ago
committed by
Android (Google) Code Review