Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9d0d32e authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Tracks: log internalTrackId in metrics" into sc-dev

parents 39b41a0b 5837c7f9

media/libmediametrics/include/MediaMetricsConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 


#define AMEDIAMETRICS_PROP_FRAMECOUNT     "frameCount"     // int32

#define AMEDIAMETRICS_PROP_INPUTDEVICES   "inputDevices"   // string value

#define AMEDIAMETRICS_PROP_INTERNALTRACKID "internalTrackId" // int32

#define AMEDIAMETRICS_PROP_INTERVALCOUNT  "intervalCount"  // int32

#define AMEDIAMETRICS_PROP_LATENCYMS      "latencyMs"      // double value

#define AMEDIAMETRICS_PROP_LOGSESSIONID   "logSessionId"   // hex string, "" none

services/audioflinger/TrackMetrics.h

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
        mIntervalStartTimeNs = systemTime();

    }



    void logConstructor(pid_t creatorPid, uid_t creatorUid,

    void logConstructor(pid_t creatorPid, uid_t creatorUid, int32_t internalTrackId,

            const std::string& traits = {},

            audio_stream_type_t streamType = AUDIO_STREAM_DEFAULT) const {

        // Once this item is logged by the server, the client can add properties.
@@ -78,6 +78,7 @@ public: 
            .set(AMEDIAMETRICS_PROP_ALLOWUID, (int32_t)creatorUid)

            .set(AMEDIAMETRICS_PROP_EVENT,

                    AMEDIAMETRICS_PROP_PREFIX_SERVER AMEDIAMETRICS_PROP_EVENT_VALUE_CTOR)

            .set(AMEDIAMETRICS_PROP_INTERNALTRACKID, internalTrackId)

            .set(AMEDIAMETRICS_PROP_TRAITS, traits);

        // log streamType from the service, since client doesn't know chosen streamType.

        if (streamType != AUDIO_STREAM_DEFAULT) {

services/audioflinger/Tracks.cpp

+3 −3
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ AudioFlinger::PlaybackThread::Track::Track( 


    // Once this item is logged by the server, the client can add properties.

    const char * const traits = sharedBuffer == 0 ? "" : "static";

    mTrackMetrics.logConstructor(creatorPid, uid, traits, streamType);

    mTrackMetrics.logConstructor(creatorPid, uid, id(), traits, streamType);

}



AudioFlinger::PlaybackThread::Track::~Track()
@@ -2421,7 +2421,7 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( 
#endif



    // Once this item is logged by the server, the client can add properties.

    mTrackMetrics.logConstructor(creatorPid, uid);

    mTrackMetrics.logConstructor(creatorPid, uid, id());

}



AudioFlinger::RecordThread::RecordTrack::~RecordTrack()
@@ -2984,7 +2984,7 @@ AudioFlinger::MmapThread::MmapTrack::MmapTrack(ThreadBase *thread, 
        mPid(pid), mSilenced(false), mSilencedNotified(false)

{

    // Once this item is logged by the server, the client can add properties.

    mTrackMetrics.logConstructor(creatorPid, uid);

    mTrackMetrics.logConstructor(creatorPid, uid, id());

}



AudioFlinger::MmapThread::MmapTrack::~MmapTrack()