liblog: remove unused parts of android_log_transport_context (04455bb1) · Commits · e / os / android_system_core

liblog/logger.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -96,8 +96,6 @@ struct android_log_transport_context {

	struct android_log_transport_read* transport;		struct android_log_transport_read* transport;
	unsigned logMask; /* mask of requested log buffers */		unsigned logMask; /* mask of requested log buffers */
	int ret; /* return value associated with following data */
	struct log_msg logMsg; /* peek at upcoming data, valid if logMsg.len != 0 */
	};		};

	struct android_log_logger_list {		struct android_log_logger_list {

liblog/logger_read.cpp

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,6 @@ static int init_transport_context(struct android_log_logger_list* logger_list) {

	logger_list->transport_context.transport = transport;		logger_list->transport_context.transport = transport;
	logger_list->transport_context.logMask = logMask;		logger_list->transport_context.logMask = logMask;
	logger_list->transport_context.ret = 1;
	#endif		#endif
	return 0;		return 0;
	}		}
	@@ -281,8 +280,6 @@ static int android_transport_read(struct android_log_logger_list* logger_list,
	ret = sizeof(*log_msg);		ret = sizeof(*log_msg);
	}		}

	transp->ret = ret;

	if (ret < static_cast<int>(sizeof(log_msg->entry))) {		if (ret < static_cast<int>(sizeof(log_msg->entry))) {
	return -EINVAL;		return -EINVAL;
	}		}

liblog/pmsg_reader.cpp

+16 −15

Original line number	Original line	Diff line number	Diff line
	@@ -267,25 +267,26 @@ ssize_t __android_log_pmsg_file_read(log_id_t logId, char prio, const char* pref
	}		}

	/* Read the file content */		/* Read the file content */
	while (pmsgRead(&logger_list, &transp, &transp.logMsg) > 0) {		log_msg log_msg;
			while (pmsgRead(&logger_list, &transp, &log_msg) > 0) {
	const char* cp;		const char* cp;
	size_t hdr_size = transp.logMsg.entry.hdr_size;		size_t hdr_size = log_msg.entry.hdr_size;

	char* msg = (char*)&transp.logMsg + hdr_size;		char* msg = (char*)&log_msg + hdr_size;
	const char* split = NULL;		const char* split = NULL;

	if (hdr_size != sizeof(transp.logMsg.entry)) {		if (hdr_size != sizeof(log_msg.entry)) {
	continue;		continue;
	}		}
	/* Check for invalid sequence number */		/* Check for invalid sequence number */
	if ((transp.logMsg.entry.nsec % ANDROID_LOG_PMSG_FILE_SEQUENCE) \|\|		if (log_msg.entry.nsec % ANDROID_LOG_PMSG_FILE_SEQUENCE \|\|
	((transp.logMsg.entry.nsec / ANDROID_LOG_PMSG_FILE_SEQUENCE) >=		(log_msg.entry.nsec / ANDROID_LOG_PMSG_FILE_SEQUENCE) >=
	ANDROID_LOG_PMSG_FILE_MAX_SEQUENCE)) {		ANDROID_LOG_PMSG_FILE_MAX_SEQUENCE) {
	continue;		continue;
	}		}

	/* Determine if it has <dirbase>:<filebase> format for tag */		/* Determine if it has <dirbase>:<filebase> format for tag */
	len = transp.logMsg.entry.len - sizeof(prio);		len = log_msg.entry.len - sizeof(prio);
	for (cp = msg + sizeof(prio); cp && isprint(cp) && !isspace(*cp) && --len; ++cp) {		for (cp = msg + sizeof(prio); cp && isprint(cp) && !isspace(*cp) && --len; ++cp) {
	if (*cp == ':') {		if (*cp == ':') {
	if (split) {		if (split) {
	@@ -331,8 +332,8 @@ ssize_t __android_log_pmsg_file_read(log_id_t logId, char prio, const char* pref
	/* check if there is an existing entry */		/* check if there is an existing entry */
	list_for_each(node, &name_list) {		list_for_each(node, &name_list) {
	names = node_to_item(node, struct names, node);		names = node_to_item(node, struct names, node);
	if (!strcmp(names->name, msg + sizeof(prio)) && (names->id == transp.logMsg.entry.lid) &&		if (!strcmp(names->name, msg + sizeof(prio)) && names->id == log_msg.entry.lid &&
	(names->prio == *msg)) {		names->prio == *msg) {
	break;		break;
	}		}
	}		}
	@@ -349,7 +350,7 @@ ssize_t __android_log_pmsg_file_read(log_id_t logId, char prio, const char* pref
	break;		break;
	}		}
	strcpy(names->name, msg + sizeof(prio));		strcpy(names->name, msg + sizeof(prio));
	names->id = static_cast<log_id_t>(transp.logMsg.entry.lid);		names->id = static_cast<log_id_t>(log_msg.entry.lid);
	names->prio = *msg;		names->prio = *msg;
	list_init(&names->content);		list_init(&names->content);
	/*		/*
	@@ -402,7 +403,7 @@ ssize_t __android_log_pmsg_file_read(log_id_t logId, char prio, const char* pref
	/* Remove any file fragments that match our sequence number */		/* Remove any file fragments that match our sequence number */
	list_for_each_safe(node, n, &names->content) {		list_for_each_safe(node, n, &names->content) {
	content = node_to_item(node, struct content, node);		content = node_to_item(node, struct content, node);
	if (transp.logMsg.entry.nsec == content->entry.nsec) {		if (log_msg.entry.nsec == content->entry.nsec) {
	list_remove(&content->node);		list_remove(&content->node);
	free(content);		free(content);
	}		}
	@@ -410,16 +411,16 @@ ssize_t __android_log_pmsg_file_read(log_id_t logId, char prio, const char* pref

	/* Add content */		/* Add content */
	content = static_cast<struct content*>(		content = static_cast<struct content*>(
	calloc(1, sizeof(content->node) + hdr_size + transp.logMsg.entry.len));		calloc(1, sizeof(content->node) + hdr_size + log_msg.entry.len));
	if (!content) {		if (!content) {
	ret = -ENOMEM;		ret = -ENOMEM;
	break;		break;
	}		}
	memcpy(&content->entry, &transp.logMsg.entry, hdr_size + transp.logMsg.entry.len);		memcpy(&content->entry, &log_msg.entry, hdr_size + log_msg.entry.len);

	/* Insert in sequence number sorted order, to ease reconstruction */		/* Insert in sequence number sorted order, to ease reconstruction */
	list_for_each_reverse(node, &names->content) {		list_for_each_reverse(node, &names->content) {
	if ((node_to_item(node, struct content, node))->entry.nsec < transp.logMsg.entry.nsec) {		if ((node_to_item(node, struct content, node))->entry.nsec < log_msg.entry.nsec) {
	break;		break;
	}		}
	}		}