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

Commit 8c5933e9 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "[sf] fix transaction tracing path typo" into udc-qpr-dev

parents e371d683 249fd7f0

services/surfaceflinger/SurfaceFlinger.cpp

+4 −5
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ 
#include <utils/Timers.h>

#include <utils/Timers.h>

#include <utils/misc.h>

#include <utils/misc.h>





#include <unistd.h>

#include <algorithm>

#include <algorithm>

#include <cerrno>

#include <cerrno>

#include <cinttypes>

#include <cinttypes>
@@ -916,12 +917,10 @@ void SurfaceFlinger::init() FTL_FAKE_GUARD(kMainThreadContext) { 
            auto writeFn = [&]() {

            auto writeFn = [&]() {

                const std::string filename =

                const std::string filename =

                        TransactionTracing::DIR_NAME + prefix + TransactionTracing::FILE_NAME;

                        TransactionTracing::DIR_NAME + prefix + TransactionTracing::FILE_NAME;

                if (overwrite) {

                if (overwrite && access(filename.c_str(), F_OK) == 0) {

                    std::ifstream file(filename);

                    ALOGD("TransactionTraceWriter: file=%s already exists", filename.c_str());

                    if (file.is_open()) {

                    return;

                    return;

                }

                }

                }

                mTransactionTracing->flush();

                mTransactionTracing->flush();

                mTransactionTracing->writeToFile(filename);

                mTransactionTracing->writeToFile(filename);

            };

            };

services/surfaceflinger/Tracing/TransactionTracing.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ private: 
    friend class SurfaceFlinger;

    friend class SurfaceFlinger;





    static constexpr auto DIR_NAME = "/data/misc/wmtrace/";

    static constexpr auto DIR_NAME = "/data/misc/wmtrace/";

    static constexpr auto FILE_NAME = "/transactions_trace.winscope";

    static constexpr auto FILE_NAME = "transactions_trace.winscope";

    static constexpr auto FILE_PATH = "/data/misc/wmtrace/transactions_trace.winscope";

    static constexpr auto FILE_PATH = "/data/misc/wmtrace/transactions_trace.winscope";





    mutable std::mutex mTraceLock;

    mutable std::mutex mTraceLock;