r49547 - in /trunk/libdevel-nytprof-perl: ./ bin/ debian/ lib/Devel/ lib/Devel/NYTProf/ lib/Devel/NYTProf/js/jit/

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Wed Dec 30 16:41:34 UTC 2009


Author: gregoa
Date: Wed Dec 30 16:41:27 2009
New Revision: 49547

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=49547
Log:
New upstream release.

Removed:
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/js/jit/._gradient30.png
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/js/jit/._gradient40.png
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/js/jit/._gradient50.png
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/js/jit/._jit-yc.js
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/js/jit/._jit.js
Modified:
    trunk/libdevel-nytprof-perl/Changes
    trunk/libdevel-nytprof-perl/FileHandle.xs
    trunk/libdevel-nytprof-perl/META.yml
    trunk/libdevel-nytprof-perl/NYTProf.xs
    trunk/libdevel-nytprof-perl/bin/nytprofcg
    trunk/libdevel-nytprof-perl/bin/nytprofcsv
    trunk/libdevel-nytprof-perl/bin/nytprofhtml
    trunk/libdevel-nytprof-perl/bin/nytprofmerge
    trunk/libdevel-nytprof-perl/debian/changelog
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf.pm
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Apache.pm
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Core.pm
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Data.pm
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/PgPLPerl.pm
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/ReadStream.pm
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Reader.pm
    trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Util.pm

Modified: trunk/libdevel-nytprof-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/Changes?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/Changes (original)
+++ trunk/libdevel-nytprof-perl/Changes Wed Dec 30 16:41:27 2009
@@ -2,7 +2,7 @@
 
 Devel::NYTProf::Changes - List of significant changes to Devel::NYTProf
 
-(As of $Date: 2009-12-24 14:40:14 +0000 (Thu, 24 Dec 2009) $ $Revision: 998 $)
+(As of $Date: 2009-12-28 22:29:41 +0000 (Mon, 28 Dec 2009) $ $Revision: 1004 $)
 
 =cut
 
@@ -12,6 +12,17 @@
 add u key to treemap to trigger moving 'up' a level
 add "calls N subs" to treemap mouseover box
 string eval merging - must allow at least viewing of source for called subs defined in a nested eval
+
+=head2 Changes in Devel::NYTProf 3.01 (svn r1005) 28th Dec 2009
+
+  Fixed (removed) use of vfscanf() which broke on Windows.
+  Fixed version number in nytprofmerge.
+
+  Added documentation to nytprofcg and nytprofmerge.
+
+  Updated NYTProf docs, including noting major contributors.
+  Updated docs to fix assorted typos, thanks to Jonathan Yu.
+  Updated nytprofcsv documentation.
 
 =head2 Changes in Devel::NYTProf 3.00 (svn r998) 24th Dec 2009
 

Modified: trunk/libdevel-nytprof-perl/FileHandle.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/FileHandle.xs?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/FileHandle.xs (original)
+++ trunk/libdevel-nytprof-perl/FileHandle.xs Wed Dec 30 16:41:27 2009
@@ -1,18 +1,9 @@
 /* vim: ts=8 sw=4 expandtab:
  * ************************************************************************
  * This file is part of the Devel::NYTProf package.
- * Copyright 2008 Adam J. Kaplan, The New York Times Company.
- * Copyright 2008 Tim Bunce, Ireland.
- * Released under the same terms as Perl 5.8
  * See http://search.cpan.org/dist/Devel-NYTProf/
- *
- * Contributors:
- * Adam Kaplan, akaplan at nytimes.com
- * Tim Bunce, http://www.tim.bunce.name and http://blog.timbunce.org
- * Steve Peters, steve at fisharerojo.org
- *
- * ************************************************************************
- * $Id$
+ * For Copyright see lib/Devel/NYTProf.pm
+ * For contribution history see repository logs.
  * ************************************************************************
  */
 
