X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/aca50d7296cc3e2825b611a927ec17784417ea8c..6e46685335818354c9836839f764d77223a6e94c:/usr/src/sbin/dumpfs/dumpfs.c diff --git a/usr/src/sbin/dumpfs/dumpfs.c b/usr/src/sbin/dumpfs/dumpfs.c index 431e45d8b8..3b3750405e 100644 --- a/usr/src/sbin/dumpfs/dumpfs.c +++ b/usr/src/sbin/dumpfs/dumpfs.c @@ -1,8 +1,14 @@ -static char *sccsid = "@(#)dumpfs.c 1.8 (Berkeley) %G%"; +static char *sccsid = "@(#)dumpfs.c 2.4 (Berkeley) %G%"; +#ifndef SIMFS +#include +#include +#include +#else #include "../h/param.h" -#include "../h/fs.h" #include "../h/inode.h" +#include "../h/fs.h" +#endif /* * dumpfs @@ -23,7 +29,7 @@ union { main(argc, argv) char **argv; { - int c, i, j, k; + int c, i, j, k, size; close(0); if (open(argv[1], 0) != 0) @@ -31,33 +37,35 @@ main(argc, argv) lseek(0, SBLOCK * DEV_BSIZE, 0); if (read(0, &afs, SBSIZE) != SBSIZE) perror(argv[1]), exit(1); - printf("magic\t%x\n", afs.fs_magic); - printf("bblkno\t%d\n", afs.fs_bblkno); - printf("sblkno\t%d\n", afs.fs_sblkno); - printf("cblkno\t%d\n", afs.fs_cblkno); - printf("iblkno\t%d\n", afs.fs_iblkno); - printf("dblkno\t%d\n", afs.fs_dblkno); - printf("time\t%s", ctime(&afs.fs_time)); - printf("size\t%d\n", afs.fs_size); - printf("blocks\t%d\n", afs.fs_dsize); - printf("ncg\t%d\n", afs.fs_ncg); - printf("bsize\t%d\n", afs.fs_bsize); - printf("fsize\t%d\n", afs.fs_fsize); - printf("frag\t%d\n", afs.fs_frag); - printf("minfree\t%d%%\n", afs.fs_minfree); - printf("rotdelay %dms\n", afs.fs_rotdelay); - printf("rps\t%d\n", afs.fs_rps); - printf("csaddr\t%d\n", afs.fs_csaddr); - printf("cssize\t%d\n", afs.fs_cssize); - printf("cgsize\t%d\n", afs.fs_cgsize); - printf("ntrak\t%d\nnsect\t%d\nspc\t%d\nncyl\t%d\n", + printf("magic\t%x\ttime\t%s", afs.fs_magic, ctime(&afs.fs_time)); + printf("sblkno\t%d\tcblkno\t%d\tiblkno\t%d\tdblkno\t%d\n", + afs.fs_sblkno, afs.fs_cblkno, afs.fs_iblkno, afs.fs_dblkno); + printf("sbsize\t%d\tcgsize\t%d\tcgoffset %d\tcgmask\t0x%08x\n", + afs.fs_sbsize, afs.fs_cgsize, afs.fs_cgoffset, afs.fs_cgmask); + printf("ncg\t%d\tsize\t%d\tblocks\t%d\n", + afs.fs_ncg, afs.fs_size, afs.fs_dsize); + printf("bsize\t%d\tshift\t%d\tmask\t0x%08x\n", + afs.fs_bsize, afs.fs_bshift, afs.fs_bmask); + printf("fsize\t%d\tshift\t%d\tmask\t0x%08x\n", + afs.fs_fsize, afs.fs_fshift, afs.fs_fmask); + printf("frag\t%d\tshift\t%d\tfsbtodb\t%d\n", + afs.fs_frag, afs.fs_fragshift, afs.fs_fsbtodb); + printf("minfree\t%d%%\tmaxbpg\t%d\n", + afs.fs_minfree, afs.fs_maxbpg); + printf("maxcontig %d\trotdelay %dms\trps\t%d\n", + afs.fs_maxcontig, afs.fs_rotdelay, afs.fs_rps); + printf("csaddr\t%d\tcssize\t%d\tshift\t%d\tmask\t0x%08x\n", + afs.fs_csaddr, afs.fs_cssize, afs.fs_csshift, afs.fs_csmask); + printf("ntrak\t%d\tnsect\t%d\tspc\t%d\tncyl\t%d\n", afs.fs_ntrak, afs.fs_nsect, afs.fs_spc, afs.fs_ncyl); - printf("cpg\t%d\nbpg\t%d\nfpg\t%d\nipg\t%d\n", + printf("cpg\t%d\tbpg\t%d\tfpg\t%d\tipg\t%d\n", afs.fs_cpg, afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg); - printf("ndir\t%d\nnffree\t%d\nnbfree\t%d\nnifree\t%d\n", - afs.fs_cstotal.cs_ndir, afs.fs_cstotal.cs_nffree, - afs.fs_cstotal.cs_nbfree, afs.fs_cstotal.cs_nifree); - printf("cgrotor\t%d\nfmod\t%d\nronly\t%d\n", + printf("nindir\t%d\tinopb\t%d\tnspf\t%d\n", + afs.fs_nindir, afs.fs_inopb, afs.fs_nspf); + printf("nbfree\t%d\tndir\t%d\tnifree\t%d\tnffree\t%d\n", + afs.fs_cstotal.cs_nbfree, afs.fs_cstotal.cs_ndir, + afs.fs_cstotal.cs_nifree, afs.fs_cstotal.cs_nffree); + printf("cgrotor\t%d\tfmod\t%d\tronly\t%d\n", afs.fs_cgrotor, afs.fs_fmod, afs.fs_ronly); if (afs.fs_cpc != 0) printf("blocks available in each rotational position"); @@ -80,11 +88,13 @@ main(argc, argv) } } printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t"); - for (i = 0; i < howmany(afs.fs_cssize, afs.fs_bsize); i++) { - afs.fs_csp[i] = (struct csum *)calloc(1, afs.fs_bsize); - lseek(0, fsbtodb(&afs, (afs.fs_csaddr + (i * afs.fs_frag))) * + for (i = 0, j = 0; i < afs.fs_cssize; i += afs.fs_bsize, j++) { + size = afs.fs_cssize - i < afs.fs_bsize ? + afs.fs_cssize - i : afs.fs_bsize; + afs.fs_csp[j] = (struct csum *)calloc(1, size); + lseek(0, fsbtodb(&afs, (afs.fs_csaddr + j * afs.fs_frag)) * DEV_BSIZE, 0); - if (read(0, afs.fs_csp[i], afs.fs_bsize) != afs.fs_bsize) + if (read(0, afs.fs_csp[j], size) != size) perror(argv[1]), exit(1); } for (i = 0; i < afs.fs_ncg; i++) { @@ -112,19 +122,20 @@ dumpcg(c) int i,j; printf("\ncg %d:\n", c); - lseek(0, fsbtodb(&afs, cgtod(c,&afs)) * DEV_BSIZE, 0); - printf("tell\t%x\n", tell(0)); + lseek(0, fsbtodb(&afs, cgtod(&afs, c)) * DEV_BSIZE, 0); + i = tell(0); if (read(0, (char *)&acg, afs.fs_bsize) != afs.fs_bsize) { printf("\terror reading cg\n"); return; } - printf("magic\t%x\ntime\t%s", acg.cg_magic, ctime(&acg.cg_time)); - printf("cgx\t%d\nncyl\t%d\nniblk\t%d\nndblk\t%d\n", + printf("magic\t%x\ttell\t%x\ttime\t%s", + acg.cg_magic, i, ctime(&acg.cg_time)); + printf("cgx\t%d\tncyl\t%d\tniblk\t%d\tndblk\t%d\n", acg.cg_cgx, acg.cg_ncyl, acg.cg_niblk, acg.cg_ndblk); - printf("nifree\t%d\nndir\t%d\nnffree\t%d\nnbfree\t%d\n", - acg.cg_cs.cs_nifree, acg.cg_cs.cs_ndir, - acg.cg_cs.cs_nffree, acg.cg_cs.cs_nbfree); - printf("rotor\t%d\nirotor\t%d\nfrotor\t%d\nfrsum", + printf("nbfree\t%d\tndir\t%d\tnifree\t%d\tnffree\t%d\n", + acg.cg_cs.cs_nbfree, acg.cg_cs.cs_ndir, + acg.cg_cs.cs_nifree, acg.cg_cs.cs_nffree); + printf("rotor\t%d\tirotor\t%d\tfrotor\t%d\nfrsum", acg.cg_rotor, acg.cg_irotor, acg.cg_frotor); for (i = 1, j = 0; i < afs.fs_frag; i++) { printf("\t%d", acg.cg_frsum[i]); @@ -136,7 +147,7 @@ dumpcg(c) pbits(acg.cg_free, afs.fs_fpg); printf("b:\n"); for (i = 0; i < afs.fs_cpg; i++) { - printf(" c%d:\t", i); + printf(" c%d:\t(%d)\t", i, acg.cg_btot[i]); for (j = 0; j < NRPOS; j++) printf(" %d", acg.cg_b[i][j]); printf("\n"); @@ -153,7 +164,7 @@ pbits(cp, max) for (i = 0; i < max; i++) if (isset(cp, i)) { if (count) - printf(",%s", count %10 == 9 ? "\n\t" : " "); + printf(",%s", count %9 == 8 ? "\n\t" : " "); count++; printf("%d", i); j = i;