ExtUtils-Constant: Update to 0.23_07

Benchmarks

    Recommended is either PROXYSUBS with a small number of constants
    or PROXYSUBS autoload with many.

Author: rurban

Porting/Maintainers.pl

@@ -617,7 +617,7 @@ package Maintainers;
 
     'ExtUtils::Constant' => {
         # Upstream broken
-        'DISTRIBUTION' => 'RURBAN/ExtUtils-Constant-0.23_06.tar.gz',
+        'DISTRIBUTION' => 'RURBAN/ExtUtils-Constant-0.23_07.tar.gz',
         'FILES'    => q[dist/ExtUtils-Constant],
         'EXCLUDED' => [
             qw( lib/ExtUtils/Constant/Aaargh56Hash.pm

dist/ExtUtils-Constant/README

@@ -38,9 +38,11 @@ use branch tables making the initial switch statements more efficient, and
 choosing a switch strategy to minimise the amount of linear searching of
 similar constant names.
 
-For a lot of macros memory and speed is still not comparable to
+The best option seems to be PROXYSUBS without options, with the highest speed
+and on the lower side of memory usage.
+With a lot of macros, memory and speed is still not comparable to
 specialized perfect hashes, such as XSConfig or Win32::GUI::Constants
-though, but is good enough for POSIX or Sockets.
+though, but it is good enough for POSIX or Sockets.
 
 I believe ExtUtils::Constant is completely Unicode safe, but as a consequence
 of running various pathological cases as regression tests, the tests will

dist/ExtUtils-Constant/lib/ExtUtils/Constant.pm

@@ -1,6 +1,6 @@
 package ExtUtils::Constant;
 use vars qw (@ISA $VERSION @EXPORT_OK %EXPORT_TAGS);
-$VERSION = '0.23_06';
+$VERSION = '0.23_07';
 $VERSION = eval $VERSION;
 
 =head1 NAME
@@ -594,6 +594,55 @@ __END__
 
 =back
 
+=head1 PERFORMANCE
+
+You can calculate simple performance numbers with
+C<perl -Mblib t/Constant.t --bench --memtest >/dev/null 2>bench.lst>
+and C<grep ^# bench.lst> for 19 constants.
+
+    Option	        Memory [b]   Time [s]
+    <none>              1612758	     0.023946
+    PROXYSUBS           1593553	     0.020061
+    PROXYSUBS autoload	1588555	     0.024906
+    PROXYSUBS push	1608709	     0.023361
+    PROXYSUBS 
+    croak_on_error	1590267	     0.023052
+    PROXYSUBS
+    croak_on_read	1599747	     0.021710
+    PROXYSUBS
+    autoload push	1589737	     0.021917
+    PROXYSUBS
+    croak_on_error push	1590606	     0.021669
+
+PROXYSUBS without any option is the fastest, and on the lower
+side of memory.
+
+PROXYSUBS autoload is the slowest, but easiest to use.
+
+The old method without PROXYSUBS uses the most memory and is 2nd slowest.
+
+But with >500 constants the picture changes, with PROXYSUBS alone being
+the slowest, and PROXYSUBS autoload together with no options being the fastest,
+whilst with no options still using by far the most memory.
+
+    Option	        Memory [b]   Time [s]
+    <none>              2572650	     0.025867
+    PROXYSUBS           2145701	     0.032594
+    PROXYSUBS autoload	2133418	     0.025888
+    PROXYSUBS push	2173807	     0.037089
+    PROXYSUBS 
+    croak_on_error	2142773	     0.026721
+    PROXYSUBS
+    croak_on_read	2145648	     0.027261
+    PROXYSUBS
+    autoload push	2161453	     0.026756
+    PROXYSUBS
+    croak_on_error push	2170791	     0.026831
+
+There are no numbers compared to perfect hashes yet. The estimation is
+that EU-C is ~50% slower and bigger, as seen with L<Win32::GUI::Constants>
+and L<XSConfig>. See also L<Perfect::Hash>.
+
 =head1 AUTHOR
 
 Reini Urban <rurban@cpan.org> fixed up ProxySubs and took over maintainance.

dist/ExtUtils-Constant/lib/ExtUtils/Constant/Base.pm

@@ -5,7 +5,7 @@ use vars qw($VERSION);
 use Carp;
 use Text::Wrap;
 use ExtUtils::Constant::Utils qw(C_stringify perl_stringify);
-$VERSION = '0.23_06';
+$VERSION = '0.23_07';
 
 use constant is_perl56 => ($] < 5.007 && $] > 5.005_50);
 

dist/ExtUtils-Constant/lib/ExtUtils/Constant/ProxySubs.pm

@@ -3,7 +3,7 @@ use strict;
 use vars qw($VERSION @ISA %type_to_struct %type_from_struct %type_to_sv
 	    %type_to_C_value %type_is_a_problem %type_num_args
 	    %type_temporary);
-$VERSION = '0.23_06';
+$VERSION = '0.23_07';
 @ISA = 'ExtUtils::Constant::XS';
 
 =head1 NAME
@@ -503,8 +503,13 @@ BOOT:
     HV *symbol_table = get_hv("$symbol_table", GV_ADD);
 EOBOOT
     if ($push) {
+        # silence cperl-only Used once warnings
 	print $xs_fh <<"EOC";
+#ifndef USE_CPERL
     AV *push = get_av(\"$push\", GV_ADD);
+#else
+    AV *push = get_av(\"$push\", GV_ADD|GV_ADDMULTI);
+#endif
     HE *he;
 EOC
     }

dist/ExtUtils-Constant/lib/ExtUtils/Constant/Utils.pm

@@ -6,7 +6,7 @@ use Carp;
 
 @ISA = 'Exporter';
 @EXPORT_OK = qw(C_stringify perl_stringify);
-$VERSION = '0.23_06';
+$VERSION = '0.23_07';
 
 use constant is_perl55 => ($] < 5.005_50);
 use constant is_perl56 => ($] < 5.007 && $] > 5.005_50);

