svn commit: r328686 - in user/markj/netdump/sys: amd64/amd64 arm/arm arm64/arm64 i386/i386 kern mips/mips sparc64/sparc64

Mark Johnston markj at FreeBSD.org
Thu Feb 1 16:48:27 UTC 2018


Author: markj
Date: Thu Feb  1 16:48:25 2018
New Revision: 328686
URL: https://svnweb.freebsd.org/changeset/base/328686

Log:
  Print messages after calling dump_start().
  
  This allows dump_start() to print messages without mangling output from
  the dump progress tracker.

Modified:
  user/markj/netdump/sys/amd64/amd64/minidump_machdep.c
  user/markj/netdump/sys/arm/arm/minidump_machdep.c
  user/markj/netdump/sys/arm64/arm64/minidump_machdep.c
  user/markj/netdump/sys/i386/i386/minidump_machdep.c
  user/markj/netdump/sys/kern/kern_dump.c
  user/markj/netdump/sys/mips/mips/minidump_machdep.c
  user/markj/netdump/sys/sparc64/sparc64/dump_machdep.c

Modified: user/markj/netdump/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- user/markj/netdump/sys/amd64/amd64/minidump_machdep.c	Thu Feb  1 16:45:44 2018	(r328685)
+++ user/markj/netdump/sys/amd64/amd64/minidump_machdep.c	Thu Feb  1 16:48:25 2018	(r328686)
@@ -329,12 +329,12 @@ minidumpsys(struct dumperinfo *di)
 	dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION,
 	    dumpsize);
 
-	printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
-	    ptoa((uintmax_t)physmem) / 1048576);
-
 	error = dump_start(di, &kdh);
 	if (error != 0)
 		goto fail;
+
+	printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
+	    ptoa((uintmax_t)physmem) / 1048576);
 
 	/* Dump my header */
 	bzero(&fakepd, sizeof(fakepd));

Modified: user/markj/netdump/sys/arm/arm/minidump_machdep.c
==============================================================================
--- user/markj/netdump/sys/arm/arm/minidump_machdep.c	Thu Feb  1 16:45:44 2018	(r328685)
+++ user/markj/netdump/sys/arm/arm/minidump_machdep.c	Thu Feb  1 16:48:25 2018	(r328686)
@@ -246,12 +246,12 @@ minidumpsys(struct dumperinfo *di)
 	dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION,
 	    dumpsize);
 
-	printf("Physical memory: %u MB\n", ptoa((uintmax_t)physmem) / 1048576);
-	printf("Dumping %llu MB:", (long long)dumpsize >> 20);
-
 	error = dump_start(di, &kdh);
 	if (error != 0)
 		goto fail;
+
+	printf("Physical memory: %u MB\n", ptoa((uintmax_t)physmem) / 1048576);
+	printf("Dumping %llu MB:", (long long)dumpsize >> 20);
 
 	/* Dump my header */
 	bzero(dumpbuf, sizeof(dumpbuf));

Modified: user/markj/netdump/sys/arm64/arm64/minidump_machdep.c
==============================================================================
--- user/markj/netdump/sys/arm64/arm64/minidump_machdep.c	Thu Feb  1 16:45:44 2018	(r328685)
+++ user/markj/netdump/sys/arm64/arm64/minidump_machdep.c	Thu Feb  1 16:48:25 2018	(r328686)
@@ -289,12 +289,12 @@ minidumpsys(struct dumperinfo *di)
 	dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_AARCH64_VERSION,
 	    dumpsize);
 
-	printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
-	    ptoa((uintmax_t)physmem) / 1048576);
-
 	error = dump_start(di, &kdh);
 	if (error != 0)
 		goto fail;
+
+	printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
+	    ptoa((uintmax_t)physmem) / 1048576);
 
 	/* Dump my header */
 	bzero(&tmpbuffer, sizeof(tmpbuffer));

Modified: user/markj/netdump/sys/i386/i386/minidump_machdep.c
==============================================================================
--- user/markj/netdump/sys/i386/i386/minidump_machdep.c	Thu Feb  1 16:45:44 2018	(r328685)
+++ user/markj/netdump/sys/i386/i386/minidump_machdep.c	Thu Feb  1 16:48:25 2018	(r328686)
@@ -254,12 +254,12 @@ minidumpsys(struct dumperinfo *di)
 	dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_I386_VERSION,
 	    dumpsize);
 
-	printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576);
-	printf("Dumping %llu MB:", (long long)dumpsize >> 20);
-
 	error = dump_start(di, &kdh);
 	if (error != 0)
 		goto fail;
+
+	printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576);
+	printf("Dumping %llu MB:", (long long)dumpsize >> 20);
 
 	/* Dump my header */
 	bzero(&fakept, sizeof(fakept));

Modified: user/markj/netdump/sys/kern/kern_dump.c
==============================================================================
--- user/markj/netdump/sys/kern/kern_dump.c	Thu Feb  1 16:45:44 2018	(r328685)
+++ user/markj/netdump/sys/kern/kern_dump.c	Thu Feb  1 16:48:25 2018	(r328686)
@@ -330,12 +330,12 @@ dumpsys_generic(struct dumperinfo *di)
 	dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_ARCH_VERSION,
 	    dumpsize);
 
-	printf("Dumping %ju MB (%d chunks)\n", (uintmax_t)dumpsize >> 20,
-	    ehdr.e_phnum - DUMPSYS_NUM_AUX_HDRS);
-
 	error = dump_start(di, &kdh);
 	if (error != 0)
 		goto fail;
+
+	printf("Dumping %ju MB (%d chunks)\n", (uintmax_t)dumpsize >> 20,
+	    ehdr.e_phnum - DUMPSYS_NUM_AUX_HDRS);
 
 	/* Dump ELF header */
 	error = dumpsys_buf_write(di, (char*)&ehdr, sizeof(ehdr));

Modified: user/markj/netdump/sys/mips/mips/minidump_machdep.c
==============================================================================
--- user/markj/netdump/sys/mips/mips/minidump_machdep.c	Thu Feb  1 16:45:44 2018	(r328685)
+++ user/markj/netdump/sys/mips/mips/minidump_machdep.c	Thu Feb  1 16:48:25 2018	(r328686)
@@ -264,12 +264,12 @@ minidumpsys(struct dumperinfo *di)
 	dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_MIPS_VERSION,
 	    dumpsize);
 
-	printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
-	    ptoa((uintmax_t)physmem) / 1048576);
-
 	error = dump_start(di, &kdh);
 	if (error != 0)
 		goto fail;
+
+	printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
+	    ptoa((uintmax_t)physmem) / 1048576);
 
 	/* Dump my header */
 	bzero(tmpbuffer, sizeof(tmpbuffer));

Modified: user/markj/netdump/sys/sparc64/sparc64/dump_machdep.c
==============================================================================
--- user/markj/netdump/sys/sparc64/sparc64/dump_machdep.c	Thu Feb  1 16:45:44 2018	(r328685)
+++ user/markj/netdump/sys/sparc64/sparc64/dump_machdep.c	Thu Feb  1 16:48:25 2018	(r328686)
@@ -98,11 +98,11 @@ dumpsys(struct dumperinfo *di)
 	dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION,
 	    size);
 
-	printf("Dumping %lu MB (%d chunks)\n", (u_long)(size >> 20), nreg);
-
 	error = dump_start(di, &kdh);
 	if (error != 0)
 		goto fail;
+
+	printf("Dumping %lu MB (%d chunks)\n", (u_long)(size >> 20), nreg);
 
 	/* Dump the private header. */
 	hdr.dh_hdr_size = hdrsize;


More information about the svn-src-user mailing list