diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-09 19:38:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-09 19:38:28 +0000 |
| commit | 8a4f2e0a21d3d335dd86e1277bc4c7152fb117b4 (patch) | |
| tree | 92743431c3c05a2eaa792b30cd47261d44a26ddd | |
| parent | 98efcb483f01b4a1c5afb1abecb4b27c6b0c7630 (diff) | |
| parent | 44182c206f7c5584ef2cf504da6be98fab665dbf (diff) | |
| download | frameworks_av-8a4f2e0a21d3d335dd86e1277bc4c7152fb117b4.zip frameworks_av-8a4f2e0a21d3d335dd86e1277bc4c7152fb117b4.tar.gz frameworks_av-8a4f2e0a21d3d335dd86e1277bc4c7152fb117b4.tar.bz2 | |
Merge "Dump generic information first for each thread"
| -rw-r--r-- | services/audioflinger/Threads.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
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<String16>& ar void AudioFlinger::PlaybackThread::dumpInternals(int fd, const Vector<String16>& 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<String16>& 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<String16>& 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<String16>& args __unused) |