@@ -460,20 +451,6 @@
 }
 
 int
-NYTP_scanf(NYTP_file ofile, const char *format, ...) {
-    int retval;
-    va_list args;
-
-    CROAK_IF_NOT_STDIO(ofile, "NYTP_scanf");
-
-    va_start(args, format);
-    retval = vfscanf(ofile->file, format, args);
-    va_end(args);
-
-    return retval;
-}
-
-int
 NYTP_printf(NYTP_file ofile, const char *format, ...) {
     int retval;
     va_list args;
@@ -620,12 +597,12 @@
 SV *string
     PREINIT:
         STRLEN len;
-	char *p;
+        char *p;
         NYTP_file fh;
     CODE:
         if(!sv_isa(handle, "Devel::NYTProf::FileHandle"))
             croak("handle is not a Devel::NYTProf::FileHandle");
-	p = SvPVbyte(string, len);
+        p = SvPVbyte(string, len);
         fh = (NYTP_file)SvPVX(SvRV(handle));
         RETVAL = NYTP_write(fh, p, len);
     OUTPUT:
@@ -670,11 +647,11 @@
 SV *value
     PREINIT:
         STRLEN len;
-	char *p;
+        char *p;
         NYTP_file fh;
     CODE:
         if(!sv_isa(handle, "Devel::NYTProf::FileHandle"))
             croak("handle is not a Devel::NYTProf::FileHandle");
         fh = (NYTP_file)SvPVX(SvRV(handle));
         p = SvPV(value, len);
-	output_str(fh, p, SvUTF8(value) ? -(I32)len : (I32) len);
+        output_str(fh, p, SvUTF8(value) ? -(I32)len : (I32) len);

Modified: trunk/libdevel-nytprof-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/META.yml?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/META.yml (original)
+++ trunk/libdevel-nytprof-perl/META.yml Wed Dec 30 16:41:27 2009
@@ -1,18 +1,30 @@
 --- #YAML:1.0
-name:                Devel-NYTProf
-version:             3.00
-abstract:            Powerful feature-rich perl source code profiler
-license:             perl
-author:              
+name:               Devel-NYTProf
+version:            3.01
+abstract:           Powerful feature-rich perl source code profiler
+author:
     - Adam Kaplan <akaplan at cpan.org>, Tim Bunce <timb at cpan.org>
-generated_by:        ExtUtils::MakeMaker version 6.42
-distribution_type:   module
-requires:     
-    Getopt::Long:                  0
-    JSON::Any:                     0
-    List::Util:                    0
-    Test::More:                    0.84
-    XSLoader:                      0
+license:            perl
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+requires:
+    Getopt::Long:  0
+    JSON::Any:     0
+    List::Util:    0
+    Test::More:    0.84
+    XSLoader:      0
+resources:
+    bugtracker:   http://rt.cpan.org/Public/Dist/Display.html?Name=Devel-NYTProf
+    homepage:     http://perl-devel-nytprof.googlecode.com
+    license:      http://dev.perl.org/licenses/
+    MailingList:  http://groups.google.com/group/develnytprof-dev
+    repository:   http://perl-devel-nytprof.googlecode.com/svn
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.48
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-    version: 1.3
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4

Modified: trunk/libdevel-nytprof-perl/NYTProf.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/NYTProf.xs?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/NYTProf.xs (original)
+++ trunk/libdevel-nytprof-perl/NYTProf.xs Wed Dec 30 16:41:27 2009
@@ -12,7 +12,7 @@
  * Steve Peters, steve at fisharerojo.org
  *
  * ************************************************************************
- * $Id: NYTProf.xs 985 2009-12-20 23:44:19Z tim.bunce $
+ * $Id: NYTProf.xs 1002 2009-12-28 21:49:46Z tim.bunce $
  * ************************************************************************
  */
 #ifndef WIN32
@@ -3451,20 +3451,25 @@
     SV *cb_TIME_LINE_tag = NULL;
     SV *cb_args[12];  /* must be large enough for the largest callback argument list */
 
-    av_extend(fid_fileinfo_av, 64);               /* grow it up front. */
+    av_extend(fid_fileinfo_av, 64);               /* grow them up front. */
     av_extend(fid_srclines_av, 64);
     av_extend(fid_line_time_av, 64);
 
-    if (2 != NYTP_scanf(in, "NYTProf %d %d\n", &file_major, &file_minor)) {
-        croak("NYTProf data format error while parsing header");
-    }
-    if (file_major != 3)
-        croak("NYTProf data format version %d.%d is not supported by NYTProf %s (which expects version %d.%d)",
-            file_major, file_minor, XS_VERSION, NYTP_FILE_MAJOR_VERSION, NYTP_FILE_MINOR_VERSION);
-
-    if (file_minor > NYTP_FILE_MINOR_VERSION)
-        warn("NYTProf data format version %d.%d is newer than that understood by this NYTProf %s, so errors are likely",
-            file_major, file_minor, XS_VERSION);
+    if (1) {
+        char header[7+1+3+1+3+1+1];
+
+        if (NULL == NYTP_gets(in, header, sizeof(header)))
+            croak("NYTProf data format error while reading header");
+        if (2 != sscanf(header, "NYTProf %d %d\n", &file_major, &file_minor))
+            croak("NYTProf data format error while parsing header");
+        if (file_major != 3)
+            croak("NYTProf data format version %d.%d is not supported by NYTProf %s (which expects version %d.%d)",
+                file_major, file_minor, XS_VERSION, NYTP_FILE_MAJOR_VERSION, NYTP_FILE_MINOR_VERSION);
+
+        if (file_minor > NYTP_FILE_MINOR_VERSION)
+            warn("NYTProf data format version %d.%d is newer than that understood by this NYTProf %s, so errors are likely",
+                file_major, file_minor, XS_VERSION);
+    }
 
     if (cb && SvROK(cb)) {
         input_chunk_seqn_sv = save_scalar(gv_fetchpv(".", GV_ADD, SVt_IV));

Modified: trunk/libdevel-nytprof-perl/bin/nytprofcg
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/bin/nytprofcg?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/bin/nytprofcg (original)
+++ trunk/libdevel-nytprof-perl/bin/nytprofcg Wed Dec 30 16:41:27 2009
@@ -9,15 +9,22 @@
 ###########################################################
 use warnings;
 use strict;
+
+use Getopt::Long;
+
 use Devel::NYTProf::Data;
-use Getopt::Long;
+
 
 my %opt = (
     file => 'nytprof.out',
     out  => 'nytprof.callgrind',
 );
 
-process_cli();
+GetOptions( \%opt, qw/file|f=s out|o=s help|h/ )
+    or usage();
+
+usage() if $opt{help};
+
 
 print "Reading $opt{file} ...\n";
 
@@ -48,7 +55,7 @@
 
     print $fh 'fl='.( $fi ? $fi->filename : "Unknown").$/;
     print $fh 'fn='.$sub->subname.$/;
-    print $fh join(' ',$sub->first_line, int($sub->excl_time * 1000000)).$/;
+    print $fh join(' ',$sub->first_line, int($sub->excl_time * 1_000_000)).$/;
     print $fh $/;
 
     my @callers;
@@ -90,37 +97,45 @@
         # calls=(Call Count) (Destination position)
         # (Source position) (Inclusive cost of call)
         print $fh "calls=$count ".$sub->first_line.$/;
-        print $fh "$line ".int(1000000 * $incl_time).$/;
+        print $fh "$line ".int(1_000_000 * $incl_time).$/;
         print $fh $/;
     }
 }
 
