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

Commit 6b5da8cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Enforce a size limitation on SurfaceTracing"

parents 63160403 adc69617

services/surfaceflinger/SurfaceFlinger.cpp

+8 −2
Original line number Diff line number Diff line
@@ -4686,6 +4686,12 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, 
    }

    result.append("\n");



    /*

     * Tracing state

     */

    mTracing.dump(result);

    result.append("\n");



    /*

     * HWC layer minidump

     */
@@ -5075,12 +5081,12 @@ status_t SurfaceFlinger::onTransact(uint32_t code, const Parcel& data, Parcel* r 
            case 1025: { // Set layer tracing

                n = data.readInt32();

                if (n) {

                    ALOGV("LayerTracing enabled");

                    ALOGD("LayerTracing enabled");

                    mTracing.enable();

                    doTracing("tracing.enable");

                    reply->writeInt32(NO_ERROR);

                } else {

                    ALOGV("LayerTracing disabled");

                    ALOGD("LayerTracing disabled");

                    status_t err = mTracing.disable();

                    reply->writeInt32(err);

                }

services/surfaceflinger/SurfaceTracing.cpp

+17 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ status_t SurfaceTracing::disable() { 
    return err;

}



bool SurfaceTracing::isEnabled() {

bool SurfaceTracing::isEnabled() const {

    return mEnabled;

}
@@ -65,6 +65,15 @@ void SurfaceTracing::traceLayers(const char* where, LayersProto layers) { 
    entry->set_elapsed_realtime_nanos(elapsedRealtimeNano());

    entry->set_where(where);

    entry->mutable_layers()->Swap(&layers);



    constexpr int maxBufferedEntryCount = 3600;

    if (mTrace.entry_size() >= maxBufferedEntryCount) {

        // TODO: flush buffered entries without disabling tracing

        ALOGE("too many buffered frames; force disable tracing");

        mEnabled = false;

        writeProtoFileLocked();

        mTrace.Clear();

    }

}



status_t SurfaceTracing::writeProtoFileLocked() {
@@ -84,4 +93,11 @@ status_t SurfaceTracing::writeProtoFileLocked() { 
    return NO_ERROR;

}



void SurfaceTracing::dump(String8& result) const {

    std::lock_guard<std::mutex> protoGuard(mTraceMutex);



    result.appendFormat("Tracing state: %s\n", mEnabled ? "enabled" : "disabled");

    result.appendFormat("  number of entries: %d\n", mTrace.entry_size());

}



} // namespace android

services/surfaceflinger/SurfaceTracing.h

+4 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <layerproto/LayerProtoHeader.h>

#include <utils/Errors.h>

#include <utils/String8.h>



#include <mutex>
@@ -32,9 +33,10 @@ class SurfaceTracing { 
public:

    void enable();

    status_t disable();

    bool isEnabled();

    bool isEnabled() const;



    void traceLayers(const char* where, LayersProto);

    void dump(String8& result) const;



private:

    static constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/layers_trace.pb";
@@ -43,7 +45,7 @@ private: 


    bool mEnabled = false;

    std::string mOutputFileName = DEFAULT_FILENAME;

    std::mutex mTraceMutex;

    mutable std::mutex mTraceMutex;

    LayersTraceFileProto mTrace;

};