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

Commit a8de48c6 authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Add tracepoints to dumpstate sections" am: 8e60888b am: 3708e1c3 am: ff5b946a 

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



Change-Id: I2914cbfc6f768b9f8d4bf48909bd09187deeeba7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5e8458a ff5b946a

cmds/dumpstate/dumpstate.cpp

+10 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#define LOG_TAG "dumpstate"

#define ATRACE_TAG ATRACE_TAG_ALWAYS



#include <dirent.h>

#include <errno.h>
@@ -76,6 +77,7 @@ 
#include <cutils/native_handle.h>

#include <cutils/properties.h>

#include <cutils/sockets.h>

#include <cutils/trace.h>

#include <debuggerd/client.h>

#include <dumpsys.h>

#include <dumputils/dump_utils.h>
@@ -3098,7 +3100,9 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, 
    TEMP_FAILURE_RETRY(dup2(dup_stdout_fd, fileno(stdout)));



    // Zip the (now complete) .tmp file within the internal directory.

    ATRACE_BEGIN("FinalizeFile");

    FinalizeFile();

    ATRACE_END();



    // Share the final file with the caller if the user has consented or Shell is the caller.

    Dumpstate::RunStatus status = Dumpstate::RunStatus::OK;
@@ -3409,6 +3413,9 @@ DurationReporter::DurationReporter(const std::string& title, bool logcat_only, b 
        duration_fd_(duration_fd) {

    if (!title_.empty()) {

        started_ = Nanotime();

        if (title_.find("SHOW MAP") == std::string::npos) {

            ATRACE_ASYNC_BEGIN(title_.c_str(), 0);

        }

    }

}
@@ -3423,6 +3430,9 @@ DurationReporter::~DurationReporter() { 
            dprintf(duration_fd_, "------ %.3fs was the duration of '%s' ------\n",

                    elapsed, title_.c_str());

        }

        if (title_.find("SHOW MAP") == std::string::npos) {

            ATRACE_ASYNC_END(title_.c_str(), 0);

        }

    }

}