-sub process_cli {
-    GetOptions( \%opt, qw/file|f=s out|o=s help|h/ )
-        or do {
-            usage();
-            exit 1;
-        };
-
-    if ( defined( $opt{help} ) ) {
-        usage();
-        exit;
-    }
-}
-
 sub usage {
-    print <<END
+    print <<END;
 usage: [perl] nytprofcg [opts]
- --file <file>, -f <file>  Use the specified file as Devel::NYTProf database
-                            file. [default: ./nytprof.out]
- --out <dir>,   -o <dir>   Place generated files here [default: ./nytprof]
- --delete,      -d         Delete the old output [uses --out]
+ --file <file>, -f <file>  Specify NYTProf data file [default: nytprof.out]
+ --out <file>,  -o <file>  Specify output file [default: nytprof.callgrind]
  --help,        -h         Print this message
 
 This script of part of the Devel::NYTProf distribution.
 Released under the same terms as Perl 5.8.0
 See http://search.cpan.org/dist/Devel-NYTProf/
 END
+    exit 1;
 }
 
 __END__
+
+=head1 NAME
+
+nytprofcg - Convert an NYTProf profile into Callgrind format
+
+=head1 SYNOPSIS
+
+ $ nytprofcg --file=nytprof.out --out=nytprof.callgrind
+
+ $ nytprofcg    # same as above
+
+=head1 DESCRIPTION
+
+Reads a profile data file generated by Devel::NYTProf and writes out the
+subroutine call graph information it contains in Callgrind format.
+
+The output Callgrind file can be loaded into the C<kcachegrind> GUI for
+interactive exploration. 
+
+For more information see L<http://kcachegrind.sourceforge.net/html/Home.html>
+
+=cut

