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

Commit 2290d001 authored by Xiang Wang's avatar Xiang Wang Committed by Android (Google) Code Review
Browse files

Merge "Add CUSTOM mode to native stats"

parents 86207bac f0c5ccab

libs/gui/include/gui/LayerMetadata.h

+2 −1
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ enum class GameMode : int32_t { 
    Standard = 1,

    Performance = 2,

    Battery = 3,

    Custom = 4,



    ftl_last = Battery

    ftl_last = Custom

};



} // namespace android::gui

services/surfaceflinger/TimeStats/TimeStats.cpp

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ SurfaceflingerStatsLayerInfo_GameMode gameModeToProto(GameMode gameMode) { 
            return SurfaceflingerStatsLayerInfo::GAME_MODE_PERFORMANCE;

        case GameMode::Battery:

            return SurfaceflingerStatsLayerInfo::GAME_MODE_BATTERY;

        case GameMode::Custom:

            return SurfaceflingerStatsLayerInfo::GAME_MODE_CUSTOM;

        default:

            return SurfaceflingerStatsLayerInfo::GAME_MODE_UNSPECIFIED;

    }

services/surfaceflinger/TimeStats/timestatsatomsproto/timestats_atoms.proto

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ message SurfaceflingerStatsLayerInfo { 
         GAME_MODE_STANDARD = 2;

         GAME_MODE_PERFORMANCE = 3;

         GAME_MODE_BATTERY = 4;

         GAME_MODE_CUSTOM = 5;

    }



    // Game mode that the layer was running at. Used to track user engagement

services/surfaceflinger/tests/unittests/TimeStatsTest.cpp

+25 −6
Original line number Diff line number Diff line
@@ -1320,6 +1320,7 @@ TEST_F(TimeStatsTest, layerStatsCallback_multipleGameModes) { 
    insertTimeRecord(NORMAL_SEQUENCE, LAYER_ID_0, 3, 3000000, {}, GameMode::Performance);

    insertTimeRecord(NORMAL_SEQUENCE, LAYER_ID_0, 4, 4000000, {}, GameMode::Battery);

    insertTimeRecord(NORMAL_SEQUENCE, LAYER_ID_0, 5, 4000000, {}, GameMode::Battery);

    insertTimeRecord(NORMAL_SEQUENCE, LAYER_ID_0, 6, 5000000, {}, GameMode::Custom);



    std::string pulledData;

    EXPECT_TRUE(mTimeStats->onPullAtom(10063 /*SURFACEFLINGER_STATS_LAYER_INFO*/, &pulledData));
@@ -1327,9 +1328,9 @@ TEST_F(TimeStatsTest, layerStatsCallback_multipleGameModes) { 
    SurfaceflingerStatsLayerInfoWrapper atomList;

    ASSERT_TRUE(atomList.ParseFromString(pulledData));

    // The first time record is never uploaded to stats.

    ASSERT_EQ(atomList.atom_size(), 3);

    ASSERT_EQ(atomList.atom_size(), 4);

    // Layers are ordered based on the hash in LayerStatsKey. For this test, the order happens to

    // be: 0 - Battery 1 - Performance 2 - Standard

    // be: 0 - Battery 1 - Custom 2 - Performance 3 - Standard

    const SurfaceflingerStatsLayerInfo& atom0 = atomList.atom(0);



    EXPECT_EQ(atom0.layer_name(), genLayerName(LAYER_ID_0));
@@ -1364,7 +1365,7 @@ TEST_F(TimeStatsTest, layerStatsCallback_multipleGameModes) { 
    EXPECT_EQ(atom1.uid(), UID_0);

    EXPECT_EQ(atom1.display_refresh_rate_bucket(), REFRESH_RATE_BUCKET_0);

    EXPECT_EQ(atom1.render_rate_bucket(), RENDER_RATE_BUCKET_0);

    EXPECT_EQ(atom1.game_mode(), SurfaceflingerStatsLayerInfo::GAME_MODE_PERFORMANCE);

    EXPECT_EQ(atom1.game_mode(), SurfaceflingerStatsLayerInfo::GAME_MODE_CUSTOM);



    const SurfaceflingerStatsLayerInfo& atom2 = atomList.atom(2);
@@ -1377,12 +1378,30 @@ TEST_F(TimeStatsTest, layerStatsCallback_multipleGameModes) { 
    EXPECT_THAT(atom2.latch_to_present(), HistogramEq(buildExpectedHistogram({2}, {1})));

    EXPECT_THAT(atom2.desired_to_present(), HistogramEq(buildExpectedHistogram({1}, {1})));

    EXPECT_THAT(atom2.post_to_acquire(), HistogramEq(buildExpectedHistogram({1}, {1})));

    EXPECT_EQ(atom2.late_acquire_frames(), LATE_ACQUIRE_FRAMES);

    EXPECT_EQ(atom2.bad_desired_present_frames(), BAD_DESIRED_PRESENT_FRAMES);

    EXPECT_EQ(atom2.late_acquire_frames(), 0);

    EXPECT_EQ(atom2.bad_desired_present_frames(), 0);

    EXPECT_EQ(atom2.uid(), UID_0);

    EXPECT_EQ(atom2.display_refresh_rate_bucket(), REFRESH_RATE_BUCKET_0);

    EXPECT_EQ(atom2.render_rate_bucket(), RENDER_RATE_BUCKET_0);

    EXPECT_EQ(atom2.game_mode(), SurfaceflingerStatsLayerInfo::GAME_MODE_STANDARD);

    EXPECT_EQ(atom2.game_mode(), SurfaceflingerStatsLayerInfo::GAME_MODE_PERFORMANCE);



    const SurfaceflingerStatsLayerInfo& atom3 = atomList.atom(3);



    EXPECT_EQ(atom3.layer_name(), genLayerName(LAYER_ID_0));

    EXPECT_EQ(atom3.total_frames(), 1);

    EXPECT_EQ(atom3.dropped_frames(), 0);

    EXPECT_THAT(atom3.present_to_present(), HistogramEq(buildExpectedHistogram({1}, {1})));

    EXPECT_THAT(atom3.post_to_present(), HistogramEq(buildExpectedHistogram({4}, {1})));

    EXPECT_THAT(atom3.acquire_to_present(), HistogramEq(buildExpectedHistogram({3}, {1})));

    EXPECT_THAT(atom3.latch_to_present(), HistogramEq(buildExpectedHistogram({2}, {1})));

    EXPECT_THAT(atom3.desired_to_present(), HistogramEq(buildExpectedHistogram({1}, {1})));

    EXPECT_THAT(atom3.post_to_acquire(), HistogramEq(buildExpectedHistogram({1}, {1})));

    EXPECT_EQ(atom3.late_acquire_frames(), LATE_ACQUIRE_FRAMES);

    EXPECT_EQ(atom3.bad_desired_present_frames(), BAD_DESIRED_PRESENT_FRAMES);

    EXPECT_EQ(atom3.uid(), UID_0);

    EXPECT_EQ(atom3.display_refresh_rate_bucket(), REFRESH_RATE_BUCKET_0);

    EXPECT_EQ(atom3.render_rate_bucket(), RENDER_RATE_BUCKET_0);

    EXPECT_EQ(atom3.game_mode(), SurfaceflingerStatsLayerInfo::GAME_MODE_STANDARD);

}



TEST_F(TimeStatsTest, layerStatsCallback_pullsMultipleLayers) {