Loading services/surfaceflinger/DispSync.cpp +39 −148 Original line number Diff line number Diff line Loading @@ -15,7 +15,6 @@ */ #define ATRACE_TAG ATRACE_TAG_GRAPHICS //#define LOG_NDEBUG 0 // This is needed for stdint.h to define INT64_MAX in C++ #define __STDC_LIMIT_MACROS Loading @@ -34,21 +33,12 @@ #include "DispSync.h" #include "EventLog/EventLog.h" #include <algorithm> using std::max; using std::min; namespace android { // Setting this to true enables verbose tracing that can be used to debug // vsync event model or phase issues. static const bool kTraceDetailedInfo = false; // Setting this to true adds a zero-phase tracer for correlating with hardware // vsync events static const bool kEnableZeroPhaseTracer = false; // This is the threshold used to determine when hardware vsync events are // needed to re-synchronize the software vsync model with the hardware. The // error metric used is the mean of the squared difference between each Loading @@ -59,36 +49,28 @@ static const nsecs_t kErrorThreshold = 160000000000; // 400 usec squared // vsync event. static const int64_t kPresentTimeOffset = PRESENT_TIME_OFFSET_FROM_VSYNC_NS; #undef LOG_TAG #define LOG_TAG "DispSyncThread" class DispSyncThread: public Thread { public: DispSyncThread(const char* name): mName(name), DispSyncThread(): mStop(false), mPeriod(0), mPhase(0), mReferenceTime(0), mWakeupLatency(0), mFrameNumber(0) {} mWakeupLatency(0) { } virtual ~DispSyncThread() {} void updateModel(nsecs_t period, nsecs_t phase, nsecs_t referenceTime) { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); mPeriod = period; mPhase = phase; mReferenceTime = referenceTime; ALOGV("[%s] updateModel: mPeriod = %" PRId64 ", mPhase = %" PRId64 " mReferenceTime = %" PRId64, mName, ns2us(mPeriod), ns2us(mPhase), ns2us(mReferenceTime)); mCond.signal(); } void stop() { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); mStop = true; mCond.signal(); Loading @@ -107,12 +89,6 @@ public: { // Scope for lock Mutex::Autolock lock(mMutex); if (kTraceDetailedInfo) { ATRACE_INT64("DispSync:Frame", mFrameNumber); } ALOGV("[%s] Frame %" PRId64, mName, mFrameNumber); ++mFrameNumber; if (mStop) { return false; } Loading @@ -133,9 +109,6 @@ public: bool isWakeup = false; if (now < targetTime) { ALOGV("[%s] Waiting until %" PRId64, mName, ns2us(targetTime)); if (kTraceDetailedInfo) ATRACE_NAME("DispSync waiting"); err = mCond.waitRelative(mMutex, targetTime - now); if (err == TIMED_OUT) { Loading @@ -149,15 +122,15 @@ public: now = systemTime(SYSTEM_TIME_MONOTONIC); // Don't correct by more than 1.5 ms static const nsecs_t kMaxWakeupLatency = us2ns(1500); if (isWakeup) { mWakeupLatency = ((mWakeupLatency * 63) + (now - targetTime)) / 64; mWakeupLatency = min(mWakeupLatency, kMaxWakeupLatency); if (mWakeupLatency > 500000) { // Don't correct by more than 500 us mWakeupLatency = 500000; } if (kTraceDetailedInfo) { ATRACE_INT64("DispSync:WakeupLat", now - targetTime); ATRACE_INT64("DispSync:WakeupLat", now - nextEventTime); ATRACE_INT64("DispSync:AvgWakeupLat", mWakeupLatency); } } Loading @@ -173,9 +146,7 @@ public: return false; } status_t addEventListener(const char* name, nsecs_t phase, const sp<DispSync::Callback>& callback) { if (kTraceDetailedInfo) ATRACE_CALL(); status_t addEventListener(nsecs_t phase, const sp<DispSync::Callback>& callback) { Mutex::Autolock lock(mMutex); for (size_t i = 0; i < mEventListeners.size(); i++) { Loading @@ -185,14 +156,15 @@ public: } EventListener listener; listener.mName = name; listener.mPhase = phase; listener.mCallback = callback; // We want to allow the firstmost future event to fire without // allowing any past events to fire listener.mLastEventTime = systemTime() - mPeriod / 2 + mPhase - mWakeupLatency; // allowing any past events to fire. Because // computeListenerNextEventTimeLocked filters out events within a half // a period of the last event time, we need to initialize the last // event time to a half a period in the past. listener.mLastEventTime = systemTime(SYSTEM_TIME_MONOTONIC) - mPeriod / 2; mEventListeners.push(listener); Loading @@ -202,7 +174,6 @@ public: } status_t removeEventListener(const sp<DispSync::Callback>& callback) { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); for (size_t i = 0; i < mEventListeners.size(); i++) { Loading @@ -218,7 +189,6 @@ public: // This method is only here to handle the kIgnorePresentFences case. bool hasAnyEventListeners() { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); return !mEventListeners.empty(); } Loading @@ -226,7 +196,6 @@ public: private: struct EventListener { const char* mName; nsecs_t mPhase; nsecs_t mLastEventTime; sp<DispSync::Callback> mCallback; Loading @@ -238,8 +207,6 @@ private: }; nsecs_t computeNextEventTimeLocked(nsecs_t now) { if (kTraceDetailedInfo) ATRACE_CALL(); ALOGV("[%s] computeNextEventTimeLocked", mName); nsecs_t nextEventTime = INT64_MAX; for (size_t i = 0; i < mEventListeners.size(); i++) { nsecs_t t = computeListenerNextEventTimeLocked(mEventListeners[i], Loading @@ -250,28 +217,21 @@ private: } } ALOGV("[%s] nextEventTime = %" PRId64, mName, ns2us(nextEventTime)); return nextEventTime; } Vector<CallbackInvocation> gatherCallbackInvocationsLocked(nsecs_t now) { if (kTraceDetailedInfo) ATRACE_CALL(); ALOGV("[%s] gatherCallbackInvocationsLocked @ %" PRId64, mName, ns2us(now)); Vector<CallbackInvocation> callbackInvocations; nsecs_t onePeriodAgo = now - mPeriod; nsecs_t ref = now - mPeriod; for (size_t i = 0; i < mEventListeners.size(); i++) { nsecs_t t = computeListenerNextEventTimeLocked(mEventListeners[i], onePeriodAgo); ref); if (t < now) { CallbackInvocation ci; ci.mCallback = mEventListeners[i].mCallback; ci.mEventTime = t; ALOGV("[%s] [%s] Preparing to fire", mName, mEventListeners[i].mName); callbackInvocations.push(ci); mEventListeners.editItemAt(i).mLastEventTime = t; } Loading @@ -281,67 +241,29 @@ private: } nsecs_t computeListenerNextEventTimeLocked(const EventListener& listener, nsecs_t baseTime) { if (kTraceDetailedInfo) ATRACE_CALL(); ALOGV("[%s] [%s] computeListenerNextEventTimeLocked(%" PRId64 ")", mName, listener.mName, ns2us(baseTime)); nsecs_t lastEventTime = listener.mLastEventTime + mWakeupLatency; ALOGV("[%s] lastEventTime: %" PRId64, mName, ns2us(lastEventTime)); if (baseTime < lastEventTime) { baseTime = lastEventTime; ALOGV("[%s] Clamping baseTime to lastEventTime -> %" PRId64, mName, ns2us(baseTime)); } baseTime -= mReferenceTime; ALOGV("[%s] Relative baseTime = %" PRId64, mName, ns2us(baseTime)); nsecs_t phase = mPhase + listener.mPhase; ALOGV("[%s] Phase = %" PRId64, mName, ns2us(phase)); baseTime -= phase; ALOGV("[%s] baseTime - phase = %" PRId64, mName, ns2us(baseTime)); // If our previous time is before the reference (because the reference // has since been updated), the division by mPeriod will truncate // towards zero instead of computing the floor. Since in all cases // before the reference we want the next time to be effectively now, we // set baseTime to -mPeriod so that numPeriods will be -1. // When we add 1 and the phase, we will be at the correct event time for // this period. if (baseTime < 0) { ALOGV("[%s] Correcting negative baseTime", mName); baseTime = -mPeriod; } nsecs_t numPeriods = baseTime / mPeriod; ALOGV("[%s] numPeriods = %" PRId64, mName, numPeriods); nsecs_t t = (numPeriods + 1) * mPeriod + phase; ALOGV("[%s] t = %" PRId64, mName, ns2us(t)); t += mReferenceTime; ALOGV("[%s] Absolute t = %" PRId64, mName, ns2us(t)); // Check that it's been slightly more than half a period since the last // event so that we don't accidentally fall into double-rate vsyncs if (t - listener.mLastEventTime < (3 * mPeriod / 5)) { t += mPeriod; ALOGV("[%s] Modifying t -> %" PRId64, mName, ns2us(t)); nsecs_t ref) { nsecs_t lastEventTime = listener.mLastEventTime; if (ref < lastEventTime) { ref = lastEventTime; } t -= mWakeupLatency; ALOGV("[%s] Corrected for wakeup latency -> %" PRId64, mName, ns2us(t)); nsecs_t phase = mReferenceTime + mPhase + listener.mPhase; nsecs_t t = (((ref - phase) / mPeriod) + 1) * mPeriod + phase; if (t - listener.mLastEventTime < mPeriod / 2) { t += mPeriod; } return t; } void fireCallbackInvocations(const Vector<CallbackInvocation>& callbacks) { if (kTraceDetailedInfo) ATRACE_CALL(); for (size_t i = 0; i < callbacks.size(); i++) { callbacks[i].mCallback->onDispSyncEvent(callbacks[i].mEventTime); } } const char* const mName; bool mStop; nsecs_t mPeriod; Loading @@ -349,17 +271,12 @@ private: nsecs_t mReferenceTime; nsecs_t mWakeupLatency; int64_t mFrameNumber; Vector<EventListener> mEventListeners; Mutex mMutex; Condition mCond; }; #undef LOG_TAG #define LOG_TAG "DispSync" class ZeroPhaseTracer : public DispSync::Callback { public: ZeroPhaseTracer() : mParity(false) {} Loading @@ -373,10 +290,9 @@ private: bool mParity; }; DispSync::DispSync(const char* name) : mName(name), DispSync::DispSync() : mRefreshSkipCount(0), mThread(new DispSyncThread(name)) { mThread(new DispSyncThread()) { mThread->run("DispSync", PRIORITY_URGENT_DISPLAY + PRIORITY_MORE_FAVORABLE); Loading @@ -389,8 +305,8 @@ DispSync::DispSync(const char* name) : // Even if we're just ignoring the fences, the zero-phase tracing is // not needed because any time there is an event registered we will // turn on the HW vsync events. if (!kIgnorePresentFences && kEnableZeroPhaseTracer) { addEventListener("ZeroPhaseTracer", 0, new ZeroPhaseTracer()); if (!kIgnorePresentFences) { addEventListener(0, new ZeroPhaseTracer()); } } } Loading Loading @@ -435,7 +351,7 @@ bool DispSync::addPresentFence(const sp<Fence>& fence) { void DispSync::beginResync() { Mutex::Autolock lock(mMutex); ALOGV("[%s] beginResync", mName); mModelUpdated = false; mNumResyncSamples = 0; } Loading @@ -443,17 +359,11 @@ void DispSync::beginResync() { bool DispSync::addResyncSample(nsecs_t timestamp) { Mutex::Autolock lock(mMutex); ALOGV("[%s] addResyncSample(%" PRId64 ")", mName, ns2us(timestamp)); size_t idx = (mFirstResyncSample + mNumResyncSamples) % MAX_RESYNC_SAMPLES; mResyncSamples[idx] = timestamp; if (mNumResyncSamples == 0) { mPhase = 0; mReferenceTime = timestamp; ALOGV("[%s] First resync sample: mPeriod = %" PRId64 ", mPhase = 0, " "mReferenceTime = %" PRId64, mName, ns2us(mPeriod), ns2us(mReferenceTime)); mThread->updateModel(mPeriod, mPhase, mReferenceTime); } if (mNumResyncSamples < MAX_RESYNC_SAMPLES) { Loading @@ -477,21 +387,17 @@ bool DispSync::addResyncSample(nsecs_t timestamp) { return mThread->hasAnyEventListeners(); } // Check against kErrorThreshold / 2 to add some hysteresis before having to // resync again bool modelLocked = mModelUpdated && mError < (kErrorThreshold / 2); ALOGV("[%s] addResyncSample returning %s", mName, modelLocked ? "locked" : "unlocked"); return !modelLocked; return !mModelUpdated || mError > kErrorThreshold; } void DispSync::endResync() { } status_t DispSync::addEventListener(const char* name, nsecs_t phase, status_t DispSync::addEventListener(nsecs_t phase, const sp<Callback>& callback) { Mutex::Autolock lock(mMutex); return mThread->addEventListener(name, phase, callback); return mThread->addEventListener(phase, callback); } void DispSync::setRefreshSkipCount(int count) { Loading Loading @@ -521,32 +427,20 @@ nsecs_t DispSync::getPeriod() { } void DispSync::updateModelLocked() { ALOGV("[%s] updateModelLocked %zu", mName, mNumResyncSamples); if (mNumResyncSamples >= MIN_RESYNC_SAMPLES_FOR_UPDATE) { ALOGV("[%s] Computing...", mName); nsecs_t durationSum = 0; nsecs_t minDuration = INT64_MAX; nsecs_t maxDuration = 0; for (size_t i = 1; i < mNumResyncSamples; i++) { size_t idx = (mFirstResyncSample + i) % MAX_RESYNC_SAMPLES; size_t prev = (idx + MAX_RESYNC_SAMPLES - 1) % MAX_RESYNC_SAMPLES; nsecs_t duration = mResyncSamples[idx] - mResyncSamples[prev]; durationSum += duration; minDuration = min(minDuration, duration); maxDuration = max(maxDuration, duration); durationSum += mResyncSamples[idx] - mResyncSamples[prev]; } // Exclude the min and max from the average durationSum -= minDuration + maxDuration; mPeriod = durationSum / (mNumResyncSamples - 3); ALOGV("[%s] mPeriod = %" PRId64, mName, ns2us(mPeriod)); mPeriod = durationSum / (mNumResyncSamples - 1); double sampleAvgX = 0; double sampleAvgY = 0; double scale = 2.0 * M_PI / double(mPeriod); // Intentionally skip the first sample for (size_t i = 1; i < mNumResyncSamples; i++) { for (size_t i = 0; i < mNumResyncSamples; i++) { size_t idx = (mFirstResyncSample + i) % MAX_RESYNC_SAMPLES; nsecs_t sample = mResyncSamples[idx] - mReferenceTime; double samplePhase = double(sample % mPeriod) * scale; Loading @@ -554,21 +448,18 @@ void DispSync::updateModelLocked() { sampleAvgY += sin(samplePhase); } sampleAvgX /= double(mNumResyncSamples - 1); sampleAvgY /= double(mNumResyncSamples - 1); sampleAvgX /= double(mNumResyncSamples); sampleAvgY /= double(mNumResyncSamples); mPhase = nsecs_t(atan2(sampleAvgY, sampleAvgX) / scale); ALOGV("[%s] mPhase = %" PRId64, mName, ns2us(mPhase)); if (mPhase < -(mPeriod / 2)) { if (mPhase < 0) { mPhase += mPeriod; ALOGV("[%s] Adjusting mPhase -> %" PRId64, mName, ns2us(mPhase)); } if (kTraceDetailedInfo) { ATRACE_INT64("DispSync:Period", mPeriod); ATRACE_INT64("DispSync:Phase", mPhase + mPeriod / 2); ATRACE_INT64("DispSync:Phase", mPhase); } // Artificially inflate the period if requested. Loading services/surfaceflinger/DispSync.h +8 −8 Original line number Diff line number Diff line Loading @@ -26,8 +26,11 @@ namespace android { // Ignore present (retire) fences if the device doesn't have support for the // sync framework #if defined(RUNNING_WITHOUT_SYNC_FRAMEWORK) // sync framework, or if all phase offsets are zero. The latter is useful // because it allows us to avoid resync bursts on devices that don't need // phase-offset VSYNC events. #if defined(RUNNING_WITHOUT_SYNC_FRAMEWORK) || \ (VSYNC_EVENT_PHASE_OFFSET_NS == 0 && SF_VSYNC_EVENT_PHASE_OFFSET_NS == 0) static const bool kIgnorePresentFences = true; #else static const bool kIgnorePresentFences = false; Loading Loading @@ -61,7 +64,7 @@ public: virtual void onDispSyncEvent(nsecs_t when) = 0; }; DispSync(const char* name); DispSync(); ~DispSync(); // reset clears the resync samples and error value. Loading Loading @@ -111,8 +114,7 @@ public: // given phase offset from the hardware vsync events. The callback is // called from a separate thread and it should return reasonably quickly // (i.e. within a few hundred microseconds). status_t addEventListener(const char* name, nsecs_t phase, const sp<Callback>& callback); status_t addEventListener(nsecs_t phase, const sp<Callback>& callback); // removeEventListener removes an already-registered event callback. Once // this method returns that callback will no longer be called by the Loading @@ -135,12 +137,10 @@ private: void resetErrorLocked(); enum { MAX_RESYNC_SAMPLES = 32 }; enum { MIN_RESYNC_SAMPLES_FOR_UPDATE = 6 }; enum { MIN_RESYNC_SAMPLES_FOR_UPDATE = 3 }; enum { NUM_PRESENT_SAMPLES = 8 }; enum { MAX_RESYNC_SAMPLES_WITHOUT_PRESENT = 4 }; const char* const mName; // mPeriod is the computed period of the modeled vsync events in // nanoseconds. nsecs_t mPeriod; Loading services/surfaceflinger/EventThread.cpp +1 −5 Original line number Diff line number Diff line Loading @@ -44,9 +44,8 @@ static void vsyncOffCallback(union sigval val) { return; } EventThread::EventThread(const sp<VSyncSource>& src, SurfaceFlinger& flinger) EventThread::EventThread(const sp<VSyncSource>& src) : mVSyncSource(src), mFlinger(flinger), mUseSoftwareVSync(false), mVsyncEnabled(false), mDebugVsyncEnabled(false), Loading Loading @@ -127,9 +126,6 @@ void EventThread::setVsyncRate(uint32_t count, void EventThread::requestNextVsync( const sp<EventThread::Connection>& connection) { Mutex::Autolock _l(mLock); mFlinger.resyncWithRateLimit(); if (connection->count < 0) { connection->count = 0; mCondition.broadcast(); Loading services/surfaceflinger/EventThread.h +1 −2 Original line number Diff line number Diff line Loading @@ -77,7 +77,7 @@ class EventThread : public Thread, private VSyncSource::Callback { public: EventThread(const sp<VSyncSource>& src, SurfaceFlinger& flinger); EventThread(const sp<VSyncSource>& src); sp<Connection> createEventConnection() const; status_t registerDisplayEventConnection(const sp<Connection>& connection); Loading Loading @@ -116,7 +116,6 @@ private: // constants sp<VSyncSource> mVSyncSource; PowerHAL mPowerHAL; SurfaceFlinger& mFlinger; mutable Mutex mLock; mutable Condition mCondition; Loading services/surfaceflinger/SurfaceFlinger.cpp +7 −18 Original line number Diff line number Diff line Loading @@ -149,7 +149,6 @@ SurfaceFlinger::SurfaceFlinger() mLastTransactionTime(0), mBootFinished(false), mForceFullDamage(false), mPrimaryDispSync("PrimaryDispSync"), mPrimaryHWVsyncEnabled(false), mHWVsyncAvailable(false), mDaltonize(false), Loading Loading @@ -332,12 +331,11 @@ void SurfaceFlinger::deleteTextureAsync(uint32_t texture) { class DispSyncSource : public VSyncSource, private DispSync::Callback { public: DispSyncSource(DispSync* dispSync, nsecs_t phaseOffset, bool traceVsync, const char* name) : mName(name), const char* label) : mValue(0), mTraceVsync(traceVsync), mVsyncOnLabel(String8::format("VsyncOn-%s", name)), mVsyncEventLabel(String8::format("VSYNC-%s", name)), mVsyncOnLabel(String8::format("VsyncOn-%s", label)), mVsyncEventLabel(String8::format("VSYNC-%s", label)), mDispSync(dispSync), mCallbackMutex(), mCallback(), Loading @@ -350,7 +348,7 @@ public: virtual void setVSyncEnabled(bool enable) { Mutex::Autolock lock(mVsyncMutex); if (enable) { status_t err = mDispSync->addEventListener(mName, mPhaseOffset, status_t err = mDispSync->addEventListener(mPhaseOffset, static_cast<DispSync::Callback*>(this)); if (err != NO_ERROR) { ALOGE("error registering vsync callback: %s (%d)", Loading Loading @@ -401,7 +399,7 @@ public: } // Add a listener with the new offset err = mDispSync->addEventListener(mName, mPhaseOffset, err = mDispSync->addEventListener(mPhaseOffset, static_cast<DispSync::Callback*>(this)); if (err != NO_ERROR) { ALOGE("error registering vsync callback: %s (%d)", Loading @@ -427,8 +425,6 @@ private: } } const char* const mName; int mValue; const bool mTraceVsync; Loading Loading @@ -459,10 +455,10 @@ void SurfaceFlinger::init() { // start the EventThread sp<VSyncSource> vsyncSrc = new DispSyncSource(&mPrimaryDispSync, vsyncPhaseOffsetNs, true, "app"); mEventThread = new EventThread(vsyncSrc, *this); mEventThread = new EventThread(vsyncSrc); sp<VSyncSource> sfVsyncSrc = new DispSyncSource(&mPrimaryDispSync, sfVsyncPhaseOffsetNs, true, "sf"); mSFEventThread = new EventThread(sfVsyncSrc, *this); mSFEventThread = new EventThread(sfVsyncSrc); mEventQueue.setEventThread(mSFEventThread); // Get a RenderEngine for the given display / config (can't fail) Loading Loading @@ -831,13 +827,6 @@ void SurfaceFlinger::disableHardwareVsync(bool makeUnavailable) { } } void SurfaceFlinger::resyncWithRateLimit() { static constexpr nsecs_t kIgnoreDelay = ms2ns(500); if (systemTime() - mLastSwapTime > kIgnoreDelay) { resyncToHardwareVsync(true); } } void SurfaceFlinger::onVSyncReceived(int32_t type, nsecs_t timestamp) { bool needsHwVsync = false; Loading Loading
services/surfaceflinger/DispSync.cpp +39 −148 Original line number Diff line number Diff line Loading @@ -15,7 +15,6 @@ */ #define ATRACE_TAG ATRACE_TAG_GRAPHICS //#define LOG_NDEBUG 0 // This is needed for stdint.h to define INT64_MAX in C++ #define __STDC_LIMIT_MACROS Loading @@ -34,21 +33,12 @@ #include "DispSync.h" #include "EventLog/EventLog.h" #include <algorithm> using std::max; using std::min; namespace android { // Setting this to true enables verbose tracing that can be used to debug // vsync event model or phase issues. static const bool kTraceDetailedInfo = false; // Setting this to true adds a zero-phase tracer for correlating with hardware // vsync events static const bool kEnableZeroPhaseTracer = false; // This is the threshold used to determine when hardware vsync events are // needed to re-synchronize the software vsync model with the hardware. The // error metric used is the mean of the squared difference between each Loading @@ -59,36 +49,28 @@ static const nsecs_t kErrorThreshold = 160000000000; // 400 usec squared // vsync event. static const int64_t kPresentTimeOffset = PRESENT_TIME_OFFSET_FROM_VSYNC_NS; #undef LOG_TAG #define LOG_TAG "DispSyncThread" class DispSyncThread: public Thread { public: DispSyncThread(const char* name): mName(name), DispSyncThread(): mStop(false), mPeriod(0), mPhase(0), mReferenceTime(0), mWakeupLatency(0), mFrameNumber(0) {} mWakeupLatency(0) { } virtual ~DispSyncThread() {} void updateModel(nsecs_t period, nsecs_t phase, nsecs_t referenceTime) { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); mPeriod = period; mPhase = phase; mReferenceTime = referenceTime; ALOGV("[%s] updateModel: mPeriod = %" PRId64 ", mPhase = %" PRId64 " mReferenceTime = %" PRId64, mName, ns2us(mPeriod), ns2us(mPhase), ns2us(mReferenceTime)); mCond.signal(); } void stop() { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); mStop = true; mCond.signal(); Loading @@ -107,12 +89,6 @@ public: { // Scope for lock Mutex::Autolock lock(mMutex); if (kTraceDetailedInfo) { ATRACE_INT64("DispSync:Frame", mFrameNumber); } ALOGV("[%s] Frame %" PRId64, mName, mFrameNumber); ++mFrameNumber; if (mStop) { return false; } Loading @@ -133,9 +109,6 @@ public: bool isWakeup = false; if (now < targetTime) { ALOGV("[%s] Waiting until %" PRId64, mName, ns2us(targetTime)); if (kTraceDetailedInfo) ATRACE_NAME("DispSync waiting"); err = mCond.waitRelative(mMutex, targetTime - now); if (err == TIMED_OUT) { Loading @@ -149,15 +122,15 @@ public: now = systemTime(SYSTEM_TIME_MONOTONIC); // Don't correct by more than 1.5 ms static const nsecs_t kMaxWakeupLatency = us2ns(1500); if (isWakeup) { mWakeupLatency = ((mWakeupLatency * 63) + (now - targetTime)) / 64; mWakeupLatency = min(mWakeupLatency, kMaxWakeupLatency); if (mWakeupLatency > 500000) { // Don't correct by more than 500 us mWakeupLatency = 500000; } if (kTraceDetailedInfo) { ATRACE_INT64("DispSync:WakeupLat", now - targetTime); ATRACE_INT64("DispSync:WakeupLat", now - nextEventTime); ATRACE_INT64("DispSync:AvgWakeupLat", mWakeupLatency); } } Loading @@ -173,9 +146,7 @@ public: return false; } status_t addEventListener(const char* name, nsecs_t phase, const sp<DispSync::Callback>& callback) { if (kTraceDetailedInfo) ATRACE_CALL(); status_t addEventListener(nsecs_t phase, const sp<DispSync::Callback>& callback) { Mutex::Autolock lock(mMutex); for (size_t i = 0; i < mEventListeners.size(); i++) { Loading @@ -185,14 +156,15 @@ public: } EventListener listener; listener.mName = name; listener.mPhase = phase; listener.mCallback = callback; // We want to allow the firstmost future event to fire without // allowing any past events to fire listener.mLastEventTime = systemTime() - mPeriod / 2 + mPhase - mWakeupLatency; // allowing any past events to fire. Because // computeListenerNextEventTimeLocked filters out events within a half // a period of the last event time, we need to initialize the last // event time to a half a period in the past. listener.mLastEventTime = systemTime(SYSTEM_TIME_MONOTONIC) - mPeriod / 2; mEventListeners.push(listener); Loading @@ -202,7 +174,6 @@ public: } status_t removeEventListener(const sp<DispSync::Callback>& callback) { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); for (size_t i = 0; i < mEventListeners.size(); i++) { Loading @@ -218,7 +189,6 @@ public: // This method is only here to handle the kIgnorePresentFences case. bool hasAnyEventListeners() { if (kTraceDetailedInfo) ATRACE_CALL(); Mutex::Autolock lock(mMutex); return !mEventListeners.empty(); } Loading @@ -226,7 +196,6 @@ public: private: struct EventListener { const char* mName; nsecs_t mPhase; nsecs_t mLastEventTime; sp<DispSync::Callback> mCallback; Loading @@ -238,8 +207,6 @@ private: }; nsecs_t computeNextEventTimeLocked(nsecs_t now) { if (kTraceDetailedInfo) ATRACE_CALL(); ALOGV("[%s] computeNextEventTimeLocked", mName); nsecs_t nextEventTime = INT64_MAX; for (size_t i = 0; i < mEventListeners.size(); i++) { nsecs_t t = computeListenerNextEventTimeLocked(mEventListeners[i], Loading @@ -250,28 +217,21 @@ private: } } ALOGV("[%s] nextEventTime = %" PRId64, mName, ns2us(nextEventTime)); return nextEventTime; } Vector<CallbackInvocation> gatherCallbackInvocationsLocked(nsecs_t now) { if (kTraceDetailedInfo) ATRACE_CALL(); ALOGV("[%s] gatherCallbackInvocationsLocked @ %" PRId64, mName, ns2us(now)); Vector<CallbackInvocation> callbackInvocations; nsecs_t onePeriodAgo = now - mPeriod; nsecs_t ref = now - mPeriod; for (size_t i = 0; i < mEventListeners.size(); i++) { nsecs_t t = computeListenerNextEventTimeLocked(mEventListeners[i], onePeriodAgo); ref); if (t < now) { CallbackInvocation ci; ci.mCallback = mEventListeners[i].mCallback; ci.mEventTime = t; ALOGV("[%s] [%s] Preparing to fire", mName, mEventListeners[i].mName); callbackInvocations.push(ci); mEventListeners.editItemAt(i).mLastEventTime = t; } Loading @@ -281,67 +241,29 @@ private: } nsecs_t computeListenerNextEventTimeLocked(const EventListener& listener, nsecs_t baseTime) { if (kTraceDetailedInfo) ATRACE_CALL(); ALOGV("[%s] [%s] computeListenerNextEventTimeLocked(%" PRId64 ")", mName, listener.mName, ns2us(baseTime)); nsecs_t lastEventTime = listener.mLastEventTime + mWakeupLatency; ALOGV("[%s] lastEventTime: %" PRId64, mName, ns2us(lastEventTime)); if (baseTime < lastEventTime) { baseTime = lastEventTime; ALOGV("[%s] Clamping baseTime to lastEventTime -> %" PRId64, mName, ns2us(baseTime)); } baseTime -= mReferenceTime; ALOGV("[%s] Relative baseTime = %" PRId64, mName, ns2us(baseTime)); nsecs_t phase = mPhase + listener.mPhase; ALOGV("[%s] Phase = %" PRId64, mName, ns2us(phase)); baseTime -= phase; ALOGV("[%s] baseTime - phase = %" PRId64, mName, ns2us(baseTime)); // If our previous time is before the reference (because the reference // has since been updated), the division by mPeriod will truncate // towards zero instead of computing the floor. Since in all cases // before the reference we want the next time to be effectively now, we // set baseTime to -mPeriod so that numPeriods will be -1. // When we add 1 and the phase, we will be at the correct event time for // this period. if (baseTime < 0) { ALOGV("[%s] Correcting negative baseTime", mName); baseTime = -mPeriod; } nsecs_t numPeriods = baseTime / mPeriod; ALOGV("[%s] numPeriods = %" PRId64, mName, numPeriods); nsecs_t t = (numPeriods + 1) * mPeriod + phase; ALOGV("[%s] t = %" PRId64, mName, ns2us(t)); t += mReferenceTime; ALOGV("[%s] Absolute t = %" PRId64, mName, ns2us(t)); // Check that it's been slightly more than half a period since the last // event so that we don't accidentally fall into double-rate vsyncs if (t - listener.mLastEventTime < (3 * mPeriod / 5)) { t += mPeriod; ALOGV("[%s] Modifying t -> %" PRId64, mName, ns2us(t)); nsecs_t ref) { nsecs_t lastEventTime = listener.mLastEventTime; if (ref < lastEventTime) { ref = lastEventTime; } t -= mWakeupLatency; ALOGV("[%s] Corrected for wakeup latency -> %" PRId64, mName, ns2us(t)); nsecs_t phase = mReferenceTime + mPhase + listener.mPhase; nsecs_t t = (((ref - phase) / mPeriod) + 1) * mPeriod + phase; if (t - listener.mLastEventTime < mPeriod / 2) { t += mPeriod; } return t; } void fireCallbackInvocations(const Vector<CallbackInvocation>& callbacks) { if (kTraceDetailedInfo) ATRACE_CALL(); for (size_t i = 0; i < callbacks.size(); i++) { callbacks[i].mCallback->onDispSyncEvent(callbacks[i].mEventTime); } } const char* const mName; bool mStop; nsecs_t mPeriod; Loading @@ -349,17 +271,12 @@ private: nsecs_t mReferenceTime; nsecs_t mWakeupLatency; int64_t mFrameNumber; Vector<EventListener> mEventListeners; Mutex mMutex; Condition mCond; }; #undef LOG_TAG #define LOG_TAG "DispSync" class ZeroPhaseTracer : public DispSync::Callback { public: ZeroPhaseTracer() : mParity(false) {} Loading @@ -373,10 +290,9 @@ private: bool mParity; }; DispSync::DispSync(const char* name) : mName(name), DispSync::DispSync() : mRefreshSkipCount(0), mThread(new DispSyncThread(name)) { mThread(new DispSyncThread()) { mThread->run("DispSync", PRIORITY_URGENT_DISPLAY + PRIORITY_MORE_FAVORABLE); Loading @@ -389,8 +305,8 @@ DispSync::DispSync(const char* name) : // Even if we're just ignoring the fences, the zero-phase tracing is // not needed because any time there is an event registered we will // turn on the HW vsync events. if (!kIgnorePresentFences && kEnableZeroPhaseTracer) { addEventListener("ZeroPhaseTracer", 0, new ZeroPhaseTracer()); if (!kIgnorePresentFences) { addEventListener(0, new ZeroPhaseTracer()); } } } Loading Loading @@ -435,7 +351,7 @@ bool DispSync::addPresentFence(const sp<Fence>& fence) { void DispSync::beginResync() { Mutex::Autolock lock(mMutex); ALOGV("[%s] beginResync", mName); mModelUpdated = false; mNumResyncSamples = 0; } Loading @@ -443,17 +359,11 @@ void DispSync::beginResync() { bool DispSync::addResyncSample(nsecs_t timestamp) { Mutex::Autolock lock(mMutex); ALOGV("[%s] addResyncSample(%" PRId64 ")", mName, ns2us(timestamp)); size_t idx = (mFirstResyncSample + mNumResyncSamples) % MAX_RESYNC_SAMPLES; mResyncSamples[idx] = timestamp; if (mNumResyncSamples == 0) { mPhase = 0; mReferenceTime = timestamp; ALOGV("[%s] First resync sample: mPeriod = %" PRId64 ", mPhase = 0, " "mReferenceTime = %" PRId64, mName, ns2us(mPeriod), ns2us(mReferenceTime)); mThread->updateModel(mPeriod, mPhase, mReferenceTime); } if (mNumResyncSamples < MAX_RESYNC_SAMPLES) { Loading @@ -477,21 +387,17 @@ bool DispSync::addResyncSample(nsecs_t timestamp) { return mThread->hasAnyEventListeners(); } // Check against kErrorThreshold / 2 to add some hysteresis before having to // resync again bool modelLocked = mModelUpdated && mError < (kErrorThreshold / 2); ALOGV("[%s] addResyncSample returning %s", mName, modelLocked ? "locked" : "unlocked"); return !modelLocked; return !mModelUpdated || mError > kErrorThreshold; } void DispSync::endResync() { } status_t DispSync::addEventListener(const char* name, nsecs_t phase, status_t DispSync::addEventListener(nsecs_t phase, const sp<Callback>& callback) { Mutex::Autolock lock(mMutex); return mThread->addEventListener(name, phase, callback); return mThread->addEventListener(phase, callback); } void DispSync::setRefreshSkipCount(int count) { Loading Loading @@ -521,32 +427,20 @@ nsecs_t DispSync::getPeriod() { } void DispSync::updateModelLocked() { ALOGV("[%s] updateModelLocked %zu", mName, mNumResyncSamples); if (mNumResyncSamples >= MIN_RESYNC_SAMPLES_FOR_UPDATE) { ALOGV("[%s] Computing...", mName); nsecs_t durationSum = 0; nsecs_t minDuration = INT64_MAX; nsecs_t maxDuration = 0; for (size_t i = 1; i < mNumResyncSamples; i++) { size_t idx = (mFirstResyncSample + i) % MAX_RESYNC_SAMPLES; size_t prev = (idx + MAX_RESYNC_SAMPLES - 1) % MAX_RESYNC_SAMPLES; nsecs_t duration = mResyncSamples[idx] - mResyncSamples[prev]; durationSum += duration; minDuration = min(minDuration, duration); maxDuration = max(maxDuration, duration); durationSum += mResyncSamples[idx] - mResyncSamples[prev]; } // Exclude the min and max from the average durationSum -= minDuration + maxDuration; mPeriod = durationSum / (mNumResyncSamples - 3); ALOGV("[%s] mPeriod = %" PRId64, mName, ns2us(mPeriod)); mPeriod = durationSum / (mNumResyncSamples - 1); double sampleAvgX = 0; double sampleAvgY = 0; double scale = 2.0 * M_PI / double(mPeriod); // Intentionally skip the first sample for (size_t i = 1; i < mNumResyncSamples; i++) { for (size_t i = 0; i < mNumResyncSamples; i++) { size_t idx = (mFirstResyncSample + i) % MAX_RESYNC_SAMPLES; nsecs_t sample = mResyncSamples[idx] - mReferenceTime; double samplePhase = double(sample % mPeriod) * scale; Loading @@ -554,21 +448,18 @@ void DispSync::updateModelLocked() { sampleAvgY += sin(samplePhase); } sampleAvgX /= double(mNumResyncSamples - 1); sampleAvgY /= double(mNumResyncSamples - 1); sampleAvgX /= double(mNumResyncSamples); sampleAvgY /= double(mNumResyncSamples); mPhase = nsecs_t(atan2(sampleAvgY, sampleAvgX) / scale); ALOGV("[%s] mPhase = %" PRId64, mName, ns2us(mPhase)); if (mPhase < -(mPeriod / 2)) { if (mPhase < 0) { mPhase += mPeriod; ALOGV("[%s] Adjusting mPhase -> %" PRId64, mName, ns2us(mPhase)); } if (kTraceDetailedInfo) { ATRACE_INT64("DispSync:Period", mPeriod); ATRACE_INT64("DispSync:Phase", mPhase + mPeriod / 2); ATRACE_INT64("DispSync:Phase", mPhase); } // Artificially inflate the period if requested. Loading
services/surfaceflinger/DispSync.h +8 −8 Original line number Diff line number Diff line Loading @@ -26,8 +26,11 @@ namespace android { // Ignore present (retire) fences if the device doesn't have support for the // sync framework #if defined(RUNNING_WITHOUT_SYNC_FRAMEWORK) // sync framework, or if all phase offsets are zero. The latter is useful // because it allows us to avoid resync bursts on devices that don't need // phase-offset VSYNC events. #if defined(RUNNING_WITHOUT_SYNC_FRAMEWORK) || \ (VSYNC_EVENT_PHASE_OFFSET_NS == 0 && SF_VSYNC_EVENT_PHASE_OFFSET_NS == 0) static const bool kIgnorePresentFences = true; #else static const bool kIgnorePresentFences = false; Loading Loading @@ -61,7 +64,7 @@ public: virtual void onDispSyncEvent(nsecs_t when) = 0; }; DispSync(const char* name); DispSync(); ~DispSync(); // reset clears the resync samples and error value. Loading Loading @@ -111,8 +114,7 @@ public: // given phase offset from the hardware vsync events. The callback is // called from a separate thread and it should return reasonably quickly // (i.e. within a few hundred microseconds). status_t addEventListener(const char* name, nsecs_t phase, const sp<Callback>& callback); status_t addEventListener(nsecs_t phase, const sp<Callback>& callback); // removeEventListener removes an already-registered event callback. Once // this method returns that callback will no longer be called by the Loading @@ -135,12 +137,10 @@ private: void resetErrorLocked(); enum { MAX_RESYNC_SAMPLES = 32 }; enum { MIN_RESYNC_SAMPLES_FOR_UPDATE = 6 }; enum { MIN_RESYNC_SAMPLES_FOR_UPDATE = 3 }; enum { NUM_PRESENT_SAMPLES = 8 }; enum { MAX_RESYNC_SAMPLES_WITHOUT_PRESENT = 4 }; const char* const mName; // mPeriod is the computed period of the modeled vsync events in // nanoseconds. nsecs_t mPeriod; Loading
services/surfaceflinger/EventThread.cpp +1 −5 Original line number Diff line number Diff line Loading @@ -44,9 +44,8 @@ static void vsyncOffCallback(union sigval val) { return; } EventThread::EventThread(const sp<VSyncSource>& src, SurfaceFlinger& flinger) EventThread::EventThread(const sp<VSyncSource>& src) : mVSyncSource(src), mFlinger(flinger), mUseSoftwareVSync(false), mVsyncEnabled(false), mDebugVsyncEnabled(false), Loading Loading @@ -127,9 +126,6 @@ void EventThread::setVsyncRate(uint32_t count, void EventThread::requestNextVsync( const sp<EventThread::Connection>& connection) { Mutex::Autolock _l(mLock); mFlinger.resyncWithRateLimit(); if (connection->count < 0) { connection->count = 0; mCondition.broadcast(); Loading
services/surfaceflinger/EventThread.h +1 −2 Original line number Diff line number Diff line Loading @@ -77,7 +77,7 @@ class EventThread : public Thread, private VSyncSource::Callback { public: EventThread(const sp<VSyncSource>& src, SurfaceFlinger& flinger); EventThread(const sp<VSyncSource>& src); sp<Connection> createEventConnection() const; status_t registerDisplayEventConnection(const sp<Connection>& connection); Loading Loading @@ -116,7 +116,6 @@ private: // constants sp<VSyncSource> mVSyncSource; PowerHAL mPowerHAL; SurfaceFlinger& mFlinger; mutable Mutex mLock; mutable Condition mCondition; Loading
services/surfaceflinger/SurfaceFlinger.cpp +7 −18 Original line number Diff line number Diff line Loading @@ -149,7 +149,6 @@ SurfaceFlinger::SurfaceFlinger() mLastTransactionTime(0), mBootFinished(false), mForceFullDamage(false), mPrimaryDispSync("PrimaryDispSync"), mPrimaryHWVsyncEnabled(false), mHWVsyncAvailable(false), mDaltonize(false), Loading Loading @@ -332,12 +331,11 @@ void SurfaceFlinger::deleteTextureAsync(uint32_t texture) { class DispSyncSource : public VSyncSource, private DispSync::Callback { public: DispSyncSource(DispSync* dispSync, nsecs_t phaseOffset, bool traceVsync, const char* name) : mName(name), const char* label) : mValue(0), mTraceVsync(traceVsync), mVsyncOnLabel(String8::format("VsyncOn-%s", name)), mVsyncEventLabel(String8::format("VSYNC-%s", name)), mVsyncOnLabel(String8::format("VsyncOn-%s", label)), mVsyncEventLabel(String8::format("VSYNC-%s", label)), mDispSync(dispSync), mCallbackMutex(), mCallback(), Loading @@ -350,7 +348,7 @@ public: virtual void setVSyncEnabled(bool enable) { Mutex::Autolock lock(mVsyncMutex); if (enable) { status_t err = mDispSync->addEventListener(mName, mPhaseOffset, status_t err = mDispSync->addEventListener(mPhaseOffset, static_cast<DispSync::Callback*>(this)); if (err != NO_ERROR) { ALOGE("error registering vsync callback: %s (%d)", Loading Loading @@ -401,7 +399,7 @@ public: } // Add a listener with the new offset err = mDispSync->addEventListener(mName, mPhaseOffset, err = mDispSync->addEventListener(mPhaseOffset, static_cast<DispSync::Callback*>(this)); if (err != NO_ERROR) { ALOGE("error registering vsync callback: %s (%d)", Loading @@ -427,8 +425,6 @@ private: } } const char* const mName; int mValue; const bool mTraceVsync; Loading Loading @@ -459,10 +455,10 @@ void SurfaceFlinger::init() { // start the EventThread sp<VSyncSource> vsyncSrc = new DispSyncSource(&mPrimaryDispSync, vsyncPhaseOffsetNs, true, "app"); mEventThread = new EventThread(vsyncSrc, *this); mEventThread = new EventThread(vsyncSrc); sp<VSyncSource> sfVsyncSrc = new DispSyncSource(&mPrimaryDispSync, sfVsyncPhaseOffsetNs, true, "sf"); mSFEventThread = new EventThread(sfVsyncSrc, *this); mSFEventThread = new EventThread(sfVsyncSrc); mEventQueue.setEventThread(mSFEventThread); // Get a RenderEngine for the given display / config (can't fail) Loading Loading @@ -831,13 +827,6 @@ void SurfaceFlinger::disableHardwareVsync(bool makeUnavailable) { } } void SurfaceFlinger::resyncWithRateLimit() { static constexpr nsecs_t kIgnoreDelay = ms2ns(500); if (systemTime() - mLastSwapTime > kIgnoreDelay) { resyncToHardwareVsync(true); } } void SurfaceFlinger::onVSyncReceived(int32_t type, nsecs_t timestamp) { bool needsHwVsync = false; Loading