From 6f77b2defce99e1a9092ae01da2af17c61f0e0f2 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sun, 12 Dec 1999 16:43:05 +0000 Subject: [PATCH] Use a seperate -c and -h mode. The vnode_if.c file is compiled only into the kernel while the vnode_if.h header is a bunch of inlines to call the code that is in the kernel. Generating the .h file on the fly is kinda bogus because it has to match the one compiled into the kernel. IMHO we should have kern/vnode_if.c and sys/vnode_if.h committed in the tree but that's another battle. --- sys/alpha/conf/Makefile.alpha | 11 +- sys/conf/Makefile.alpha | 11 +- sys/conf/Makefile.i386 | 11 +- sys/conf/Makefile.powerpc | 11 +- sys/i386/conf/Makefile.i386 | 11 +- sys/kern/vnode_if.pl | 269 +++++++++++++++++++--------------- sys/kern/vnode_if.sh | 269 +++++++++++++++++++--------------- sys/tools/vnode_if.awk | 269 +++++++++++++++++++--------------- 8 files changed, 479 insertions(+), 383 deletions(-) diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha index a0193bc458b..06657d4bc6e 100644 --- a/sys/alpha/conf/Makefile.alpha +++ b/sys/alpha/conf/Makefile.alpha @@ -218,7 +218,8 @@ __reml.S: ${S}/alpha/alpha/divrem.m4 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h -depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} +depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ + ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES} rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES} @@ -288,9 +289,11 @@ vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} vers.o: ${NORMAL_C} -.ORDER: vnode_if.c vnode_if.h -vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src - sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -h $S/kern/vnode_if.src + +vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -h $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index a0193bc458b..06657d4bc6e 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -218,7 +218,8 @@ __reml.S: ${S}/alpha/alpha/divrem.m4 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h -depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} +depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ + ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES} rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES} @@ -288,9 +289,11 @@ vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} vers.o: ${NORMAL_C} -.ORDER: vnode_if.c vnode_if.h -vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src - sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -h $S/kern/vnode_if.src + +vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -h $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index ffd538bc435..f87b33c8e64 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -195,7 +195,8 @@ genassym: genassym.o ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h -depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} +depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ + ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES} rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES} @@ -265,9 +266,11 @@ vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} vers.o: ${NORMAL_C} -.ORDER: vnode_if.c vnode_if.h -vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src - sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -c $S/kern/vnode_if.src + +vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -h $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index ffd538bc435..f87b33c8e64 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -195,7 +195,8 @@ genassym: genassym.o ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h -depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} +depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ + ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES} rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES} @@ -265,9 +266,11 @@ vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} vers.o: ${NORMAL_C} -.ORDER: vnode_if.c vnode_if.h -vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src - sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -c $S/kern/vnode_if.src + +vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -h $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index ffd538bc435..f87b33c8e64 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -195,7 +195,8 @@ genassym: genassym.o ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h -depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} +depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ + ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES} rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES} @@ -265,9 +266,11 @@ vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} vers.o: ${NORMAL_C} -.ORDER: vnode_if.c vnode_if.h -vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src - sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -c $S/kern/vnode_if.src + +vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src + perl $S/kern/vnode_if.sh -h $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} diff --git a/sys/kern/vnode_if.pl b/sys/kern/vnode_if.pl index 463057cc52f..f8675cd1d71 100644 --- a/sys/kern/vnode_if.pl +++ b/sys/kern/vnode_if.pl @@ -45,25 +45,40 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' my %lockdata; +$cfile = 0; +$hfile = 0; -if ($#ARGV != 0) { - print "usage: vnode_if.sh srcfile\n"; - exit(1); +# Process the command line +# +while ($arg = shift @ARGV) { + if ($arg eq '-c') { + $cfile = 1; + } elsif ($arg eq '-h') { + $hfile = 1; + } elsif ($arg eq '-ch' || $arg eq '-hc') { + $cfile = 1; + $hfile = 1; + } elsif ($arg =~ m/\.src$/) { + $SRC = $arg; + } else { + print "usage: vnode_if.sh [-c] [-h] srcfile\n"; + exit(1); + } +} +if (!$cfile and !$hfile) { + exit(0); # nothing asked for.. } - -# Name of the source file. -$SRC=$ARGV[0]; # Names of the created files. $CFILE='vnode_if.c'; $HEADER='vnode_if.h'; -open(HEADER, ">$HEADER") || die "Unable to create $HEADER"; -open(CFILE, ">$CFILE") || die "Unable to create $CFILE"; open(SRC, "<$SRC") || die "Unable to open input file"; -# Print out header information for vnode_if.h. -print HEADER <$HEADER") || die "Unable to create $HEADER"; + # Print out header information for vnode_if.h. + print HEADER <$CFILE") || die "Unable to create $CFILE"; + # Print out header information for vnode_if.c. + print CFILE <) { chop; # strip record separator @@ -187,128 +206,136 @@ line: while () { $args{$numargs} = $arg; } - # Print out the vop_F_args structure. - print HEADER "struct ${name}_args {\n\tstruct vnodeop_desc *a_desc;\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**)(\S*\;)/; - print HEADER "\t$3 $4a_$5\n", - } - print HEADER "};\n"; - - # Print out extern declaration. - print HEADER "extern struct vnodeop_desc ${name}_desc;\n"; - - # Print out prototype. - print HEADER "static __inline int ${uname} __P((\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*)\;/; - print HEADER "\t$3 $4" . - ($c2 < $numargs-1 ? "," : "));") . "\n"; - } - - # Print out function. - print HEADER "static __inline int ${uname}("; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /\**([^;\s]*)\;[^\s]*$/; - print HEADER "$1" . ($c2 < $numargs - 1 ? ', ' : ")\n"); - } - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*\;)/; - print HEADER "\t$3 $4\n"; - } - print HEADER "{\n\tstruct ${name}_args a;\n"; - print HEADER "\tint rc;\n"; - print HEADER "\ta.a_desc = VDESC(${name});\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /(\**)([^;\s]*)([^\s]*)$/; - print HEADER "\ta.a_$2 = $2$3\n", - } - for ($c2 = 0; $c2 < $numargs; ++$c2) { - if (!exists($args{$c2})) { - die "Internal error"; + if ($hfile) { + # Print out the vop_F_args structure. + print HEADER "struct ${name}_args {\n\tstruct vnodeop_desc *a_desc;\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**)(\S*\;)/; + print HEADER "\t$3 $4a_$5\n", } - if (exists($lockdata{$name}) && - exists($lockdata{$name}->{$args{$c2}})) { - if ($ENV{'DEBUG_ALL_VFS_LOCKS'} =~ /yes/i) { - # Add assertions for locking - if ($lockdata{$name}->{$args{$c2}}->{Entry} eq "L") { - print HEADER - "\tASSERT_VOP_LOCKED($args{$c2}, \"$uname\");\n"; - } elsif ($lockdata{$name}->{$args{$c2}}->{Entry} eq "U") { - print HEADER - "\tASSERT_VOP_UNLOCKED($args{$c2}, \"$uname\");\n"; - } elsif (0) { - # XXX More checks! + print HEADER "};\n"; + + # Print out extern declaration. + print HEADER "extern struct vnodeop_desc ${name}_desc;\n"; + + # Print out prototype. + print HEADER "static __inline int ${uname} __P((\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*)\;/; + print HEADER "\t$3 $4" . + ($c2 < $numargs-1 ? "," : "));") . "\n"; + } + + # Print out function. + print HEADER "static __inline int ${uname}("; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /\**([^;\s]*)\;[^\s]*$/; + print HEADER "$1" . ($c2 < $numargs - 1 ? ', ' : ")\n"); + } + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*\;)/; + print HEADER "\t$3 $4\n"; + } + print HEADER "{\n\tstruct ${name}_args a;\n"; + print HEADER "\tint rc;\n"; + print HEADER "\ta.a_desc = VDESC(${name});\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /(\**)([^;\s]*)([^\s]*)$/; + print HEADER "\ta.a_$2 = $2$3\n", + } + for ($c2 = 0; $c2 < $numargs; ++$c2) { + if (!exists($args{$c2})) { + die "Internal error"; + } + if (exists($lockdata{$name}) && + exists($lockdata{$name}->{$args{$c2}})) { + if ($ENV{'DEBUG_ALL_VFS_LOCKS'} =~ /yes/i) { + # Add assertions for locking + if ($lockdata{$name}->{$args{$c2}}->{Entry} eq "L") { + print HEADER + "\tASSERT_VOP_LOCKED($args{$c2}, \"$uname\");\n"; + } elsif ($lockdata{$name}->{$args{$c2}}->{Entry} eq "U") { + print HEADER + "\tASSERT_VOP_UNLOCKED($args{$c2}, \"$uname\");\n"; + } elsif (0) { + # XXX More checks! + } } } } + $a{0} =~ /\s\**([^;\s]*);/; + print HEADER "\trc = VCALL($1, VOFFSET(${name}), &a);\n"; + print HEADER "\treturn (rc);\n"; + print HEADER "}\n"; } - $a{0} =~ /\s\**([^;\s]*);/; - print HEADER "\trc = VCALL($1, VOFFSET(${name}), &a);\n"; - print HEADER "\treturn (rc);\n"; - print HEADER "}\n"; - # Print out the vop_F_vp_offsets structure. This all depends - # on naming conventions and nothing else. - printf CFILE "static int %s_vp_offsets[] = {\n", $name; - # as a side effect, figure out the releflags - $releflags = ''; - $vpnum = 0; - for ($i = 0; $i < $numargs; $i++) { - if ($types{$i} eq 'struct vnode *') { - printf CFILE "\tVOPARG_OFFSETOF(struct %s_args,a_%s),\n", - $name, $args{$i}; - if ($reles{$i} eq 'WILLRELE') { - $releflags = $releflags . '|VDESC_VP' . $vpnum . '_WILLRELE'; + if ($cfile) { + # Print out the vop_F_vp_offsets structure. This all depends + # on naming conventions and nothing else. + printf CFILE "static int %s_vp_offsets[] = {\n", $name; + # as a side effect, figure out the releflags + $releflags = ''; + $vpnum = 0; + for ($i = 0; $i < $numargs; $i++) { + if ($types{$i} eq 'struct vnode *') { + printf CFILE "\tVOPARG_OFFSETOF(struct %s_args,a_%s),\n", + $name, $args{$i}; + if ($reles{$i} eq 'WILLRELE') { + $releflags = $releflags . '|VDESC_VP' . $vpnum . '_WILLRELE'; + } + + $vpnum++; } - - $vpnum++; } - } - $releflags =~ s/^\|//; - print CFILE "\tVDESC_NO_OFFSET\n"; - print CFILE "};\n"; + $releflags =~ s/^\|//; + print CFILE "\tVDESC_NO_OFFSET\n"; + print CFILE "};\n"; - # Print out the vnodeop_desc structure. - print CFILE "struct vnodeop_desc ${name}_desc = {\n"; - # offset - print CFILE "\t0,\n"; - # printable name - printf CFILE "\t\"%s\",\n", $name; - # flags - $vppwillrele = ''; - for ($i = 0; $i < $numargs; $i++) { - if ($types{$i} eq 'struct vnode **' && - ($reles{$i} eq 'WILLRELE')) { - $vppwillrele = '|VDESC_VPP_WILLRELE'; + # Print out the vnodeop_desc structure. + print CFILE "struct vnodeop_desc ${name}_desc = {\n"; + # offset + print CFILE "\t0,\n"; + # printable name + printf CFILE "\t\"%s\",\n", $name; + # flags + $vppwillrele = ''; + for ($i = 0; $i < $numargs; $i++) { + if ($types{$i} eq 'struct vnode **' && + ($reles{$i} eq 'WILLRELE')) { + $vppwillrele = '|VDESC_VPP_WILLRELE'; + } } - } - if ($releflags eq '') { - printf CFILE "\t0%s,\n", $vppwillrele; - } - else { - printf CFILE "\t%s%s,\n", $releflags, $vppwillrele; - } + if ($releflags eq '') { + printf CFILE "\t0%s,\n", $vppwillrele; + } + else { + printf CFILE "\t%s%s,\n", $releflags, $vppwillrele; + } - # vp offsets - printf CFILE "\t%s_vp_offsets,\n", $name; - # vpp (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct vnode **'); - # cred (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct ucred *'); - # proc (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct proc *'); - # componentname - printf CFILE "\t%s,\n", &find_arg_with_type('struct componentname *'); - # transport layer information - print CFILE "\tNULL,\n};\n\n"; + # vp offsets + printf CFILE "\t%s_vp_offsets,\n", $name; + # vpp (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct vnode **'); + # cred (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct ucred *'); + # proc (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct proc *'); + # componentname + printf CFILE "\t%s,\n", &find_arg_with_type('struct componentname *'); + # transport layer information + print CFILE "\tNULL,\n};\n\n"; + } +} + +if ($hfile) { + close(HEADER) || die "Unable to close $HEADER"; +} +if ($cfile) { + close(CFILE) || die "Unable to close $CFILE"; } - -close(HEADER) || die "Unable to close $HEADER"; -close(CFILE) || die "Unable to close $CFILE"; close(SRC) || die; exit 0; diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh index 463057cc52f..f8675cd1d71 100644 --- a/sys/kern/vnode_if.sh +++ b/sys/kern/vnode_if.sh @@ -45,25 +45,40 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' my %lockdata; +$cfile = 0; +$hfile = 0; -if ($#ARGV != 0) { - print "usage: vnode_if.sh srcfile\n"; - exit(1); +# Process the command line +# +while ($arg = shift @ARGV) { + if ($arg eq '-c') { + $cfile = 1; + } elsif ($arg eq '-h') { + $hfile = 1; + } elsif ($arg eq '-ch' || $arg eq '-hc') { + $cfile = 1; + $hfile = 1; + } elsif ($arg =~ m/\.src$/) { + $SRC = $arg; + } else { + print "usage: vnode_if.sh [-c] [-h] srcfile\n"; + exit(1); + } +} +if (!$cfile and !$hfile) { + exit(0); # nothing asked for.. } - -# Name of the source file. -$SRC=$ARGV[0]; # Names of the created files. $CFILE='vnode_if.c'; $HEADER='vnode_if.h'; -open(HEADER, ">$HEADER") || die "Unable to create $HEADER"; -open(CFILE, ">$CFILE") || die "Unable to create $CFILE"; open(SRC, "<$SRC") || die "Unable to open input file"; -# Print out header information for vnode_if.h. -print HEADER <$HEADER") || die "Unable to create $HEADER"; + # Print out header information for vnode_if.h. + print HEADER <$CFILE") || die "Unable to create $CFILE"; + # Print out header information for vnode_if.c. + print CFILE <) { chop; # strip record separator @@ -187,128 +206,136 @@ line: while () { $args{$numargs} = $arg; } - # Print out the vop_F_args structure. - print HEADER "struct ${name}_args {\n\tstruct vnodeop_desc *a_desc;\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**)(\S*\;)/; - print HEADER "\t$3 $4a_$5\n", - } - print HEADER "};\n"; - - # Print out extern declaration. - print HEADER "extern struct vnodeop_desc ${name}_desc;\n"; - - # Print out prototype. - print HEADER "static __inline int ${uname} __P((\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*)\;/; - print HEADER "\t$3 $4" . - ($c2 < $numargs-1 ? "," : "));") . "\n"; - } - - # Print out function. - print HEADER "static __inline int ${uname}("; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /\**([^;\s]*)\;[^\s]*$/; - print HEADER "$1" . ($c2 < $numargs - 1 ? ', ' : ")\n"); - } - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*\;)/; - print HEADER "\t$3 $4\n"; - } - print HEADER "{\n\tstruct ${name}_args a;\n"; - print HEADER "\tint rc;\n"; - print HEADER "\ta.a_desc = VDESC(${name});\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /(\**)([^;\s]*)([^\s]*)$/; - print HEADER "\ta.a_$2 = $2$3\n", - } - for ($c2 = 0; $c2 < $numargs; ++$c2) { - if (!exists($args{$c2})) { - die "Internal error"; + if ($hfile) { + # Print out the vop_F_args structure. + print HEADER "struct ${name}_args {\n\tstruct vnodeop_desc *a_desc;\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**)(\S*\;)/; + print HEADER "\t$3 $4a_$5\n", } - if (exists($lockdata{$name}) && - exists($lockdata{$name}->{$args{$c2}})) { - if ($ENV{'DEBUG_ALL_VFS_LOCKS'} =~ /yes/i) { - # Add assertions for locking - if ($lockdata{$name}->{$args{$c2}}->{Entry} eq "L") { - print HEADER - "\tASSERT_VOP_LOCKED($args{$c2}, \"$uname\");\n"; - } elsif ($lockdata{$name}->{$args{$c2}}->{Entry} eq "U") { - print HEADER - "\tASSERT_VOP_UNLOCKED($args{$c2}, \"$uname\");\n"; - } elsif (0) { - # XXX More checks! + print HEADER "};\n"; + + # Print out extern declaration. + print HEADER "extern struct vnodeop_desc ${name}_desc;\n"; + + # Print out prototype. + print HEADER "static __inline int ${uname} __P((\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*)\;/; + print HEADER "\t$3 $4" . + ($c2 < $numargs-1 ? "," : "));") . "\n"; + } + + # Print out function. + print HEADER "static __inline int ${uname}("; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /\**([^;\s]*)\;[^\s]*$/; + print HEADER "$1" . ($c2 < $numargs - 1 ? ', ' : ")\n"); + } + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*\;)/; + print HEADER "\t$3 $4\n"; + } + print HEADER "{\n\tstruct ${name}_args a;\n"; + print HEADER "\tint rc;\n"; + print HEADER "\ta.a_desc = VDESC(${name});\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /(\**)([^;\s]*)([^\s]*)$/; + print HEADER "\ta.a_$2 = $2$3\n", + } + for ($c2 = 0; $c2 < $numargs; ++$c2) { + if (!exists($args{$c2})) { + die "Internal error"; + } + if (exists($lockdata{$name}) && + exists($lockdata{$name}->{$args{$c2}})) { + if ($ENV{'DEBUG_ALL_VFS_LOCKS'} =~ /yes/i) { + # Add assertions for locking + if ($lockdata{$name}->{$args{$c2}}->{Entry} eq "L") { + print HEADER + "\tASSERT_VOP_LOCKED($args{$c2}, \"$uname\");\n"; + } elsif ($lockdata{$name}->{$args{$c2}}->{Entry} eq "U") { + print HEADER + "\tASSERT_VOP_UNLOCKED($args{$c2}, \"$uname\");\n"; + } elsif (0) { + # XXX More checks! + } } } } + $a{0} =~ /\s\**([^;\s]*);/; + print HEADER "\trc = VCALL($1, VOFFSET(${name}), &a);\n"; + print HEADER "\treturn (rc);\n"; + print HEADER "}\n"; } - $a{0} =~ /\s\**([^;\s]*);/; - print HEADER "\trc = VCALL($1, VOFFSET(${name}), &a);\n"; - print HEADER "\treturn (rc);\n"; - print HEADER "}\n"; - # Print out the vop_F_vp_offsets structure. This all depends - # on naming conventions and nothing else. - printf CFILE "static int %s_vp_offsets[] = {\n", $name; - # as a side effect, figure out the releflags - $releflags = ''; - $vpnum = 0; - for ($i = 0; $i < $numargs; $i++) { - if ($types{$i} eq 'struct vnode *') { - printf CFILE "\tVOPARG_OFFSETOF(struct %s_args,a_%s),\n", - $name, $args{$i}; - if ($reles{$i} eq 'WILLRELE') { - $releflags = $releflags . '|VDESC_VP' . $vpnum . '_WILLRELE'; + if ($cfile) { + # Print out the vop_F_vp_offsets structure. This all depends + # on naming conventions and nothing else. + printf CFILE "static int %s_vp_offsets[] = {\n", $name; + # as a side effect, figure out the releflags + $releflags = ''; + $vpnum = 0; + for ($i = 0; $i < $numargs; $i++) { + if ($types{$i} eq 'struct vnode *') { + printf CFILE "\tVOPARG_OFFSETOF(struct %s_args,a_%s),\n", + $name, $args{$i}; + if ($reles{$i} eq 'WILLRELE') { + $releflags = $releflags . '|VDESC_VP' . $vpnum . '_WILLRELE'; + } + + $vpnum++; } - - $vpnum++; } - } - $releflags =~ s/^\|//; - print CFILE "\tVDESC_NO_OFFSET\n"; - print CFILE "};\n"; + $releflags =~ s/^\|//; + print CFILE "\tVDESC_NO_OFFSET\n"; + print CFILE "};\n"; - # Print out the vnodeop_desc structure. - print CFILE "struct vnodeop_desc ${name}_desc = {\n"; - # offset - print CFILE "\t0,\n"; - # printable name - printf CFILE "\t\"%s\",\n", $name; - # flags - $vppwillrele = ''; - for ($i = 0; $i < $numargs; $i++) { - if ($types{$i} eq 'struct vnode **' && - ($reles{$i} eq 'WILLRELE')) { - $vppwillrele = '|VDESC_VPP_WILLRELE'; + # Print out the vnodeop_desc structure. + print CFILE "struct vnodeop_desc ${name}_desc = {\n"; + # offset + print CFILE "\t0,\n"; + # printable name + printf CFILE "\t\"%s\",\n", $name; + # flags + $vppwillrele = ''; + for ($i = 0; $i < $numargs; $i++) { + if ($types{$i} eq 'struct vnode **' && + ($reles{$i} eq 'WILLRELE')) { + $vppwillrele = '|VDESC_VPP_WILLRELE'; + } } - } - if ($releflags eq '') { - printf CFILE "\t0%s,\n", $vppwillrele; - } - else { - printf CFILE "\t%s%s,\n", $releflags, $vppwillrele; - } + if ($releflags eq '') { + printf CFILE "\t0%s,\n", $vppwillrele; + } + else { + printf CFILE "\t%s%s,\n", $releflags, $vppwillrele; + } - # vp offsets - printf CFILE "\t%s_vp_offsets,\n", $name; - # vpp (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct vnode **'); - # cred (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct ucred *'); - # proc (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct proc *'); - # componentname - printf CFILE "\t%s,\n", &find_arg_with_type('struct componentname *'); - # transport layer information - print CFILE "\tNULL,\n};\n\n"; + # vp offsets + printf CFILE "\t%s_vp_offsets,\n", $name; + # vpp (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct vnode **'); + # cred (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct ucred *'); + # proc (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct proc *'); + # componentname + printf CFILE "\t%s,\n", &find_arg_with_type('struct componentname *'); + # transport layer information + print CFILE "\tNULL,\n};\n\n"; + } +} + +if ($hfile) { + close(HEADER) || die "Unable to close $HEADER"; +} +if ($cfile) { + close(CFILE) || die "Unable to close $CFILE"; } - -close(HEADER) || die "Unable to close $HEADER"; -close(CFILE) || die "Unable to close $CFILE"; close(SRC) || die; exit 0; diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 463057cc52f..f8675cd1d71 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -45,25 +45,40 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' my %lockdata; +$cfile = 0; +$hfile = 0; -if ($#ARGV != 0) { - print "usage: vnode_if.sh srcfile\n"; - exit(1); +# Process the command line +# +while ($arg = shift @ARGV) { + if ($arg eq '-c') { + $cfile = 1; + } elsif ($arg eq '-h') { + $hfile = 1; + } elsif ($arg eq '-ch' || $arg eq '-hc') { + $cfile = 1; + $hfile = 1; + } elsif ($arg =~ m/\.src$/) { + $SRC = $arg; + } else { + print "usage: vnode_if.sh [-c] [-h] srcfile\n"; + exit(1); + } +} +if (!$cfile and !$hfile) { + exit(0); # nothing asked for.. } - -# Name of the source file. -$SRC=$ARGV[0]; # Names of the created files. $CFILE='vnode_if.c'; $HEADER='vnode_if.h'; -open(HEADER, ">$HEADER") || die "Unable to create $HEADER"; -open(CFILE, ">$CFILE") || die "Unable to create $CFILE"; open(SRC, "<$SRC") || die "Unable to open input file"; -# Print out header information for vnode_if.h. -print HEADER <$HEADER") || die "Unable to create $HEADER"; + # Print out header information for vnode_if.h. + print HEADER <$CFILE") || die "Unable to create $CFILE"; + # Print out header information for vnode_if.c. + print CFILE <) { chop; # strip record separator @@ -187,128 +206,136 @@ line: while () { $args{$numargs} = $arg; } - # Print out the vop_F_args structure. - print HEADER "struct ${name}_args {\n\tstruct vnodeop_desc *a_desc;\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**)(\S*\;)/; - print HEADER "\t$3 $4a_$5\n", - } - print HEADER "};\n"; - - # Print out extern declaration. - print HEADER "extern struct vnodeop_desc ${name}_desc;\n"; - - # Print out prototype. - print HEADER "static __inline int ${uname} __P((\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*)\;/; - print HEADER "\t$3 $4" . - ($c2 < $numargs-1 ? "," : "));") . "\n"; - } - - # Print out function. - print HEADER "static __inline int ${uname}("; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /\**([^;\s]*)\;[^\s]*$/; - print HEADER "$1" . ($c2 < $numargs - 1 ? ', ' : ")\n"); - } - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*\;)/; - print HEADER "\t$3 $4\n"; - } - print HEADER "{\n\tstruct ${name}_args a;\n"; - print HEADER "\tint rc;\n"; - print HEADER "\ta.a_desc = VDESC(${name});\n"; - for ($c2 = 0; $c2 < $numargs; ++$c2) { - $a{$c2} =~ /(\**)([^;\s]*)([^\s]*)$/; - print HEADER "\ta.a_$2 = $2$3\n", - } - for ($c2 = 0; $c2 < $numargs; ++$c2) { - if (!exists($args{$c2})) { - die "Internal error"; + if ($hfile) { + # Print out the vop_F_args structure. + print HEADER "struct ${name}_args {\n\tstruct vnodeop_desc *a_desc;\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**)(\S*\;)/; + print HEADER "\t$3 $4a_$5\n", } - if (exists($lockdata{$name}) && - exists($lockdata{$name}->{$args{$c2}})) { - if ($ENV{'DEBUG_ALL_VFS_LOCKS'} =~ /yes/i) { - # Add assertions for locking - if ($lockdata{$name}->{$args{$c2}}->{Entry} eq "L") { - print HEADER - "\tASSERT_VOP_LOCKED($args{$c2}, \"$uname\");\n"; - } elsif ($lockdata{$name}->{$args{$c2}}->{Entry} eq "U") { - print HEADER - "\tASSERT_VOP_UNLOCKED($args{$c2}, \"$uname\");\n"; - } elsif (0) { - # XXX More checks! + print HEADER "};\n"; + + # Print out extern declaration. + print HEADER "extern struct vnodeop_desc ${name}_desc;\n"; + + # Print out prototype. + print HEADER "static __inline int ${uname} __P((\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*)\;/; + print HEADER "\t$3 $4" . + ($c2 < $numargs-1 ? "," : "));") . "\n"; + } + + # Print out function. + print HEADER "static __inline int ${uname}("; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /\**([^;\s]*)\;[^\s]*$/; + print HEADER "$1" . ($c2 < $numargs - 1 ? ', ' : ")\n"); + } + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*\;)/; + print HEADER "\t$3 $4\n"; + } + print HEADER "{\n\tstruct ${name}_args a;\n"; + print HEADER "\tint rc;\n"; + print HEADER "\ta.a_desc = VDESC(${name});\n"; + for ($c2 = 0; $c2 < $numargs; ++$c2) { + $a{$c2} =~ /(\**)([^;\s]*)([^\s]*)$/; + print HEADER "\ta.a_$2 = $2$3\n", + } + for ($c2 = 0; $c2 < $numargs; ++$c2) { + if (!exists($args{$c2})) { + die "Internal error"; + } + if (exists($lockdata{$name}) && + exists($lockdata{$name}->{$args{$c2}})) { + if ($ENV{'DEBUG_ALL_VFS_LOCKS'} =~ /yes/i) { + # Add assertions for locking + if ($lockdata{$name}->{$args{$c2}}->{Entry} eq "L") { + print HEADER + "\tASSERT_VOP_LOCKED($args{$c2}, \"$uname\");\n"; + } elsif ($lockdata{$name}->{$args{$c2}}->{Entry} eq "U") { + print HEADER + "\tASSERT_VOP_UNLOCKED($args{$c2}, \"$uname\");\n"; + } elsif (0) { + # XXX More checks! + } } } } + $a{0} =~ /\s\**([^;\s]*);/; + print HEADER "\trc = VCALL($1, VOFFSET(${name}), &a);\n"; + print HEADER "\treturn (rc);\n"; + print HEADER "}\n"; } - $a{0} =~ /\s\**([^;\s]*);/; - print HEADER "\trc = VCALL($1, VOFFSET(${name}), &a);\n"; - print HEADER "\treturn (rc);\n"; - print HEADER "}\n"; - # Print out the vop_F_vp_offsets structure. This all depends - # on naming conventions and nothing else. - printf CFILE "static int %s_vp_offsets[] = {\n", $name; - # as a side effect, figure out the releflags - $releflags = ''; - $vpnum = 0; - for ($i = 0; $i < $numargs; $i++) { - if ($types{$i} eq 'struct vnode *') { - printf CFILE "\tVOPARG_OFFSETOF(struct %s_args,a_%s),\n", - $name, $args{$i}; - if ($reles{$i} eq 'WILLRELE') { - $releflags = $releflags . '|VDESC_VP' . $vpnum . '_WILLRELE'; + if ($cfile) { + # Print out the vop_F_vp_offsets structure. This all depends + # on naming conventions and nothing else. + printf CFILE "static int %s_vp_offsets[] = {\n", $name; + # as a side effect, figure out the releflags + $releflags = ''; + $vpnum = 0; + for ($i = 0; $i < $numargs; $i++) { + if ($types{$i} eq 'struct vnode *') { + printf CFILE "\tVOPARG_OFFSETOF(struct %s_args,a_%s),\n", + $name, $args{$i}; + if ($reles{$i} eq 'WILLRELE') { + $releflags = $releflags . '|VDESC_VP' . $vpnum . '_WILLRELE'; + } + + $vpnum++; } - - $vpnum++; } - } - $releflags =~ s/^\|//; - print CFILE "\tVDESC_NO_OFFSET\n"; - print CFILE "};\n"; + $releflags =~ s/^\|//; + print CFILE "\tVDESC_NO_OFFSET\n"; + print CFILE "};\n"; - # Print out the vnodeop_desc structure. - print CFILE "struct vnodeop_desc ${name}_desc = {\n"; - # offset - print CFILE "\t0,\n"; - # printable name - printf CFILE "\t\"%s\",\n", $name; - # flags - $vppwillrele = ''; - for ($i = 0; $i < $numargs; $i++) { - if ($types{$i} eq 'struct vnode **' && - ($reles{$i} eq 'WILLRELE')) { - $vppwillrele = '|VDESC_VPP_WILLRELE'; + # Print out the vnodeop_desc structure. + print CFILE "struct vnodeop_desc ${name}_desc = {\n"; + # offset + print CFILE "\t0,\n"; + # printable name + printf CFILE "\t\"%s\",\n", $name; + # flags + $vppwillrele = ''; + for ($i = 0; $i < $numargs; $i++) { + if ($types{$i} eq 'struct vnode **' && + ($reles{$i} eq 'WILLRELE')) { + $vppwillrele = '|VDESC_VPP_WILLRELE'; + } } - } - if ($releflags eq '') { - printf CFILE "\t0%s,\n", $vppwillrele; - } - else { - printf CFILE "\t%s%s,\n", $releflags, $vppwillrele; - } + if ($releflags eq '') { + printf CFILE "\t0%s,\n", $vppwillrele; + } + else { + printf CFILE "\t%s%s,\n", $releflags, $vppwillrele; + } - # vp offsets - printf CFILE "\t%s_vp_offsets,\n", $name; - # vpp (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct vnode **'); - # cred (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct ucred *'); - # proc (if any) - printf CFILE "\t%s,\n", &find_arg_with_type('struct proc *'); - # componentname - printf CFILE "\t%s,\n", &find_arg_with_type('struct componentname *'); - # transport layer information - print CFILE "\tNULL,\n};\n\n"; + # vp offsets + printf CFILE "\t%s_vp_offsets,\n", $name; + # vpp (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct vnode **'); + # cred (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct ucred *'); + # proc (if any) + printf CFILE "\t%s,\n", &find_arg_with_type('struct proc *'); + # componentname + printf CFILE "\t%s,\n", &find_arg_with_type('struct componentname *'); + # transport layer information + print CFILE "\tNULL,\n};\n\n"; + } +} + +if ($hfile) { + close(HEADER) || die "Unable to close $HEADER"; +} +if ($cfile) { + close(CFILE) || die "Unable to close $CFILE"; } - -close(HEADER) || die "Unable to close $HEADER"; -close(CFILE) || die "Unable to close $CFILE"; close(SRC) || die; exit 0;