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

Commit 2d906b41 authored by Robert Carr's avatar Robert Carr
Browse files

Add a simple SurfaceFlinger stress test. 

Obviously such tests are always a little arbitrary but this one
seems pretty useful. It runs in ~2 seconds, I got 10 passes in a row with
the fix for 36117490 applied, and 3 system restarts in a row (before giving up)
without the fix applied. Clean up the other tests in preparation for presubmit enabling.

Test: Quis custodiet ipsos custodes?
Bug: 36117490
Change-Id: Ieb9a113f5b21ffb4b8ccd933069ab44e0a2b7a9d
parent 99295a2b

services/surfaceflinger/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -243,3 +243,5 @@ LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code 




include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)

endif # libnativehelper

endif # libnativehelper



include $(call first-makefiles-under,$(LOCAL_PATH))

services/surfaceflinger/tests/Android.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ LOCAL_MODULE_TAGS := tests 




LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

   Transaction_test.cpp \

   Transaction_test.cpp \

   Stress_test.cpp \

   SurfaceInterceptor_test.cpp

   SurfaceInterceptor_test.cpp





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \
@@ -20,6 +21,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libprotobuf-cpp-full \

    libprotobuf-cpp-full \

    libui \

    libui \

    libutils \

    libutils \

    libandroid \

    liblog

    liblog





LOCAL_STATIC_LIBRARIES := libtrace_proto

LOCAL_STATIC_LIBRARIES := libtrace_proto

services/surfaceflinger/tests/Stress_test.cpp

0 → 100644
+50 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <gtest/gtest.h>



#include <gui/SurfaceComposerClient.h>



#include <utils/String8.h>



#include <thread>

#include <functional>





namespace android {



TEST(SurfaceFlingerStress, create_and_destroy) {

    auto do_stress = []() {

        sp<SurfaceComposerClient> client = new SurfaceComposerClient;

        ASSERT_EQ(NO_ERROR, client->initCheck());

        for (int j = 0; j < 1000; j++) {

            auto surf = client->createSurface(String8("t"), 100, 100,

                    PIXEL_FORMAT_RGBA_8888, 0);

            ASSERT_TRUE(surf != nullptr);

            client->destroySurface(surf->getHandle());

        }

    };



    std::vector<std::thread> threads;

    for (int i = 0; i < 10; i++) {

        threads.push_back(std::thread(do_stress));

    }

    for (auto& thread : threads) {

        thread.join();

    }

}



}

services/surfaceflinger/tests/SurfaceInterceptor_test.cpp

+12 −4
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

 */





#include <frameworks/native/cmds/surfacereplayer/proto/src/trace.pb.h>

#include <frameworks/native/cmds/surfacereplayer/proto/src/trace.pb.h>

#include <google/protobuf/io/zero_copy_stream_impl.h>





#include <gtest/gtest.h>

#include <gtest/gtest.h>
@@ -68,11 +69,18 @@ static void fillSurfaceRGBA8(const sp<SurfaceControl>& sc, uint8_t r, uint8_t g, 
}

}





static status_t readProtoFile(Trace* trace) {

static status_t readProtoFile(Trace* trace) {

    std::ifstream input(DEFAULT_FILENAME, std::ios::in | std::ios::binary);

    status_t err = NO_ERROR;

    if (input && !trace->ParseFromIstream(&input)) {



        return PERMISSION_DENIED;

    int fd = open(DEFAULT_FILENAME, O_RDONLY);

    {

        google::protobuf::io::FileInputStream f(fd);

        if (fd && !trace->ParseFromZeroCopyStream(&f)) {

            err = PERMISSION_DENIED;

        }

        }

    return NO_ERROR;

    }

    close(fd);



    return err;

}

}





static void enableInterceptor() {

static void enableInterceptor() {