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

Commit 621c74c0 authored by Ray Ye's avatar Ray Ye
Browse files

Updating async trace for track trace symbols from T/U to G/H 

Bug: 230399626
Test: atest TraceDevTest
Ignore-AOSP-First: Change from aosp/2078467 without ABI change
Change-Id: Ia927c19f544536f78c20ccef5830bd1be0cebf9b
Merged-In: Ia1b39f55c96011a9672f4d5c8763044f849d0bb2
parent ae04e7ed

libcutils/trace-container.cpp

+4 −4
Original line number Diff line number Diff line
@@ -231,24 +231,24 @@ void atrace_async_end_body(const char* name, int32_t cookie) 


void atrace_async_for_track_begin_body(const char* track_name, const char* name, int32_t cookie) {

    if (CC_LIKELY(atrace_use_container_sock)) {

        WRITE_MSG_IN_CONTAINER("T", "|", "|%d", track_name, name, cookie);

        WRITE_MSG_IN_CONTAINER("G", "|", "|%d", track_name, name, cookie);

        return;

    }



    if (atrace_marker_fd < 0) return;



    WRITE_MSG("T|%d|", "|%" PRId32, track_name, name, cookie);

    WRITE_MSG("G|%d|", "|%" PRId32, track_name, name, cookie);

}



void atrace_async_for_track_end_body(const char* track_name, const char* name, int32_t cookie) {

    if (CC_LIKELY(atrace_use_container_sock)) {

        WRITE_MSG_IN_CONTAINER("U", "|", "|%d", track_name, name, cookie);

        WRITE_MSG_IN_CONTAINER("H", "|", "|%d", track_name, name, cookie);

        return;

    }



    if (atrace_marker_fd < 0) return;



    WRITE_MSG("U|%d|", "|%" PRId32, track_name, name, cookie);

    WRITE_MSG("H|%d|", "|%" PRId32, track_name, name, cookie);

}



void atrace_instant_body(const char* name) {

libcutils/trace-dev.cpp

+2 −2
Original line number Diff line number Diff line
@@ -90,11 +90,11 @@ void atrace_async_end_body(const char* name, int32_t cookie) 
}



void atrace_async_for_track_begin_body(const char* track_name, const char* name, int32_t cookie) {

    WRITE_MSG("T|%d|", "|%" PRId32, track_name, name, cookie);

    WRITE_MSG("G|%d|", "|%" PRId32, track_name, name, cookie);

}



void atrace_async_for_track_end_body(const char* track_name, const char* name, int32_t cookie) {

    WRITE_MSG("U|%d|", "|%" PRId32, track_name, name, cookie);

    WRITE_MSG("H|%d|", "|%" PRId32, track_name, name, cookie);

}



void atrace_instant_body(const char* name) {

libcutils/trace-dev_test.cpp

+14 −14
Original line number Diff line number Diff line
@@ -202,13 +202,13 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_normal) { 


    std::string actual;

    ASSERT_TRUE(android::base::ReadFdToString(atrace_marker_fd, &actual));

    std::string expected = android::base::StringPrintf("T|%d|fake_track|fake_name|12345", getpid());

    std::string expected = android::base::StringPrintf("G|%d|fake_track|fake_name|12345", getpid());

    ASSERT_STREQ(expected.c_str(), actual.c_str());

}



TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_track_name) {

    const int name_size = 5;

    std::string expected = android::base::StringPrintf("T|%d|", getpid());

    std::string expected = android::base::StringPrintf("G|%d|", getpid());

    std::string track_name =

            MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - name_size - 6);

    atrace_async_for_track_begin_body(track_name.c_str(), "name", 12345);
@@ -224,7 +224,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_track_name) { 
    // Add a single character and verify name truncation

    ASSERT_EQ(0, lseek(atrace_marker_fd, 0, SEEK_SET));

    track_name += '*';

    expected = android::base::StringPrintf("T|%d|", getpid());

    expected = android::base::StringPrintf("G|%d|", getpid());

    expected += track_name + "|nam|12345";

    atrace_async_for_track_begin_body(track_name.c_str(), "name", 12345);

    EXPECT_EQ(ATRACE_MESSAGE_LENGTH - 1, lseek(atrace_marker_fd, 0, SEEK_CUR));
@@ -234,7 +234,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_track_name) { 
}



TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_track_name) {

    std::string expected = android::base::StringPrintf("T|%d|", getpid());

    std::string expected = android::base::StringPrintf("G|%d|", getpid());

    std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    atrace_async_for_track_begin_body(track_name.c_str(), "name", 12345);
@@ -250,7 +250,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_track_name) { 


TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_name) {

    const int track_name_size = 11;

    std::string expected = android::base::StringPrintf("T|%d|", getpid());

    std::string expected = android::base::StringPrintf("G|%d|", getpid());

    std::string name =

            MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - track_name_size - 6);

    atrace_async_for_track_begin_body("track_name", name.c_str(), 12345);
@@ -274,7 +274,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_name) { 
}



TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_name) {

    std::string expected = android::base::StringPrintf("T|%d|track_name|", getpid());

    std::string expected = android::base::StringPrintf("G|%d|track_name|", getpid());

    std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    atrace_async_for_track_begin_body("track_name", name.c_str(), 12345);
@@ -289,7 +289,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_name) { 
}



TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_both) {

    std::string expected = android::base::StringPrintf("T|%d|", getpid());

    std::string expected = android::base::StringPrintf("G|%d|", getpid());

    std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    atrace_async_for_track_begin_body(track_name.c_str(), name.c_str(), 12345);
@@ -312,13 +312,13 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_normal) { 


    std::string actual;

    ASSERT_TRUE(android::base::ReadFdToString(atrace_marker_fd, &actual));

    std::string expected = android::base::StringPrintf("U|%d|fake_track|fake_name|12345", getpid());

    std::string expected = android::base::StringPrintf("H|%d|fake_track|fake_name|12345", getpid());

    ASSERT_STREQ(expected.c_str(), actual.c_str());

}



TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_track_name) {

    const int name_size = 5;

    std::string expected = android::base::StringPrintf("U|%d|", getpid());

    std::string expected = android::base::StringPrintf("H|%d|", getpid());

    std::string track_name =

            MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - name_size - 6);

    atrace_async_for_track_end_body(track_name.c_str(), "name", 12345);
@@ -334,7 +334,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_track_name) { 
    // Add a single character and verify name truncation

    ASSERT_EQ(0, lseek(atrace_marker_fd, 0, SEEK_SET));

    track_name += '*';

    expected = android::base::StringPrintf("U|%d|", getpid());

    expected = android::base::StringPrintf("H|%d|", getpid());

    expected += track_name + "|nam|12345";

    atrace_async_for_track_end_body(track_name.c_str(), "name", 12345);

    EXPECT_EQ(ATRACE_MESSAGE_LENGTH - 1, lseek(atrace_marker_fd, 0, SEEK_CUR));
@@ -344,7 +344,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_track_name) { 
}



TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_track_name) {

    std::string expected = android::base::StringPrintf("U|%d|", getpid());

    std::string expected = android::base::StringPrintf("H|%d|", getpid());

    std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    atrace_async_for_track_end_body(track_name.c_str(), "name", 12345);
@@ -360,7 +360,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_track_name) { 


TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_name) {

    const int track_name_size = 11;

    std::string expected = android::base::StringPrintf("U|%d|", getpid());

    std::string expected = android::base::StringPrintf("H|%d|", getpid());

    std::string name =

            MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - track_name_size - 6);

    atrace_async_for_track_end_body("track_name", name.c_str(), 12345);
@@ -384,7 +384,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_name) { 
}



TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_name) {

    std::string expected = android::base::StringPrintf("U|%d|track_name|", getpid());

    std::string expected = android::base::StringPrintf("H|%d|track_name|", getpid());

    std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    atrace_async_for_track_end_body("track_name", name.c_str(), 12345);
@@ -399,7 +399,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_name) { 
}



TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_both) {

    std::string expected = android::base::StringPrintf("U|%d|", getpid());

    std::string expected = android::base::StringPrintf("H|%d|", getpid());

    std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH);

    atrace_async_for_track_end_body(track_name.c_str(), name.c_str(), 12345);