stas 2003/10/23 12:46:42
Modified: lib/ModPerl Code.pm
Log:
- fix the bug where the wrond flag trace was removed (should have been the None
flag)
- sort the dump of the object flags
Revision Changes Path
1.112 +6 -6 modperl-2.0/lib/ModPerl/Code.pm
Index: Code.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -u -r1.111 -r1.112
--- Code.pm 23 Oct 2003 18:34:51 -0000 1.111
+++ Code.pm 23 Oct 2003 19:46:42 -0000 1.112
@@ -368,11 +368,10 @@
print $h_fh "\n#define MP_SYS_$dlsrc 1\n";
while (my($class, $opts) = each %{ $self->{flags} }) {
- my $i = 0;
my @lookup = ();
my %lookup = ();
my $lookup_proto = "";
- my @dumper;
+ my %dumper;
if ($flags_options{$class}) {
$lookup_proto = join canon_func('flags', 'lookup', $class),
'U32 ', '(const char *str)';
@@ -388,6 +387,7 @@
print $h_fh "\n#define ${class}Type $n\n";
$n++;
+ my $i = 0;
my $max_len = 0;
for my $f (@$opts) {
my $x = sprintf "0x%08x", $i;
@@ -405,7 +405,7 @@
#define ${cmd}_Off(p) ($flags(p) &= ~$flag)
EOF
- push @dumper,
+ $dumper{$name} =
qq{modperl_trace(NULL, " $name %s", \\
($flags(p) & $x) ? "On " : "Off");};
@@ -434,11 +434,11 @@
print $h_fh "$lookup_proto;\n";
}
- shift @dumper; #NONE
+ delete $dumper{None}; #NONE
print $h_fh join ' \\'."\n",
"#define ${class}_dump_flags(p, str)",
qq{modperl_trace(NULL, "$class flags dump (%s):", str);},
- @dumper;
+ map $dumper{$_}, sort keys %dumper;
}
print $h_fh "\n#define MpSrvHOOKS_ALL_On(p) MpSrvFLAGS(p) |= (",
@@ -493,7 +493,7 @@
EOF
my @dumper;
- for my $type (@trace) {
+ for my $type (sort @trace) {
my $define = "#define MP_TRACE_$type";
my $define_do = join '_', $define, 'do';
