am 923b0f6a: am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang." (4c1482ac) · Commits · e / os / android_frameworks_native-old

libs/binder/IPCThreadState.cpp

+11 −13

Original line number	Original line	Diff line number	Diff line
	@@ -74,9 +74,8 @@ static const char* getCommandString(size_t idx);
	static const void* printReturnCommand(TextOutput& out, const void* _cmd);		static const void* printReturnCommand(TextOutput& out, const void* _cmd);
	static const void* printCommand(TextOutput& out, const void* _cmd);		static const void* printCommand(TextOutput& out, const void* _cmd);

	// This will result in a missing symbol failure if the IF_LOG_COMMANDS()		// Static const and functions will be optimized out if not used,
	// conditionals don't get stripped... but that is probably what we want.		// when LOG_NDEBUG and references in IF_LOG_COMMANDS() are optimized out.
	#if !LOG_NDEBUG
	static const char *kReturnStrings[] = {		static const char *kReturnStrings[] = {
	"BR_ERROR",		"BR_ERROR",
	"BR_OK",		"BR_OK",
	@@ -145,7 +144,7 @@ static const void* printBinderTransactionData(TextOutput& out, const void* data)
	out << "target.ptr=" << btd->target.ptr;		out << "target.ptr=" << btd->target.ptr;
	}		}
	out << " (cookie " << btd->cookie << ")" << endl		out << " (cookie " << btd->cookie << ")" << endl
	<< "code=" << TypeCode(btd->code) << ", flags=" << (void*)btd->flags << endl		<< "code=" << TypeCode(btd->code) << ", flags=" << (void*)(long)btd->flags << endl
	<< "data=" << btd->data.ptr.buffer << " (" << (void*)btd->data_size		<< "data=" << btd->data.ptr.buffer << " (" << (void*)btd->data_size
	<< " bytes)" << endl		<< " bytes)" << endl
	<< "offsets=" << btd->data.ptr.offsets << " (" << (void*)btd->offsets_size		<< "offsets=" << btd->data.ptr.offsets << " (" << (void*)btd->offsets_size
	@@ -160,7 +159,7 @@ static const void* printReturnCommand(TextOutput& out, const void* _cmd)
	int32_t code = *cmd++;		int32_t code = *cmd++;
	size_t cmdIndex = code & 0xff;		size_t cmdIndex = code & 0xff;
	if (code == (int32_t) BR_ERROR) {		if (code == (int32_t) BR_ERROR) {
	out << "BR_ERROR: " << (void)(cmd++) << endl;		out << "BR_ERROR: " << (void)(long)(cmd++) << endl;
	return cmd;		return cmd;
	} else if (cmdIndex >= N) {		} else if (cmdIndex >= N) {
	out << "Unknown reply: " << code << endl;		out << "Unknown reply: " << code << endl;
	@@ -187,21 +186,21 @@ static const void* printReturnCommand(TextOutput& out, const void* _cmd)
	case BR_DECREFS: {		case BR_DECREFS: {
	const int32_t b = *cmd++;		const int32_t b = *cmd++;
	const int32_t c = *cmd++;		const int32_t c = *cmd++;
	out << ": target=" << (void)b << " (cookie " << (void)c << ")";		out << ": target=" << (void)(long)b << " (cookie " << (void)(long)c << ")";
	} break;		} break;

	case BR_ATTEMPT_ACQUIRE: {		case BR_ATTEMPT_ACQUIRE: {
	const int32_t p = *cmd++;		const int32_t p = *cmd++;
	const int32_t b = *cmd++;		const int32_t b = *cmd++;
	const int32_t c = *cmd++;		const int32_t c = *cmd++;
	out << ": target=" << (void)b << " (cookie " << (void)c		out << ": target=" << (void)(long)b << " (cookie " << (void)(long)c
	<< "), pri=" << p;		<< "), pri=" << p;
	} break;		} break;

	case BR_DEAD_BINDER:		case BR_DEAD_BINDER:
	case BR_CLEAR_DEATH_NOTIFICATION_DONE: {		case BR_CLEAR_DEATH_NOTIFICATION_DONE: {
	const int32_t c = *cmd++;		const int32_t c = *cmd++;
	out << ": death cookie " << (void*)c;		out << ": death cookie " << (void*)(long)c;
	} break;		} break;

	default:		default:
	@@ -242,7 +241,7 @@ static const void* printCommand(TextOutput& out, const void* _cmd)

	case BC_FREE_BUFFER: {		case BC_FREE_BUFFER: {
	const int32_t buf = *cmd++;		const int32_t buf = *cmd++;
	out << ": buffer=" << (void*)buf;		out << ": buffer=" << (void*)(long)buf;
	} break;		} break;

	case BC_INCREFS:		case BC_INCREFS:
	@@ -257,7 +256,7 @@ static const void* printCommand(TextOutput& out, const void* _cmd)
	case BC_ACQUIRE_DONE: {		case BC_ACQUIRE_DONE: {
	const int32_t b = *cmd++;		const int32_t b = *cmd++;
	const int32_t c = *cmd++;		const int32_t c = *cmd++;
	out << ": target=" << (void)b << " (cookie " << (void)c << ")";		out << ": target=" << (void)(long)b << " (cookie " << (void)(long)c << ")";
	} break;		} break;

	case BC_ATTEMPT_ACQUIRE: {		case BC_ATTEMPT_ACQUIRE: {
	@@ -270,12 +269,12 @@ static const void* printCommand(TextOutput& out, const void* _cmd)
	case BC_CLEAR_DEATH_NOTIFICATION: {		case BC_CLEAR_DEATH_NOTIFICATION: {
	const int32_t h = *cmd++;		const int32_t h = *cmd++;
	const int32_t c = *cmd++;		const int32_t c = *cmd++;
	out << ": handle=" << h << " (death cookie " << (void*)c << ")";		out << ": handle=" << h << " (death cookie " << (void*)(long)c << ")";
	} break;		} break;

	case BC_DEAD_BINDER_DONE: {		case BC_DEAD_BINDER_DONE: {
	const int32_t c = *cmd++;		const int32_t c = *cmd++;
	out << ": death cookie " << (void*)c;		out << ": death cookie " << (void*)(long)c;
	} break;		} break;

	default:		default:
	@@ -287,7 +286,6 @@ static const void* printCommand(TextOutput& out, const void* _cmd)
	out << endl;		out << endl;
	return cmd;		return cmd;
	}		}
	#endif

	static pthread_mutex_t gTLSMutex = PTHREAD_MUTEX_INITIALIZER;		static pthread_mutex_t gTLSMutex = PTHREAD_MUTEX_INITIALIZER;
	static bool gHaveTLS = false;		static bool gHaveTLS = false;