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

Commit 44aff705 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "SurfaceFlinger: add VSYNC-predicted as debug option" into rvc-dev am: 58b48f76 

Change-Id: Ie50faffd81b0432fc0275b561cc9c00d3b36910d
parents 50b32e72 58b48f76

services/surfaceflinger/Scheduler/VSyncReactor.cpp

+27 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,10 @@ 
#define LOG_TAG "VSyncReactor"

#define LOG_TAG "VSyncReactor"

//#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0

#include "VSyncReactor.h"

#include "VSyncReactor.h"

#include <cutils/properties.h>

#include <log/log.h>

#include <log/log.h>

#include <utils/Trace.h>

#include <utils/Trace.h>

#include "../TracedOrdinal.h"

#include "TimeKeeper.h"

#include "TimeKeeper.h"

#include "VSyncDispatch.h"

#include "VSyncDispatch.h"

#include "VSyncTracker.h"

#include "VSyncTracker.h"
@@ -32,12 +34,35 @@ nsecs_t SystemClock::now() const { 
    return systemTime(SYSTEM_TIME_MONOTONIC);

    return systemTime(SYSTEM_TIME_MONOTONIC);

}

}





class PredictedVsyncTracer {

public:

    PredictedVsyncTracer(VSyncDispatch& dispatch)

          : mRegistration(dispatch,

                          std::bind(&PredictedVsyncTracer::callback, this, std::placeholders::_1,

                                    std::placeholders::_2),

                          "PredictedVsyncTracer") {

        mRegistration.schedule(0, 0);

    }



private:

    TracedOrdinal<bool> mParity = {"VSYNC-predicted", 0};

    VSyncCallbackRegistration mRegistration;



    void callback(nsecs_t /*vsyncTime*/, nsecs_t /*targetWakeupTim*/) {

        mParity = !mParity;

        mRegistration.schedule(0, 0);

    }

};



VSyncReactor::VSyncReactor(std::unique_ptr<Clock> clock, std::unique_ptr<VSyncDispatch> dispatch,

VSyncReactor::VSyncReactor(std::unique_ptr<Clock> clock, std::unique_ptr<VSyncDispatch> dispatch,

                           std::unique_ptr<VSyncTracker> tracker, size_t pendingFenceLimit)

                           std::unique_ptr<VSyncTracker> tracker, size_t pendingFenceLimit)

      : mClock(std::move(clock)),

      : mClock(std::move(clock)),

        mTracker(std::move(tracker)),

        mTracker(std::move(tracker)),

        mDispatch(std::move(dispatch)),

        mDispatch(std::move(dispatch)),

        mPendingLimit(pendingFenceLimit) {}

        mPendingLimit(pendingFenceLimit),

        mPredictedVsyncTracer(property_get_bool("debug.sf.show_predicted_vsync", false)

                                      ? std::make_unique<PredictedVsyncTracer>(*mDispatch)

                                      : nullptr) {}





VSyncReactor::~VSyncReactor() = default;

VSyncReactor::~VSyncReactor() = default;
@@ -287,7 +312,7 @@ status_t VSyncReactor::addEventListener(const char* name, nsecs_t phase, 
    auto it = mCallbacks.find(callback);

    auto it = mCallbacks.find(callback);

    if (it == mCallbacks.end()) {

    if (it == mCallbacks.end()) {

        // TODO (b/146557561): resolve lastCallbackTime semantics in DispSync i/f.

        // TODO (b/146557561): resolve lastCallbackTime semantics in DispSync i/f.

        static auto constexpr maxListeners = 3;

        static auto constexpr maxListeners = 4;

        if (mCallbacks.size() >= maxListeners) {

        if (mCallbacks.size() >= maxListeners) {

            ALOGE("callback %s not added, exceeded callback limit of %i (currently %zu)", name,

            ALOGE("callback %s not added, exceeded callback limit of %i (currently %zu)", name,

                  maxListeners, mCallbacks.size());

                  maxListeners, mCallbacks.size());

services/surfaceflinger/Scheduler/VSyncReactor.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ class Clock; 
class VSyncDispatch;

class VSyncDispatch;

class VSyncTracker;

class VSyncTracker;

class CallbackRepeater;

class CallbackRepeater;

class PredictedVsyncTracer;





// TODO (b/145217110): consider renaming.

// TODO (b/145217110): consider renaming.

class VSyncReactor : public android::DispSync {

class VSyncReactor : public android::DispSync {
@@ -86,6 +87,8 @@ private: 




    std::unordered_map<DispSync::Callback*, std::unique_ptr<CallbackRepeater>> mCallbacks

    std::unordered_map<DispSync::Callback*, std::unique_ptr<CallbackRepeater>> mCallbacks

            GUARDED_BY(mMutex);

            GUARDED_BY(mMutex);



    const std::unique_ptr<PredictedVsyncTracer> mPredictedVsyncTracer;

};

};





class SystemClock : public Clock {

class SystemClock : public Clock {