Modified: trunk/libdevel-nytprof-perl/bin/nytprofcsv
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/bin/nytprofcsv?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/bin/nytprofcsv (original)
+++ trunk/libdevel-nytprof-perl/bin/nytprofcsv Wed Dec 30 16:41:27 2009
@@ -7,7 +7,7 @@
 # http://search.cpan.org/dist/Devel-NYTProf/
 #
 ##########################################################
-# $Id: nytprofcsv 998 2009-12-24 14:40:14Z tim.bunce $
+# $Id: nytprofcsv 999 2009-12-25 19:09:40Z tim.bunce $
 ##########################################################
 
 use warnings;
@@ -18,7 +18,7 @@
 
 use Devel::NYTProf::Reader;
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 use constant NUMERIC_PRECISION => 5;
 
@@ -146,11 +146,13 @@
 
 A bit of history and a shameless plug...
 
-NYTProf stands for 'New York Times Profiler'. Indeed, this module was developed
-by The New York Times Co. to help our developers quickly identify bottlenecks in
-large Perl applications.  The NY Times loves Perl and we hope the community will benefit from our work as much as we have from theirs.
-
-Please visit L<http://open.nytimes.com>, our open source blog to see what we are up to, L<http://code.nytimes.com> to see some of our open projects and then 
+NYTProf stands for 'New York Times Profiler'. Indeed, the original version of this
+module was developed by The New York Times Co. to help our developers quickly
+identify bottlenecks in large Perl applications.  The NY Times loves Perl and
+we hope the community will benefit from our work as much as we have from theirs.
+
+Please visit L<http://open.nytimes.com>, our open source blog to see what we are
+up to, L<http://code.nytimes.com> to see some of our open projects and then 
 check out L<htt://nytimes.com> for the latest news!
 
 =head1 DESCRIPTION
@@ -194,7 +196,7 @@
  0,0,0,#--------------------------------------------------------------------
  0,0,0,# My New Source File!
  0,0,0,#--------------------------------------------------------------------
- 0,0,0,# $Id: nytprofcsv 998 2009-12-24 14:40:14Z tim.bunce $
+ 0,0,0,# $Id: nytprofcsv 999 2009-12-25 19:09:40Z tim.bunce $
  0,0,0,#--------------------------------------------------------------------
  0,0,0,
  0,0,0,package NYT::Feeds::Util;

