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

Commit 3cb54987 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logd: 64-bit compile issue 

- ULONG_MAX is used against an uint32
- Add tv_sec_max and tv_nsec_max constants to log_time

Change-Id: Ic86cd7b0680868ad0536198b71a34cb19134fc22
parent f1a8dfa0

include/log/log_read.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ public: 
    uint32_t tv_sec; // good to Feb 5 2106

    uint32_t tv_sec; // good to Feb 5 2106

    uint32_t tv_nsec;

    uint32_t tv_nsec;





    static const uint32_t tv_sec_max = 0xFFFFFFFFUL;

    static const uint32_t tv_nsec_max = 999999999UL;



    log_time(const timespec &T)

    log_time(const timespec &T)

    {

    {

        tv_sec = T.tv_sec;

        tv_sec = T.tv_sec;

logd/LogStatistics.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -392,8 +392,8 @@ LogStatistics::LogStatistics() 




    dgram_qlen_statistics = false;

    dgram_qlen_statistics = false;

    for(unsigned short bucket = 0; dgram_qlen(bucket); ++bucket) {

    for(unsigned short bucket = 0; dgram_qlen(bucket); ++bucket) {

        mMinimum[bucket].tv_sec = (uint32_t)-1;

        mMinimum[bucket].tv_sec = mMinimum[bucket].tv_sec_max;

        mMinimum[bucket].tv_nsec = 999999999UL;

        mMinimum[bucket].tv_nsec = mMinimum[bucket].tv_nsec_max;

    }

    }

}

}
@@ -439,7 +439,7 @@ unsigned short LogStatistics::dgram_qlen(unsigned short bucket) { 
}

}





unsigned long long LogStatistics::minimum(unsigned short bucket) {

unsigned long long LogStatistics::minimum(unsigned short bucket) {

    if (mMinimum[bucket].tv_sec == LONG_MAX) {

    if (mMinimum[bucket].tv_sec == mMinimum[bucket].tv_sec_max) {

        return 0;

        return 0;

    }

    }

    return mMinimum[bucket].nsec();

    return mMinimum[bucket].nsec();