kdb: Re-factor kdb_printf() message write code (9d71b344) · Commits · 戴 / test

kernel/debug/kdb/kdb_io.c

+28 −29

Original line number	Diff line number	Diff line
		@@ -542,6 +542,29 @@ static int kdb_search_string(char searched, char searchfor)
		return 0;
		}

		static void kdb_msg_write(const char *msg, int msg_len)
		{
		struct console *c;

		if (msg_len == 0)
		return;

		if (dbg_io_ops && !dbg_io_ops->is_console) {
		const char *cp = msg;
		int len = msg_len;

		while (len--) {
		dbg_io_ops->write_char(*cp);
		cp++;
		}
		}

		for_each_console(c) {
		c->write(c, msg, msg_len);
		touch_nmi_watchdog();
		}
		}

		int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
		{
		int diag;
		@@ -553,7 +576,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
		int this_cpu, old_cpu;
		char cp, cp2, *cphold = NULL, replaced_byte = ' ';
		char *moreprompt = "more> ";
		struct console *c;
		unsigned long uninitialized_var(flags);

		/* Serialize kdb_printf if multiple cpus try to write at once.
		@@ -687,22 +709,11 @@ kdb_printit:
		*/
		retlen = strlen(kdb_buffer);
		cp = (char *) printk_skip_headers(kdb_buffer);
		if (!dbg_kdb_mode && kgdb_connected) {
		if (!dbg_kdb_mode && kgdb_connected)
		gdbstub_msg_write(cp, retlen - (cp - kdb_buffer));
		} else {
		if (dbg_io_ops && !dbg_io_ops->is_console) {
		len = retlen - (cp - kdb_buffer);
		cp2 = cp;
		while (len--) {
		dbg_io_ops->write_char(*cp2);
		cp2++;
		}
		}
		for_each_console(c) {
		c->write(c, cp, retlen - (cp - kdb_buffer));
		touch_nmi_watchdog();
		}
		}
		else
		kdb_msg_write(cp, retlen - (cp - kdb_buffer));

		if (logging) {
		saved_loglevel = console_loglevel;
		console_loglevel = CONSOLE_LOGLEVEL_SILENT;
		@@ -751,19 +762,7 @@ kdb_printit:
		moreprompt = "more> ";

		kdb_input_flush();

		if (dbg_io_ops && !dbg_io_ops->is_console) {
		len = strlen(moreprompt);
		cp = moreprompt;
		while (len--) {
		dbg_io_ops->write_char(*cp);
		cp++;
		}
		}
		for_each_console(c) {
		c->write(c, moreprompt, strlen(moreprompt));
		touch_nmi_watchdog();
		}
		kdb_msg_write(moreprompt, strlen(moreprompt));

		if (logging)
		printk("%s", moreprompt);

Admin message