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

Commit ba35f861 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "[sf] fix transaction tracing path typo" into udc-qpr-dev am: 8c5933e9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23787849



Change-Id: I1b97f9ab0d0bb2dcf520f5ad814d08463c057c8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e22a6b77 8c5933e9

services/surfaceflinger/SurfaceFlinger.cpp

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

#include <utils/misc.h>



#include <unistd.h>

#include <algorithm>

#include <cerrno>

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

                const std::string filename =

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

                if (overwrite) {

                    std::ifstream file(filename);

                    if (file.is_open()) {

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

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

                    return;

                }

                }

                mTransactionTracing->flush();

                mTransactionTracing->writeToFile(filename);

            };

services/surfaceflinger/Tracing/TransactionTracing.h

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



    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";



    mutable std::mutex mTraceLock;