dist/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm

@@ -10,7 +10,7 @@ require ExtUtils::Constant::Base;
 @ISA = qw(ExtUtils::Constant::Base Exporter);
 @EXPORT_OK = qw(%XS_Constant %XS_TypeSet);
 
-$VERSION = '0.23_06';
+$VERSION = '0.23_07';
 
 $is_perl56 = ($] < 5.007 && $] > 5.005_50);
 

dist/ExtUtils-Constant/t/Constant.t

@@ -26,6 +26,15 @@ my $do_utf_tests = $] > 5.006;
 my $better_than_56 = $] > 5.007;
 # For debugging.
 my $keep_files = grep /^--keep-files$/, @ARGV;
+
+# Usage: perl -Mblib t/Constant.t --bench --memtest >/dev/null
+# Performance
+my $bench      = grep /^--bench$/, @ARGV;
+# vs Memory usage
+my $memtest   = grep /^--memtest$/, @ARGV;
+if ( $memtest and !can_run("valgrind") ) {
+    print "# valgrind not found. disabled --memtest\n";
+}
 $| = 1;
 
 # Because were are going to be changing directory before running Makefile.PL
@@ -278,6 +287,30 @@ sub build_and_run {
     }
   }
 
+  if ($memtest) {
+      $maketest = "valgrind --tool=massif --massif-out-file=memtest \"$^X\" -Mblib test.pl";
+      print "# make memcheck = '$maketest'\n";
+      system "$maketest 2>/dev/null";
+      open MASSIF, "memtest";
+      my $mem_heap = 0;
+      while(<MASSIF>) {
+          my ($mem) = ($_ =~ /^mem_heap_B=(\d+)/);
+          $mem_heap = $mem if $mem and $mem > $mem_heap;
+      }
+      close MASSIF;
+      print STDERR "# memtest: $mem_heap\n";
+      unlink "memtest";
+  }
+  if ($bench) {
+      require Time::HiRes;
+      $maketest = "\"$^X\" -Mblib test.pl";
+      print "# make bench = '$maketest'\n";
+      my $t0 = [Time::HiRes::gettimeofday()];
+      system $maketest;
+      my $time = Time::HiRes::tv_interval($t0);
+      print STDERR "# bench: $time\n";
+  }
+
   my $makeclean = "$make clean";
   print "# make = '$makeclean'\n";
   @makeout = `$makeclean`;
