use speed-up macros in fs.h

[unix-history] / usr / src / sbin / dumpfs / dumpfs.c

diff --git a/usr/src/sbin/dumpfs/dumpfs.c b/usr/src/sbin/dumpfs/dumpfs.c
index 6105a2d..237a4f1 100644 (file)
--- a/usr/src/sbin/dumpfs/dumpfs.c
+++ b/usr/src/sbin/dumpfs/dumpfs.c
@@ -1,4 +1,5 @@
-static char *sccsid = "@(#)dumpfs.c    1.4 (Berkeley) %G%";
+static char *sccsid = "@(#)dumpfs.c    1.11 (Berkeley) %G%";
+

 #include "../h/param.h"
 #include "../h/fs.h"
 #include "../h/inode.h"
 #include "../h/param.h"
 #include "../h/fs.h"
 #include "../h/inode.h"


@@ -9,69 +10,91 @@ static       char *sccsid = "@(#)dumpfs.c    1.4 (Berkeley) %G%";
 
 union {
        struct fs fs;
 
 union {
        struct fs fs;

-       char pad[BSIZE];
+       char pad[MAXBSIZE];

 } fsun;
 #define        afs     fsun.fs
 
 union {
        struct cg cg;
 } fsun;
 #define        afs     fsun.fs
 
 union {
        struct cg cg;

-       char pad[BSIZE];
+       char pad[MAXBSIZE];

 } cgun;
 #define        acg     cgun.cg
 
 main(argc, argv)
        char **argv;
 {
 } cgun;
 #define        acg     cgun.cg
 
 main(argc, argv)
        char **argv;
 {

-       int i, j, k;
+       int c, i, j, k;

 
        close(0);
        if (open(argv[1], 0) != 0)
                perror(argv[1]), exit(1);
 
        close(0);
        if (open(argv[1], 0) != 0)
                perror(argv[1]), exit(1);

-       lseek(0, SBLOCK*FSIZE, 0);
-       if (read(0, &afs, BSIZE) != BSIZE)
+       lseek(0, SBLOCK * DEV_BSIZE, 0);
+       if (read(0, &afs, SBSIZE) != SBSIZE)

                perror(argv[1]), exit(1);
                perror(argv[1]), exit(1);

-       printf("magic\t%x\n", afs.fs_magic);
-       printf("sblkno\t%d\n", afs.fs_sblkno);
-       printf("time\t%s", ctime(&afs.fs_time));
-       printf("size\t%d\n", afs.fs_size);
-       printf("ncg\t%d\n", afs.fs_ncg);
-       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("bblkno\t%d\tsblkno\t%d\n", afs.fs_bblkno, afs.fs_sblkno);
+       printf("cblkno\t%d\tiblkno\t%d\tdblkno\t%d\n",
+           afs.fs_cblkno, afs.fs_iblkno, afs.fs_dblkno);
+       printf("ncg\t%d\tsize\t%d\tblocks\t%d\tcgsize\t%d\n",
+           afs.fs_ncg, afs.fs_size, afs.fs_dsize, afs.fs_cgsize);
+       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\tminfree\t%d%%\n", afs.fs_frag, afs.fs_minfree);
+       printf("rotdelay %dms\trps\t%d\n", afs.fs_rotdelay, afs.fs_rps);
+       printf("csaddr\t%d\tcssize\t%d\n", afs.fs_csaddr, afs.fs_cssize);
+       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);
            afs.fs_ntrak, afs.fs_nsect, afs.fs_spc, afs.fs_ncyl);

-       printf("cpg\t%d\nfpg\t%d\nipg\t%d\n",
-           afs.fs_cpg, afs.fs_fpg, afs.fs_ipg);
-       printf("nffree\t%d\nnbfree\t%d\nnifree\t%d\n",
-           afs.fs_nffree, afs.fs_nbfree, afs.fs_nifree);
-       printf("cgrotor\t%d\nblocks available in each rotational position",
-           afs.fs_cgrotor);
-       for (i = 0; i < NRPOS; i++) {
-               if (afs.fs_postbl[i] > -1)
-                       printf("\nposition %d:\t", i);
-               for (j = afs.fs_postbl[i], k = 1; j > -1;
-                    j = afs.fs_rotbl[j], k++) {
-                       if (k % 15 == 0)
-                               printf("\n\t\t");
-                       printf("%4d", j);
+       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("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");
+       else
+               printf("insufficient space to maintain rotational tables\n");
+       for (c = 0; c < afs.fs_cpc; c++) {
+               printf("\ncylinder number %d:", c);
+               for (i = 0; i < NRPOS; i++) {
+                       if (afs.fs_postbl[c][i] == -1)
+                               continue;
+                       printf("\n   position %d:\t", i);
+                       for (j = afs.fs_postbl[c][i], k = 1; ;
+                            j += afs.fs_rotbl[j], k++) {
+                               printf("%5d", j);
+                               if (k % 12 == 0)
+                                       printf("\n\t\t");
+                               if (afs.fs_rotbl[j] == 0)
+                                       break;
+                       }

                }
        }
                }
        }

