Author: markj
Date: Tue May 1 17:32:43 2018
New Revision: 333145
URL: https://svnweb.freebsd.org/changeset/base/333145
Log:
Print the dump progress indicator after calling dump_start().
Dumpers may wish to print messages from an initialization hook; this
change ensures that such messages aren't mixed with output from the
generic dump code.
MFC after: 1 week
Modified:
head/sys/amd64/amd64/minidump_machdep.c
head/sys/arm/arm/minidump_machdep.c
head/sys/arm64/arm64/minidump_machdep.c
head/sys/i386/i386/minidump_machdep.c
head/sys/kern/kern_dump.c
head/sys/mips/mips/minidump_machdep.c
head/sys/sparc64/sparc64/dump_machdep.c
Modified: head/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- head/sys/amd64/amd64/minidump_machdep.c Tue May 1 16:30:48 2018
(r333144)
+++ head/sys/amd64/amd64/minidump_machdep.c Tue May 1 17:32:43 2018
(r333145)
@@ -337,12 +337,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: head/sys/arm/arm/minidump_machdep.c
==============================================================================
--- head/sys/arm/arm/minidump_machdep.c Tue May 1 16:30:48 2018
(r333144)
+++ head/sys/arm/arm/minidump_machdep.c Tue May 1 17:32:43 2018
(r333145)
@@ -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: head/sys/arm64/arm64/minidump_machdep.c
==============================================================================
--- head/sys/arm64/arm64/minidump_machdep.c Tue May 1 16:30:48 2018
(r333144)
+++ head/sys/arm64/arm64/minidump_machdep.c Tue May 1 17:32:43 2018
(r333145)
@@ -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: head/sys/i386/i386/minidump_machdep.c
==============================================================================
--- head/sys/i386/i386/minidump_machdep.c Tue May 1 16:30:48 2018
(r333144)
+++ head/sys/i386/i386/minidump_machdep.c Tue May 1 17:32:43 2018
(r333145)
@@ -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: head/sys/kern/kern_dump.c
==============================================================================
--- head/sys/kern/kern_dump.c Tue May 1 16:30:48 2018 (r333144)
+++ head/sys/kern/kern_dump.c Tue May 1 17:32:43 2018 (r333145)
@@ -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: head/sys/mips/mips/minidump_machdep.c
==============================================================================
--- head/sys/mips/mips/minidump_machdep.c Tue May 1 16:30:48 2018
(r333144)
+++ head/sys/mips/mips/minidump_machdep.c Tue May 1 17:32:43 2018
(r333145)
@@ -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: head/sys/sparc64/sparc64/dump_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/dump_machdep.c Tue May 1 16:30:48 2018
(r333144)
+++ head/sys/sparc64/sparc64/dump_machdep.c Tue May 1 17:32:43 2018
(r333145)
@@ -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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