@@ -362,6 +395,10 @@ sub write_and_run_extension {
 
   my $c = tie *C, 'TieOut';
   my $xs = tie *XS, 'TieOut';
+  my %options;
+  if ($wc_args and ref $wc_args->[1]) {
+      $options{$_} = 1 for keys %{$wc_args->[1]};
+  }
 
   ExtUtils::Constant::WriteConstants
     (C_FH => \*C,
@@ -391,7 +428,11 @@ sub write_and_run_extension {
     }
   };
 
-  print "# $name\n# $dir/$subdir being created for $p_args ...\n";
+  if ($bench or $memtest) {
+      print STDERR "# $name\n# $dir/$subdir being created for $p_args ...\n";
+  } else {
+      print "# $name\n# $dir/$subdir being created for $p_args ...\n";
+  }
   mkdir $subdir, 0777 or die "mkdir: $!\n";
   chdir $subdir or die $!;
 
@@ -454,7 +495,7 @@ EOT
   print FH "\t$_\n" foreach (@$export_names);
   print FH ");\n";
   # Print the AUTOLOAD subroutine ExtUtils::Constant generated for us
-  print FH autoload ($package, $]);
+  print FH autoload ($package, $]) unless $options{autoload};
   print FH "bootstrap $package \$VERSION;\n1;\n__END__\n";
   close FH or die "close $pm: $!\n";
 
@@ -541,6 +582,11 @@ foreach my $args (@args)
 {
   # Simple tests
   start_tests();
+  my %options;
+  if ($args and ref $args->[1]) {
+      $options{$_} = 1 for keys %{$args->[1]};
+  }
+
   my $parent_rfc1149 =
     'A Standard for the Transmission of IP Datagrams on Avian Carriers';
   # Test the code that generates 1 and 2 letter name comparisons.
@@ -563,6 +609,15 @@ foreach my $args (@args)
 #define perl "rules"
 EOT
 
+  if ($bench) {
+    for (0..500) {
+      my $key = ''; 
+      $key .= chr(ord('A')+int(rand(57))) for 0..3+int(rand(6));
+      $key =~ s/\W//g;
+      $compass{$key} = int(rand(6));
+    }
+  }
+  
   while (my ($point, $bearing) = each %compass) {
     $header .= "#define $point $bearing\n"
   }

dist/Module-CoreList/lib/Module/CoreList.pm

@@ -14743,11 +14743,11 @@ our %delta = (
             'CPAN::Distribution'    => '2.18_01',
             'Cpanel::JSON::XS'      => '3.0231',
             'Cwd'                   => '4.67c',
-            'ExtUtils::Constant'            => '2.23_06',
-            'ExtUtils::Constant::Base'      => '2.23_06',
-            'ExtUtils::Constant::ProxySubs' => '2.23_06',
-            'ExtUtils::Constant::Utils'     => '2.23_06',
-            'ExtUtils::Constant::XS'        => '2.23_06',
+            'ExtUtils::Constant'            => '2.23_07',
+            'ExtUtils::Constant::Base'      => '2.23_07',
+            'ExtUtils::Constant::ProxySubs' => '2.23_07',
+            'ExtUtils::Constant::Utils'     => '2.23_07',
+            'ExtUtils::Constant::XS'        => '2.23_07',
             'ExtUtils::Install'             => '2.04_01',
             'ExtUtils::ParseXS'             => '3.34_02',
             'ExtUtils::ParseXS::Constants'  => '3.34_02',

pod/perlcdelta.pod

@@ -1208,7 +1208,7 @@ warnings has been to restricted to the four magic names "EXPORT",
 with "EXPORT" will now throw the "used only once" warning as all other
 symbols.
 
-=item ExtUtils-Constant 0.23_06
+=item ExtUtils-Constant 0.23_07
 
 Fix ProxySubs to generate code also valid for 5.6 - 5.14.
 Add testcases for all ProxySubs options.