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

Commit d5516339 authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Move frameworks/av from fdprintf to POSIX dprintf."

parents 85e6e87c 8b5f642e

media/libnbaio/NBLog.cpp

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ void NBLog::Reader::dump(int fd, size_t indent) 
void NBLog::Reader::dumpLine(const String8& timestamp, String8& body)

{

    if (mFd >= 0) {

        fdprintf(mFd, "%.*s%s %s\n", mIndent, "", timestamp.string(), body.string());

        dprintf(mFd, "%.*s%s %s\n", mIndent, "", timestamp.string(), body.string());

    } else {

        ALOGI("%.*s%s %s", mIndent, "", timestamp.string(), body.string());

    }

services/audioflinger/AudioFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ status_t AudioFlinger::dump(int fd, const Vector<String16>& args) 
        if (mLogMemoryDealer != 0) {

            sp<IBinder> binder = defaultServiceManager()->getService(String16("media.log"));

            if (binder != 0) {

                fdprintf(fd, "\nmedia.log:\n");

                dprintf(fd, "\nmedia.log:\n");

                Vector<String16> args;

                binder->dump(fd, args);

            }
@@ -2460,7 +2460,7 @@ void AudioFlinger::dumpTee(int fd, const sp<NBAIO_Source>& source, audio_io_hand 
            }

        } else {

            if (fd >= 0) {

                fdprintf(fd, "unable to rotate tees in %s: %s\n", teePath, strerror(errno));

                dprintf(fd, "unable to rotate tees in %s: %s\n", teePath, strerror(errno));

            }

        }

        char teeTime[16];
@@ -2514,11 +2514,11 @@ void AudioFlinger::dumpTee(int fd, const sp<NBAIO_Source>& source, audio_io_hand 
            write(teeFd, &temp, sizeof(temp));

            close(teeFd);

            if (fd >= 0) {

                fdprintf(fd, "tee copied to %s\n", teePath);

                dprintf(fd, "tee copied to %s\n", teePath);

            }

        } else {

            if (fd >= 0) {

                fdprintf(fd, "unable to create tee %s: %s\n", teePath, strerror(errno));

                dprintf(fd, "unable to create tee %s: %s\n", teePath, strerror(errno));

            }

        }

    }

services/audioflinger/AudioWatchdog.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void AudioWatchdogDump::dump(int fd) 
    } else {

        strcpy(buf, "N/A\n");

    }

    fdprintf(fd, "Watchdog: underruns=%u, logs=%u, most recent underrun log at %s",

    dprintf(fd, "Watchdog: underruns=%u, logs=%u, most recent underrun log at %s",

            mUnderruns, mLogs, buf);

}

services/audioflinger/FastMixer.cpp

+25 −25
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static int compare_uint32_t(const void *pa, const void *pb) 
void FastMixerDumpState::dump(int fd) const

