d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print the dump progress indicator after calling dump_start().

Browse Source 
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
This commit is contained in:
markj 2018-05-01 17:32:43 +00:00
parent a3eb1e9afb
commit 65dc9f377b
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/amd64/minidump_machdep.c
View File

@ -337,13 +337,13 @@ minidumpsys(struct dumperinfo *di)
dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION,
dumpsize); dumpsize);
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576);
error = dump_start(di, &kdh); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576);
/* Dump my header */ /* Dump my header */
bzero(&fakepd, sizeof(fakepd)); bzero(&fakepd, sizeof(fakepd));
bcopy(&mdhdr, &fakepd, sizeof(mdhdr)); bcopy(&mdhdr, &fakepd, sizeof(mdhdr));

6
sys/arm/arm/minidump_machdep.c
View File

@ -246,13 +246,13 @@ minidumpsys(struct dumperinfo *di)
dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION,
dumpsize); 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); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("Physical memory: %u MB\n", ptoa((uintmax_t)physmem) / 1048576);
printf("Dumping %llu MB:", (long long)dumpsize >> 20);
/* Dump my header */ /* Dump my header */
bzero(dumpbuf, sizeof(dumpbuf)); bzero(dumpbuf, sizeof(dumpbuf));
bcopy(&mdhdr, dumpbuf, sizeof(mdhdr)); bcopy(&mdhdr, dumpbuf, sizeof(mdhdr));

6
sys/arm64/arm64/minidump_machdep.c
View File

@ -289,13 +289,13 @@ minidumpsys(struct dumperinfo *di)
dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_AARCH64_VERSION, dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_AARCH64_VERSION,
dumpsize); dumpsize);
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576);
error = dump_start(di, &kdh); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576);
/* Dump my header */ /* Dump my header */
bzero(&tmpbuffer, sizeof(tmpbuffer)); bzero(&tmpbuffer, sizeof(tmpbuffer));
bcopy(&mdhdr, &tmpbuffer, sizeof(mdhdr)); bcopy(&mdhdr, &tmpbuffer, sizeof(mdhdr));

6
sys/i386/i386/minidump_machdep.c
View File

@ -254,13 +254,13 @@ minidumpsys(struct dumperinfo *di)
dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_I386_VERSION, dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_I386_VERSION,
dumpsize); 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); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576);
printf("Dumping %llu MB:", (long long)dumpsize >> 20);
/* Dump my header */ /* Dump my header */
bzero(&fakept, sizeof(fakept)); bzero(&fakept, sizeof(fakept));
bcopy(&mdhdr, &fakept, sizeof(mdhdr)); bcopy(&mdhdr, &fakept, sizeof(mdhdr));

6
sys/kern/kern_dump.c
View File

@ -330,13 +330,13 @@ dumpsys_generic(struct dumperinfo *di)
dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_ARCH_VERSION, dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_ARCH_VERSION,
dumpsize); dumpsize);
printf("Dumping %ju MB (%d chunks)\n", (uintmax_t)dumpsize >> 20,
ehdr.e_phnum - DUMPSYS_NUM_AUX_HDRS);
error = dump_start(di, &kdh); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("Dumping %ju MB (%d chunks)\n", (uintmax_t)dumpsize >> 20,
ehdr.e_phnum - DUMPSYS_NUM_AUX_HDRS);
/* Dump ELF header */ /* Dump ELF header */
error = dumpsys_buf_write(di, (char*)&ehdr, sizeof(ehdr)); error = dumpsys_buf_write(di, (char*)&ehdr, sizeof(ehdr));
if (error) if (error)

6
sys/mips/mips/minidump_machdep.c
View File

@ -264,13 +264,13 @@ minidumpsys(struct dumperinfo *di)
dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_MIPS_VERSION, dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_MIPS_VERSION,
dumpsize); dumpsize);
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576);
error = dump_start(di, &kdh); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576);
/* Dump my header */ /* Dump my header */
bzero(tmpbuffer, sizeof(tmpbuffer)); bzero(tmpbuffer, sizeof(tmpbuffer));
bcopy(&mdhdr, tmpbuffer, sizeof(mdhdr)); bcopy(&mdhdr, tmpbuffer, sizeof(mdhdr));

4
sys/sparc64/sparc64/dump_machdep.c
View File

@ -98,12 +98,12 @@ dumpsys(struct dumperinfo *di)
dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION, dump_init_header(di, &kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION,
size); size);
printf("Dumping %lu MB (%d chunks)\n", (u_long)(size >> 20), nreg);
error = dump_start(di, &kdh); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("Dumping %lu MB (%d chunks)\n", (u_long)(size >> 20), nreg);
/* Dump the private header. */ /* Dump the private header. */
hdr.dh_hdr_size = hdrsize; hdr.dh_hdr_size = hdrsize;
hdr.dh_tsb_pa = tsb_kernel_phys; hdr.dh_tsb_pa = tsb_kernel_phys;