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

Commit 8d452f1c authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Check clock_gettime(CLOCK_MONOTONIC) for failure" into jb-mr1-dev

parents c0c3b298 80b3273c

media/libnbaio/MonoPipe.cpp

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ ssize_t MonoPipe::write(const void *buffer, size_t count) 
        if (nowTsValid && mWriteTsValid) {

            time_t sec = nowTs.tv_sec - mWriteTs.tv_sec;

            long nsec = nowTs.tv_nsec - mWriteTs.tv_nsec;

            ALOGE_IF(sec < 0 || (sec == 0 && nsec < 0),

                    "clock_gettime(CLOCK_MONOTONIC) failed: was %ld.%09ld but now %ld.%09ld",

                    mWriteTs.tv_sec, mWriteTs.tv_nsec, nowTs.tv_sec, nowTs.tv_nsec);

            if (nsec < 0) {

                --sec;

                nsec += 1000000000;

services/audioflinger/FastMixer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -454,6 +454,9 @@ bool FastMixer::threadLoop() 
            if (oldTsValid) {

                time_t sec = newTs.tv_sec - oldTs.tv_sec;

                long nsec = newTs.tv_nsec - oldTs.tv_nsec;

                ALOGE_IF(sec < 0 || (sec == 0 && nsec < 0),

                        "clock_gettime(CLOCK_MONOTONIC) failed: was %ld.%09ld but now %ld.%09ld",

                        oldTs.tv_sec, oldTs.tv_nsec, newTs.tv_sec, newTs.tv_nsec);

                if (nsec < 0) {

                    --sec;

                    nsec += 1000000000;