{

    if (mCommand == FastMixerState::INITIAL) {

        fdprintf(fd, "FastMixer not initialized\n");

        dprintf(fd, "FastMixer not initialized\n");

        return;

    }

#define COMMAND_MAX 32
@@ -729,7 +729,7 @@ void FastMixerDumpState::dump(int fd) const 
    double measuredWarmupMs = (mMeasuredWarmupTs.tv_sec * 1000.0) +

            (mMeasuredWarmupTs.tv_nsec / 1000000.0);

    double mixPeriodSec = (double) mFrameCount / (double) mSampleRate;

    fdprintf(fd, "FastMixer command=%s writeSequence=%u framesWritten=%u\n"

    dprintf(fd, "FastMixer command=%s writeSequence=%u framesWritten=%u\n"

                 "          numTracks=%u writeErrors=%u underruns=%u overruns=%u\n"

                 "          sampleRate=%u frameCount=%zu measuredWarmup=%.3g ms, warmupCycles=%u\n"

                 "          mixPeriod=%.2f ms\n",
@@ -783,19 +783,19 @@ void FastMixerDumpState::dump(int fd) const 
        previousCpukHz = sampleCpukHz;

#endif

    }

    fdprintf(fd, "Simple moving statistics over last %.1f seconds:\n", wall.n() * mixPeriodSec);

    fdprintf(fd, "  wall clock time in ms per mix cycle:\n"

    dprintf(fd, "Simple moving statistics over last %.1f seconds:\n", wall.n() * mixPeriodSec);

    dprintf(fd, "  wall clock time in ms per mix cycle:\n"

                "    mean=%.2f min=%.2f max=%.2f stddev=%.2f\n",

                wall.mean()*1e-6, wall.minimum()*1e-6, wall.maximum()*1e-6, wall.stddev()*1e-6);

    fdprintf(fd, "  raw CPU load in us per mix cycle:\n"

    dprintf(fd, "  raw CPU load in us per mix cycle:\n"

                "    mean=%.0f min=%.0f max=%.0f stddev=%.0f\n",

                loadNs.mean()*1e-3, loadNs.minimum()*1e-3, loadNs.maximum()*1e-3,

                loadNs.stddev()*1e-3);

#ifdef CPU_FREQUENCY_STATISTICS

    fdprintf(fd, "  CPU clock frequency in MHz:\n"

    dprintf(fd, "  CPU clock frequency in MHz:\n"

                "    mean=%.0f min=%.0f max=%.0f stddev=%.0f\n",

                kHz.mean()*1e-3, kHz.minimum()*1e-3, kHz.maximum()*1e-3, kHz.stddev()*1e-3);

    fdprintf(fd, "  adjusted CPU load in MHz (i.e. normalized for CPU clock frequency):\n"

    dprintf(fd, "  adjusted CPU load in MHz (i.e. normalized for CPU clock frequency):\n"

                "    mean=%.1f min=%.1f max=%.1f stddev=%.1f\n",

                loadMHz.mean(), loadMHz.minimum(), loadMHz.maximum(), loadMHz.stddev());

#endif
@@ -808,7 +808,7 @@ void FastMixerDumpState::dump(int fd) const 
            left.sample(tail[i]);

            right.sample(tail[n - (i + 1)]);

        }

        fdprintf(fd, "Distribution of mix cycle times in ms for the tails (> ~3 stddev outliers):\n"

        dprintf(fd, "Distribution of mix cycle times in ms for the tails (> ~3 stddev outliers):\n"

                    "  left tail: mean=%.2f min=%.2f max=%.2f stddev=%.2f\n"

                    "  right tail: mean=%.2f min=%.2f max=%.2f stddev=%.2f\n",

                    left.mean()*1e-6, left.minimum()*1e-6, left.maximum()*1e-6, left.stddev()*1e-6,
@@ -823,9 +823,9 @@ void FastMixerDumpState::dump(int fd) const 
    // Instead we always display all tracks, with an indication

    // of whether we think the track is active.

    uint32_t trackMask = mTrackMask;

    fdprintf(fd, "Fast tracks: kMaxFastTracks=%u activeMask=%#x\n",

    dprintf(fd, "Fast tracks: kMaxFastTracks=%u activeMask=%#x\n",

            FastMixerState::kMaxFastTracks, trackMask);

    fdprintf(fd, "Index Active Full Partial Empty  Recent Ready\n");

    dprintf(fd, "Index Active Full Partial Empty  Recent Ready\n");

    for (uint32_t i = 0; i < FastMixerState::kMaxFastTracks; ++i, trackMask >>= 1) {

        bool isActive = trackMask & 1;

        const FastTrackDump *ftDump = &mTracks[i];
@@ -845,7 +845,7 @@ void FastMixerDumpState::dump(int fd) const 
            mostRecent = "?";

            break;

        }

        fdprintf(fd, "%5u %6s %4u %7u %5u %7s %5zu\n", i, isActive ? "yes" : "no",

        dprintf(fd, "%5u %6s %4u %7u %5u %7s %5zu\n", i, isActive ? "yes" : "no",

                (underruns.mBitFields.mFull) & UNDERRUN_MASK,

                (underruns.mBitFields.mPartial) & UNDERRUN_MASK,

                (underruns.mBitFields.mEmpty) & UNDERRUN_MASK,

services/audioflinger/StateQueue.cpp

+2 −2
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ namespace android { 
#ifdef STATE_QUEUE_DUMP

void StateQueueObserverDump::dump(int fd)

{

    fdprintf(fd, "State queue observer: stateChanges=%u\n", mStateChanges);

    dprintf(fd, "State queue observer: stateChanges=%u\n", mStateChanges);

}



void StateQueueMutatorDump::dump(int fd)

{

    fdprintf(fd, "State queue mutator: pushDirty=%u pushAck=%u blockedSequence=%u\n",

    dprintf(fd, "State queue mutator: pushDirty=%u pushAck=%u blockedSequence=%u\n",

            mPushDirty, mPushAck, mBlockedSequence);

}

#endif