Modified: trunk/libdevel-nytprof-perl/bin/nytprofhtml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/bin/nytprofhtml?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/bin/nytprofhtml (original)
+++ trunk/libdevel-nytprof-perl/bin/nytprofhtml Wed Dec 30 16:41:27 2009
@@ -30,7 +30,7 @@
 my $json_any = eval { require JSON::Any; JSON::Any->import; JSON::Any->new }
     or warn "Can't load JSON::Any module - HTML visualizations skipped.\n";
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 if ($VERSION != $Devel::NYTProf::Core::VERSION) {
     die "$0 version '$VERSION' doesn't match version '$Devel::NYTProf::Core::VERSION' of $INC{'Devel/NYTProf/Core.pm'}\n";

Modified: trunk/libdevel-nytprof-perl/bin/nytprofmerge
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/bin/nytprofmerge?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/bin/nytprofmerge (original)
+++ trunk/libdevel-nytprof-perl/bin/nytprofmerge Wed Dec 30 16:41:27 2009
@@ -17,7 +17,7 @@
 require Devel::NYTProf::FileHandle;
 use Devel::NYTProf::ReadStream qw(for_chunks);
 
-our $VERSION = '2.11';
+our $VERSION = '3.01';
     
 if ($VERSION != $Devel::NYTProf::Core::VERSION) {
     die "$0 version '$VERSION' doesn't match version '$Devel::NYTProf::Core::VERSION' of $INC{'Devel/NYTProf/Core.pm'}\n";
@@ -34,19 +34,6 @@
     'verbose|v' => \my $opt_verbose,
 ) or usage();
 
-
-sub usage {
-    print <<END;
-usage: [perl] nytprofmerge [opts] nytprof-file [...]
- --out <file>,  -o <file>  Name of output file [default: $opt_out]
- --help,        -h         Print this message
- --verbose,     -v         Be more verbose
-
-This script of part of the Devel::NYTProf distribution.
-See http://search.cpan.org/dist/Devel-NYTProf/ for details and copyright.
-END
-    exit 1;
-}
 
 print "Writing $opt_out\n" if $opt_verbose;
 my $out = Devel::NYTProf::FileHandle::open($opt_out, "wb")
@@ -312,3 +299,42 @@
 
 print "Done.\n" if $opt_verbose;
 exit 0;
+
+sub usage {
+    print <<END;
+usage: [perl] nytprofmerge [opts] nytprof-file [...]
+ --out <file>,  -o <file>  Name of output file [default: $opt_out]
+ --help,        -h         Print this message
+ --verbose,     -v         Be more verbose
+
+This script of part of the Devel::NYTProf distribution.
+See http://search.cpan.org/dist/Devel-NYTProf/ for details and copyright.
+END
+    exit 1;
+}
+
+__END__
+
+=head1 NAME
+
+nytprofmerge - Reads multiple NYTProf profiles and outputs a merged one
+
+=head1 SYNOPSIS
+
+ $ nytprofmerge --out=nytprof-merged.out nytprof.out.*
+
+ $ nytprofmerge nytprof.out.*
+
+=head1 DESCRIPTION
+
+Reads multiple profile data files generated by Devel::NYTProf and writes out
+a new profile data file containing data merged from the original files.
+
+C<nytprofmerge> is likely to produce garbage if the input profiles
+aren't all profiles of exactly the same software.
+
+C<nytprofmerge> is new and somewhat experimental. If it produces unexpected
+results please produce a I<small> test case that demonstrates the problem and
+let us know at L<http://groups.google.com/group/develnytprof-dev> - thanks!
+
+=cut

Modified: trunk/libdevel-nytprof-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/debian/changelog?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/debian/changelog (original)
+++ trunk/libdevel-nytprof-perl/debian/changelog Wed Dec 30 16:41:27 2009
@@ -1,3 +1,9 @@
+libdevel-nytprof-perl (3.01-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org>  Wed, 30 Dec 2009 17:39:20 +0100
+
 libdevel-nytprof-perl (3.00-1) unstable; urgency=low
 
   [ Jonathan Yu ]

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf.pm Wed Dec 30 16:41:27 2009
@@ -7,11 +7,11 @@
 ## http://search.cpan.org/dist/Devel-NYTProf/
 ##
 ###########################################################
-## $Id: NYTProf.pm 998 2009-12-24 14:40:14Z tim.bunce $
+## $Id: NYTProf.pm 1004 2009-12-28 22:29:41Z tim.bunce $
 ###########################################################
 package Devel::NYTProf;
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 package    # hide the package from the PAUSE indexer
     DB;
@@ -172,7 +172,9 @@
 
 After the first time around the loop, any further time spent evaluating the
 condition (waiting for input in this example) would be be recorded as having
-been spent I<on the last statement executed in the loop>!
+been spent I<on the last statement executed in the loop>! (Until perl bug
+#60954 is fixed this problem still applies to some loops. For more information
+see L<http://rt.perl.org/rt3/Ticket/Display.html?id=60954>)
 
 NYTProf avoids these problems by intercepting the opcodes which indicate that
 control is returning into some previous statement and adjusting the profile
@@ -218,7 +220,7 @@
 ranges of all the subroutines.
 
 NYTProf can profile applications that fork, and does so with no loss of
-performance. There's (now) no special 'allowfork' mode. It just works.
+performance.
 NYTProf detects the fork and starts writing a new profile file with the pid
 appended to the filename.
 
@@ -261,7 +263,8 @@
   PERL5OPT=-d:NYTProf
 
 That's also very handy when you can't alter the perl command line being used to
-run the script you want to profile.
+run the script you want to profile. Usually you'll want to enable the
+L</addpid=1> option to ensure any nested invocations of perl don't overwrite the profile.
 
 =head1 NYTPROF ENVIRONMENT VARIABLE
 
@@ -476,7 +479,7 @@
     exit 1;
 
 You can also specify which signals to catch in this way by listing them,
-seperated by commas, as the value of the option (case is not significant):
+separated by commas, as the value of the option (case is not significant):
 
     sigexit=int,hup
 
@@ -605,8 +608,6 @@
 arbitrary reports.  This means that you can implement your own output format in
 perl. (Though the module is in a state of flux and may be deprecated soon.)
 
-There is currently no tool to merge multiple data files into one.
-
 Included in the bin directory of this distribution are some scripts which
 turn the raw profile data into more useful formats:
 
@@ -623,6 +624,10 @@
 
 Creates attractive, richly annotated, and fully cross-linked html
 reports (including statistics, source code and color highlighting).
+
+=head2 nytprofmerge
+
+Reads multiple profile data files and writes out a new file containing the merged profile data.
 
 =head1 LIMITATIONS
 
@@ -885,11 +890,23 @@
 L<Devel::NYTProf::ReadStream> is the module that lets you read a profile data
 file as a stream of chunks of data.
 
-=head1 AUTHOR
-
-B<Adam Kaplan>, C<< <akaplan at nytimes.com> >>.
-B<Tim Bunce>, L<http://www.tim.bunce.name> and L<http://blog.timbunce.org>.
-B<Steve Peters>, C<< <steve at fisharerojo.org> >>.
+=head1 AUTHORS AND CONTRIBUTORS
+
+B<Tim Bunce> (L<http://www.tim.bunce.name> and L<http://blog.timbunce.org>)
+leads the project and has done most of the development work thus far.
+
+B<Nicholas Clark> contributed zip compression and C<nytprofmerge>.
+B<Chia-liang Kao> contributed C<nytprofcg>.
+B<Peter (Stig) Edwards> contributed the VMS port.
+B<Jan Dubois> contributed the Windows port.
+B<Gisle Aas> contributed the Devel::NYTProf::ReadStream module.
+B<Steve Peters> contributed greater perl version portability and use of POSIX
+high-resolution clocks.
+Other contributors are noted in the Changes file.
+
+Many thanks to B<Adam Kaplan> who created C<NYTProf> initially by forking
+C<Devel::FastProf> adding reporting from C<Devel::Cover> and a test suite.
+For more details see L</HISTORY> below.
 
 =head1 COPYRIGHT AND LICENSE
 
@@ -902,7 +919,7 @@
 
 =head1 HISTORY
 
-A bit of history and a shameless plug...
+A bit of history (and a shameless plug from Adam)...
 
 NYTProf stands for 'New York Times Profiler'. Indeed, this module was initially
 developed from Devel::FastProf by The New York Times Co. to help our developers

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Apache.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Apache.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Apache.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Apache.pm Wed Dec 30 16:41:27 2009
@@ -11,7 +11,7 @@
 ###########################################################
 package Devel::NYTProf::Apache;
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 BEGIN {
 

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Core.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Core.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Core.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Core.pm Wed Dec 30 16:41:27 2009
@@ -14,7 +14,7 @@
 
 use XSLoader;
 
-our $VERSION = '3.00';    # increment with XS changes too
+our $VERSION = '3.01';    # increment with XS changes too
 
 XSLoader::load('Devel::NYTProf', $VERSION);
 

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Data.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Data.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Data.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Data.pm Wed Dec 30 16:41:27 2009
@@ -52,7 +52,7 @@
 use Devel::NYTProf::SubInfo;
 use Devel::NYTProf::Util qw(make_path_strip_editor strip_prefix_from_paths get_abs_paths_alternation_regex);
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 my $trace = (($ENV{NYTPROF}||'') =~ m/\b trace=(\d+) /x) && $1; # XXX a hack
 

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/PgPLPerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/PgPLPerl.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/PgPLPerl.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/PgPLPerl.pm Wed Dec 30 16:41:27 2009
@@ -68,7 +68,7 @@
 =head2 Explicit call to finish_profile needed
 
 Postgres <= 8.4 doesn't execute END blocks when it shuts down, so NYTProf
-doesn't get a chance to terminate the profile cleanly. To get a useable profile
+doesn't get a chance to terminate the profile cleanly. To get a usable profile
 you need to explicitly call finish_profile() in your plperl code.
 
 I've submitted a bug report asking for END blocks to be run at shutdown:

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/ReadStream.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/ReadStream.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/ReadStream.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/ReadStream.pm Wed Dec 30 16:41:27 2009
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 use base 'Exporter';
 our @EXPORT_OK = qw(

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Reader.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Reader.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Reader.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Reader.pm Wed Dec 30 16:41:27 2009
@@ -7,11 +7,11 @@
 ## http://search.cpan.org/dist/Devel-NYTProf/
 ##
 ###########################################################
-## $Id: Reader.pm 998 2009-12-24 14:40:14Z tim.bunce $
+## $Id: Reader.pm 1001 2009-12-28 11:52:34Z tim.bunce $
 ###########################################################
 package Devel::NYTProf::Reader;
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 use warnings;
 use strict;
@@ -629,7 +629,7 @@
 
 Basic Parameters:
 
-  Paramter       Description
+  Parameter       Description
   ------------   --------------
   suffix         The file suffix for the output file
   header         Text printed at the start of the output file

Modified: trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Util.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Util.pm?rev=49547&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Util.pm (original)
+++ trunk/libdevel-nytprof-perl/lib/Devel/NYTProf/Util.pm Wed Dec 30 16:41:27 2009
@@ -40,7 +40,7 @@
 use List::Util qw(sum);
 #use UNIVERSAL qw( isa can VERSION );
 
-our $VERSION = '3.00';
+our $VERSION = '3.01';
 
 our @EXPORT_OK = qw(
     fmt_float




More information about the Pkg-perl-cvs-commits mailing list