logging: log_backend_net: Remove LOG1 support (2bb3e64f) · Commits · Wenxi XU / zephyr

subsys/logging/Kconfig.backends

+1 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ endif # LOG_BACKEND_XTENSA_SIM
		config LOG_BACKEND_NET
		bool "Networking backend"
		depends on NETWORKING && NET_UDP && !LOG_MODE_IMMEDIATE
		depends on !LOG1
		select NET_CONTEXT_NET_PKT_POOL
		help
		Send syslog messages to network server.

subsys/logging/log_backend_net.c

+2 −52

Original line number	Diff line number	Diff line
		@@ -173,28 +173,6 @@ static int do_net_init(void)
		return 0;
		}

		static void send_output(const struct log_backend *const backend,
		struct log_msg *msg)
		{
		if (panic_mode) {
		return;
		}

		if (!net_init_done && do_net_init() == 0) {
		net_init_done = true;
		}

		log_msg_get(msg);

		log_output_msg_process(&log_output_net, msg,
		LOG_OUTPUT_FLAG_FORMAT_SYSLOG \|
		LOG_OUTPUT_FLAG_TIMESTAMP \|
		(IS_ENABLED(CONFIG_LOG_BACKEND_NET_OUTPUT_SYST) ?
		LOG_OUTPUT_FLAG_FORMAT_SYST : 0));

		log_msg_put(msg);
		}

		static void process(const struct log_backend *const backend,
		union log_msg2_generic *msg)
		{
		@@ -242,39 +220,11 @@ static void panic(struct log_backend const *const backend)
		panic_mode = true;
		}

		static void sync_string(const struct log_backend *const backend,
		struct log_msg_ids src_level, uint32_t timestamp,
		const char *fmt, va_list ap)
		{
		uint32_t flags = LOG_OUTPUT_FLAG_LEVEL \| LOG_OUTPUT_FLAG_FORMAT_SYSLOG \|
		LOG_OUTPUT_FLAG_TIMESTAMP \|
		(IS_ENABLED(CONFIG_LOG_BACKEND_NET_OUTPUT_SYST) ?
		LOG_OUTPUT_FLAG_FORMAT_SYST : 0);
		uint32_t key;

		if (!net_init_done && do_net_init() == 0) {
		net_init_done = true;
		}

		key = irq_lock();
		log_output_string(&log_output_net, src_level,
		timestamp, fmt, ap, flags);
		irq_unlock(key);
		}

		const struct log_backend_api log_backend_net_api = {
		.panic = panic,
		.init = init_net,
		.process = IS_ENABLED(CONFIG_LOG2) ? process : NULL,
		.put = IS_ENABLED(CONFIG_LOG1_DEFERRED) ? send_output : NULL,
		.put_sync_string = IS_ENABLED(CONFIG_LOG1_IMMEDIATE) ?
		sync_string : NULL,
		/* Currently we do not send hexdumps over network to remote server
		* if CONFIG_LOG_MODE_IMMEDIATE is used. This is just to save resources,
		* this can be revisited if needed.
		*/
		.put_sync_hexdump = NULL,
		.format_set = IS_ENABLED(CONFIG_LOG1) ? NULL : format_set,
		.process = process,
		.format_set = format_set,
		};

		/* Note that the backend can be activated only after we have networking

Admin message