Merge "liblog: test: switch to private event structures" (bfe1d9b8) · Commits · e / os / android_system_core

liblog/tests/liblog_test.cpp

+43 −35

Original line number	Diff line number	Diff line
		@@ -270,18 +270,19 @@ TEST(liblog, __android_log_btwrite__android_logger_list_read) {

		ASSERT_EQ(log_msg.entry.pid, pid);

		if ((log_msg.entry.len != (4 + 1 + 8))
		if ((log_msg.entry.len != sizeof(android_log_event_long_t))
		\|\| (log_msg.id() != LOG_ID_EVENTS)) {
		continue;
		}

		char *eventData = log_msg.msg();
		android_log_event_long_t* eventData;
		eventData = reinterpret_cast<android_log_event_long_t*>(log_msg.msg());

		if (!eventData \|\| (eventData[4] != EVENT_TYPE_LONG)) {
		if (!eventData \|\| (eventData->payload.type != EVENT_TYPE_LONG)) {
		continue;
		}

		log_time tx(eventData + 4 + 1);
		log_time tx(reinterpret_cast<char*>(&eventData->payload.data));
		if (ts == tx) {
		++count;
		} else if (ts1 == tx) {
		@@ -352,18 +353,20 @@ static void bswrite_test(const char *message) {

		if ((log_msg.entry.sec < (ts.tv_sec - 1))
		\|\| ((ts.tv_sec + 1) < log_msg.entry.sec)
		\|\| ((size_t)log_msg.entry.len != (4 + 1 + 4 + length))
		\|\| ((size_t)log_msg.entry.len != (sizeof(android_log_event_string_t) +
		length))
		\|\| (log_msg.id() != LOG_ID_EVENTS)) {
		continue;
		}

		char *eventData = log_msg.msg();
		android_log_event_string_t* eventData;
		eventData = reinterpret_cast<android_log_event_string_t*>(log_msg.msg());

		if (!eventData \|\| (eventData[4] != EVENT_TYPE_STRING)) {
		if (!eventData \|\| (eventData->type != EVENT_TYPE_STRING)) {
		continue;
		}

		size_t len = get4LE(eventData + 4 + 1);
		size_t len = get4LE(reinterpret_cast<char*>(&eventData->length));
		if (len == total) {
		++count;

		@@ -650,18 +653,19 @@ TEST(liblog, __security_buffer) {

		ASSERT_EQ(log_msg.entry.pid, pid);

		if ((log_msg.entry.len != (4 + 1 + 8))
		if ((log_msg.entry.len != sizeof(android_log_event_long_t))
		\|\| (log_msg.id() != LOG_ID_SECURITY)) {
		continue;
		}

		char *eventData = log_msg.msg();
		android_log_event_long_t* eventData;
		eventData = reinterpret_cast<android_log_event_long_t*>(log_msg.msg());

		if (!eventData \|\| (eventData[4] != EVENT_TYPE_LONG)) {
		if (!eventData \|\| (eventData->payload.type != EVENT_TYPE_LONG)) {
		continue;
		}

		log_time tx(eventData + 4 + 1);
		log_time tx(reinterpret_cast<char*>(&eventData->payload.data));
		if (ts == tx) {
		++count;
		}
		@@ -786,25 +790,27 @@ TEST(liblog, android_logger_list_read__cpu_signal) {

		ASSERT_EQ(log_msg.entry.pid, pid);

		if ((log_msg.entry.len != (4 + 1 + 8))
		if ((log_msg.entry.len != sizeof(android_log_event_long_t))
		\|\| (log_msg.id() != LOG_ID_EVENTS)) {
		continue;
		}

		char *eventData = log_msg.msg();
		android_log_event_long_t* eventData;
		eventData = reinterpret_cast<android_log_event_long_t*>(log_msg.msg());

		if (!eventData \|\| (eventData[4] != EVENT_TYPE_LONG)) {
		if (!eventData \|\| (eventData->payload.type != EVENT_TYPE_LONG)) {
		continue;
		}

		unsigned long long l = eventData[4 + 1 + 0] & 0xFF;
		l \|= (unsigned long long) (eventData[4 + 1 + 1] & 0xFF) << 8;
		l \|= (unsigned long long) (eventData[4 + 1 + 2] & 0xFF) << 16;
		l \|= (unsigned long long) (eventData[4 + 1 + 3] & 0xFF) << 24;
		l \|= (unsigned long long) (eventData[4 + 1 + 4] & 0xFF) << 32;
		l \|= (unsigned long long) (eventData[4 + 1 + 5] & 0xFF) << 40;
		l \|= (unsigned long long) (eventData[4 + 1 + 6] & 0xFF) << 48;
		l \|= (unsigned long long) (eventData[4 + 1 + 7] & 0xFF) << 56;
		char* cp = reinterpret_cast<char*>(&eventData->payload.data);
		unsigned long long l = cp[0] & 0xFF;
		l \|= (unsigned long long) (cp[1] & 0xFF) << 8;
		l \|= (unsigned long long) (cp[2] & 0xFF) << 16;
		l \|= (unsigned long long) (cp[3] & 0xFF) << 24;
		l \|= (unsigned long long) (cp[4] & 0xFF) << 32;
		l \|= (unsigned long long) (cp[5] & 0xFF) << 40;
		l \|= (unsigned long long) (cp[6] & 0xFF) << 48;
		l \|= (unsigned long long) (cp[7] & 0xFF) << 56;

		if (l == v) {
		++signals;
		@@ -943,25 +949,27 @@ TEST(liblog, android_logger_list_read__cpu_thread) {

		ASSERT_EQ(log_msg.entry.pid, pid);

		if ((log_msg.entry.len != (4 + 1 + 8))
		if ((log_msg.entry.len != sizeof(android_log_event_long_t))
		\|\| (log_msg.id() != LOG_ID_EVENTS)) {
		continue;
		}

		char *eventData = log_msg.msg();
		android_log_event_long_t* eventData;
		eventData = reinterpret_cast<android_log_event_long_t*>(log_msg.msg());

		if (!eventData \|\| (eventData[4] != EVENT_TYPE_LONG)) {
		if (!eventData \|\| (eventData->payload.type != EVENT_TYPE_LONG)) {
		continue;
		}

		unsigned long long l = eventData[4 + 1 + 0] & 0xFF;
		l \|= (unsigned long long) (eventData[4 + 1 + 1] & 0xFF) << 8;
		l \|= (unsigned long long) (eventData[4 + 1 + 2] & 0xFF) << 16;
		l \|= (unsigned long long) (eventData[4 + 1 + 3] & 0xFF) << 24;
		l \|= (unsigned long long) (eventData[4 + 1 + 4] & 0xFF) << 32;
		l \|= (unsigned long long) (eventData[4 + 1 + 5] & 0xFF) << 40;
		l \|= (unsigned long long) (eventData[4 + 1 + 6] & 0xFF) << 48;
		l \|= (unsigned long long) (eventData[4 + 1 + 7] & 0xFF) << 56;
		char* cp = reinterpret_cast<char*>(&eventData->payload.data);
		unsigned long long l = cp[0] & 0xFF;
		l \|= (unsigned long long) (cp[1] & 0xFF) << 8;
		l \|= (unsigned long long) (cp[2] & 0xFF) << 16;
		l \|= (unsigned long long) (cp[3] & 0xFF) << 24;
		l \|= (unsigned long long) (cp[4] & 0xFF) << 32;
		l \|= (unsigned long long) (cp[5] & 0xFF) << 40;
		l \|= (unsigned long long) (cp[6] & 0xFF) << 48;
		l \|= (unsigned long long) (cp[7] & 0xFF) << 56;

		if (l == v) {
		++signals;