From 44182c206f7c5584ef2cf504da6be98fab665dbf Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Thu, 5 Mar 2015 17:12:23 -0800 Subject: Dump generic information first for each thread also mBufferSize was already being displayed as part of dumpBase Change-Id: I17f3062fcc076c594b5fd6b8fca286b27067e07c --- services/audioflinger/Threads.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'services') diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 868f5b4..92bd295 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1483,6 +1483,9 @@ void AudioFlinger::PlaybackThread::dumpTracks(int fd, const Vector& ar void AudioFlinger::PlaybackThread::dumpInternals(int fd, const Vector& args) { dprintf(fd, "\nOutput thread %p type %d (%s):\n", this, type(), threadTypeToString(type())); + + dumpBase(fd, args); + dprintf(fd, " Normal frame count: %zu\n", mNormalFrameCount); dprintf(fd, " Last write occurred (msecs): %llu\n", ns2ms(systemTime() - mLastWriteTime)); dprintf(fd, " Total writes: %d\n", mNumWrites); @@ -1497,8 +1500,6 @@ void AudioFlinger::PlaybackThread::dumpInternals(int fd, const Vector& audio_output_flags_t flags = output != NULL ? output->flags : AUDIO_OUTPUT_FLAG_NONE; String8 flagsAsString = outputFlagsToString(flags); dprintf(fd, " AudioStreamOut: %p flags %#x (%s)\n", output, flags, flagsAsString.string()); - - dumpBase(fd, args); } // Thread virtuals @@ -6155,15 +6156,13 @@ void AudioFlinger::RecordThread::dumpInternals(int fd, const Vector& a { dprintf(fd, "\nInput thread %p:\n", this); - if (mActiveTracks.size() > 0) { - dprintf(fd, " Buffer size: %zu bytes\n", mBufferSize); - } else { + dumpBase(fd, args); + + if (mActiveTracks.size() == 0) { dprintf(fd, " No active record clients\n"); } dprintf(fd, " Fast capture thread: %s\n", hasFastCapture() ? "yes" : "no"); dprintf(fd, " Fast track available: %s\n", mFastTrackAvail ? "yes" : "no"); - - dumpBase(fd, args); } void AudioFlinger::RecordThread::dumpTracks(int fd, const Vector& args __unused) -- cgit v1.1