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

Commit a397e2b0 authored by Ana Krulec's avatar Ana Krulec Committed by Android (Google) Code Review
Browse files

Merge "SF: Updating text on threads/source in order to easier read the systrace."

parents efdb6ee5 1f02791d

services/surfaceflinger/Scheduler/Scheduler.cpp

+6 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ std::atomic<int64_t> Scheduler::sNextId = 0; 
Scheduler::~Scheduler() = default;



sp<Scheduler::ConnectionHandle> Scheduler::createConnection(

        const char* connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

        const std::string& connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

        impl::EventThread::ResyncWithRateLimitCallback resyncCallback,

        impl::EventThread::InterceptVSyncsCallback interceptCallback) {

    const int64_t id = sNextId++;
@@ -56,13 +56,15 @@ sp<Scheduler::ConnectionHandle> Scheduler::createConnection( 
}



std::unique_ptr<EventThread> Scheduler::makeEventThread(

        const char* connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

        const std::string& connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

        impl::EventThread::ResyncWithRateLimitCallback resyncCallback,

        impl::EventThread::InterceptVSyncsCallback interceptCallback) {

    const std::string sourceName = connectionName + "Source";

    std::unique_ptr<VSyncSource> eventThreadSource =

            std::make_unique<DispSyncSource>(dispSync, phaseOffsetNs, true, connectionName);

            std::make_unique<DispSyncSource>(dispSync, phaseOffsetNs, true, sourceName.c_str());

    const std::string threadName = connectionName + "Thread";

    return std::make_unique<impl::EventThread>(std::move(eventThreadSource), resyncCallback,

                                               interceptCallback, connectionName);

                                               interceptCallback, threadName.c_str());

}



sp<IDisplayEventConnection> Scheduler::createDisplayEventConnection(

services/surfaceflinger/Scheduler/Scheduler.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public: 


    /** Creates an EventThread connection. */

    sp<ConnectionHandle> createConnection(

            const char* connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

            const std::string& connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

            impl::EventThread::ResyncWithRateLimitCallback resyncCallback,

            impl::EventThread::InterceptVSyncsCallback interceptCallback);

    sp<IDisplayEventConnection> createDisplayEventConnection(const sp<ConnectionHandle>& handle);
@@ -79,7 +79,7 @@ public: 


protected:

    virtual std::unique_ptr<EventThread> makeEventThread(

            const char* connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

            const std::string& connectionName, DispSync* dispSync, int64_t phaseOffsetNs,

            impl::EventThread::ResyncWithRateLimitCallback resyncCallback,

            impl::EventThread::InterceptVSyncsCallback interceptCallback);

services/surfaceflinger/tests/unittests/SchedulerTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ protected: 
              : mEventThread(std::move(eventThread)) {}



        std::unique_ptr<EventThread> makeEventThread(

                const char* /* connectionName */, DispSync* /* dispSync */,

                const std::string& /* connectionName */, DispSync* /* dispSync */,

                nsecs_t /* phaseOffsetNs */,

                impl::EventThread::ResyncWithRateLimitCallback /* resyncCallback */,

                impl::EventThread::InterceptVSyncsCallback /* interceptCallback */) override {