Merge "Minor code style changes and namespace fix" (d5973043) · Commits · e / os / android_frameworks_av

media/libnbaio/NBLog.cpp

+11 −6

Original line number	Diff line number	Diff line
		@@ -686,7 +686,7 @@ int NBLog::handleFormat(const char fmt, size_t fmt_length, const uint8_t data,

		// TODO check length for event type is correct
		if(length != data[data_offset + length + 2]) {
		ALOGW("NBLog Reader recieved different lengths %zu and %d for event %d", length,
		ALOGW("NBLog Reader received different lengths %zu and %d for event %d", length,
		data[data_offset + length + 2], event);
		body->append("<invalid entry>");
		++fmt_offset;
		@@ -698,27 +698,32 @@ int NBLog::handleFormat(const char fmt, size_t fmt_length, const uint8_t data,
		switch(fmt[fmt_offset])
		{
		case 's': // string
		ALOGW_IF(event != EVENT_STRING, "NBLog Reader incompatible event for string specifier: %d", event);
		ALOGW_IF(event != EVENT_STRING,
		"NBLog Reader incompatible event for string specifier: %d", event);
		body->append((const char*) datum, length);
		break;

		case 't': // timestamp
		ALOGW_IF(event != EVENT_TIMESTAMP, "NBLog Reader incompatible event for timestamp specifier: %d", event);
		ALOGW_IF(event != EVENT_TIMESTAMP,
		"NBLog Reader incompatible event for timestamp specifier: %d", event);
		appendTimestamp(body, datum);
		break;

		case 'd': // integer
		ALOGW_IF(event != EVENT_INTEGER, "NBLog Reader incompatible event for integer specifier: %d", event);
		ALOGW_IF(event != EVENT_INTEGER,
		"NBLog Reader incompatible event for integer specifier: %d", event);
		appendInt(body, datum);
		break;

		case 'f': // float
		ALOGW_IF(event != EVENT_FLOAT, "NBLog Reader incompatible event for float specifier: %d", event);
		ALOGW_IF(event != EVENT_FLOAT,
		"NBLog Reader incompatible event for float specifier: %d", event);
		appendFloat(body, datum);
		break;

		case 'p': // pid
		ALOGW_IF(event != EVENT_PID, "NBLog Reader incompatible event for pid specifier: %d", event);
		ALOGW_IF(event != EVENT_PID,
		"NBLog Reader incompatible event for pid specifier: %d", event);
		appendPID(body, datum, length);
		break;

services/audioflinger/Threads.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -3044,9 +3044,9 @@ bool AudioFlinger::PlaybackThread::threadLoop()
		if (z % 100 == 0) {
		timespec ts;
		clock_gettime(CLOCK_MONOTONIC, &ts);
		LOGF("This is an integer %d, this is a float %f, this is my "
		LOGT("This is an integer %d, this is a float %f, this is my "
		"pid %p %% %s %t", 42, 3.14, "and this is a timestamp", ts);
		LOGF("A deceptive null-terminated string %\0");
		LOGT("A deceptive null-terminated string %\0");
		}
		++z;
		#endif

services/audioflinger/TypedLogger.cpp

+18 −16

Original line number	Diff line number	Diff line
		@@ -22,4 +22,6 @@
		#include <pthread.h>
		#include "TypedLogger.h"

		thread_local android::NBLog::Writer *logWriterTLS;
		namespace android {
		thread_local NBLog::Writer *logWriterTLS;
		}

services/audioflinger/TypedLogger.h

+22 −21

Original line number	Diff line number	Diff line
		@@ -15,15 +15,16 @@
		* limitations under the License.
		*/

		#ifndef TYPED_LOGGER_H
		#define TYPED_LOGGER_H
		#ifndef ANDROID_TYPED_LOGGER_H
		#define ANDROID_TYPED_LOGGER_H

		#include <media/nbaio/NBLog.h>
		#define LOGT(fmt, ...) logWriterTLS->logFormat(fmt, ##__VA_ARGS__) // TODO: check null pointer

		namespace android {
		extern "C" {
		extern thread_local android::NBLog::Writer *logWriterTLS;
		extern thread_local NBLog::Writer *logWriterTLS;
		}
		} // namespace android

		#define LOGF(fmt, ...) logWriterTLS->logFormat(fmt, ##__VA_ARGS__)

		#endif
		No newline at end of file
		#endif // ANDROID_TYPED_LOGGER_H