-       printf("\ncs[].cs_(nbfree,ndir,nifree):\n\t");
-       for (i = 0; i < howmany(cssize(&afs), BSIZE); i++) {
-               afs.fs_csp[i] = (struct csum *)calloc(1, BSIZE);
-               lseek(0, (csaddr(&afs) + (i * FRAG)) * FSIZE, 0);
-               if (read(0, afs.fs_csp[i], BSIZE) != BSIZE)
+       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))) *
+                   DEV_BSIZE, 0);
+               if (read(0, afs.fs_csp[i], afs.fs_bsize) != afs.fs_bsize)

                        perror(argv[1]), exit(1);
        }
        for (i = 0; i < afs.fs_ncg; i++) {
                        perror(argv[1]), exit(1);
        }
        for (i = 0; i < afs.fs_ncg; i++) {

-               struct csum *cs = &afs.fs_cs(i);
-               if (i && i % 5 == 0)
+               struct csum *cs = &afs.fs_cs(&afs, i);
+               if (i && i % 4 == 0)

                        printf("\n\t");
                        printf("\n\t");

-               printf("(%d,%d,%d) ",
-                   cs->cs_nbfree, cs->cs_ndir, cs->cs_nifree);
+               printf("(%d,%d,%d,%d) ",
+                   cs->cs_nbfree, cs->cs_ndir, cs->cs_nifree, cs->cs_nffree);

        }
        printf("\n");
        }
        printf("\n");

-       printf("fmod\t%d\n", afs.fs_fmod);
-       printf("ronly\t%d\n", afs.fs_ronly);
+       if (afs.fs_ncyl % afs.fs_cpg) {
+               printf("cylinders in last group %d\n",
+                   i = afs.fs_ncyl % afs.fs_cpg);
+               printf("blocks in last group %d\n",
+                   i * afs.fs_spc / NSPB(&afs));
+       }

        printf("\n");
        for (i = 0; i < afs.fs_ncg; i++)
                dumpcg(i);
        printf("\n");
        for (i = 0; i < afs.fs_ncg; i++)
                dumpcg(i);


@@ -83,20 +106,22 @@ dumpcg(c)
        int i,j;
 
        printf("\ncg %d:\n", c);
        int i,j;
 
        printf("\ncg %d:\n", c);

-       lseek(0, cgtod(c,&afs)*FSIZE, 0);
-       printf("tell\t%x\n", tell(0));
-       if (read(0, (char *)&acg, afs.fs_cgsize) != afs.fs_cgsize) {
+       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("\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);
            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_nifree, acg.cg_ndir, acg.cg_nffree, acg.cg_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);
            acg.cg_rotor, acg.cg_irotor, acg.cg_frotor);

-       for (i = 1, j = 0; i < FRAG; i++) {
+       for (i = 1, j = 0; i < afs.fs_frag; i++) {

                printf("\t%d", acg.cg_frsum[i]);
                j += i * acg.cg_frsum[i];
        }
                printf("\t%d", acg.cg_frsum[i]);
                j += i * acg.cg_frsum[i];
        }


@@ -106,7 +131,7 @@ dumpcg(c)
        pbits(acg.cg_free, afs.fs_fpg);
        printf("b:\n");
        for (i = 0; i < afs.fs_cpg; i++) {
        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");
                for (j = 0; j < NRPOS; j++)
                        printf(" %d", acg.cg_b[i][j]);
                printf("\n");


@@ -123,7 +148,7 @@ pbits(cp, max)
        for (i = 0; i < max; i++)
                if (isset(cp, i)) {
                        if (count)
        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;
                        count++;
                        printf("%d", i);
                        j = i;