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

Commit 31739e5f authored by Ruchir Rastogi's avatar Ruchir Rastogi
Browse files

Use default LogEvent copy constructor 

This prevents subtle bugs from being introduced when more member
variables, such as annotations, are added to LogEvent.

Test: m statsd
Test: atest statsd_test
Test: atest GtsStatsdHostTestCases
Bug: 156312371
Change-Id: Ibb5366e8658d6c99e5730b4bc301190655bbd245
parent 75aeabdd

cmds/statsd/src/logd/LogEvent.cpp

+0 −9
Original line number Diff line number Diff line
@@ -66,15 +66,6 @@ using std::vector; 
#define ATTRIBUTION_CHAIN_TYPE 0x09

#define ERROR_TYPE 0x0F



LogEvent::LogEvent(const LogEvent& event) {

    mTagId = event.mTagId;

    mLogUid = event.mLogUid;

    mLogPid = event.mLogPid;

    mElapsedTimestampNs = event.mElapsedTimestampNs;

    mLogdTimestampNs = event.mLogdTimestampNs;

    mValues = event.mValues;

}



LogEvent::LogEvent(int32_t uid, int32_t pid)

    : mLogdTimestampNs(time(nullptr)), mLogUid(uid), mLogPid(pid) {

}

cmds/statsd/src/logd/LogEvent.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ private: 
    /**

     * Only use this if copy is absolutely needed.

     */

    LogEvent(const LogEvent&);

    LogEvent(const LogEvent&) = default;



    void parseInt32(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);

    void parseInt64(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);