diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 07:22:51 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 07:22:51 +0000 |
| commit | d0340efeaf607d2e70273b4fa22e5ee3b358abe8 (patch) | |
| tree | 8187e35c8e61d21279785c869e1a5d92009e8e57 /lib | |
| parent | ab39fa9dbf3b1a1fb7beb555653d0558a089397f (diff) | |
| parent | a1737d5b9df80320e5be59ab8fa7c96455d6b5bf (diff) | |
| download | perl-d0340efeaf607d2e70273b4fa22e5ee3b358abe8.tar.gz | |
[asperl] integrate mainline changes
p4raw-id: //depot/asperl@1055
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Benchmark.pm | 14 | ||||
| -rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 4 | ||||
| -rw-r--r-- | lib/FileHandle.pm | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/lib/Benchmark.pm b/lib/Benchmark.pm index fe77dd0a61..f490998039 100644 --- a/lib/Benchmark.pm +++ b/lib/Benchmark.pm @@ -115,7 +115,9 @@ call timethis(COUNT, VALUE, KEY, STYLE) -The Count can be zero or negative, see timethis(). +The routines are called in string comparison order of KEY. + +The COUNT can be zero or negative, see timethis(). =item timediff ( T1, T2 ) @@ -295,12 +297,12 @@ sub timestr { $style ||= $defaultstyle; $style = ($ct>0) ? 'all' : 'noc' if $style eq 'auto'; my $s = "@t $style"; # default for unknown style - $s=sprintf("%2d wallclock secs (%$f usr %$f sys + %$f cusr %$f csys = %$f CPU secs)", + $s=sprintf("%2d wallclock secs (%$f usr %$f sys + %$f cusr %$f csys = %$f CPU)", @t,$t) if $style eq 'all'; - $s=sprintf("%$f CPU secs (%$f usr + %$f sys)", - $pt,$pu,$ps) if $style eq 'noc'; - $s=sprintf("%$f CPU secs (%$f cusr %$f csys)", - $ct,$cu,$cs) if $style eq 'nop'; + $s=sprintf("%2d wallclock secs (%$f usr + %$f sys = %$f CPU)", + $r,$pu,$ps,$pt) if $style eq 'noc'; + $s=sprintf("%2d wallclock secs (%$f cusr + %$f csys = %$f CPU)", + $r,$cu,$cs,$ct) if $style eq 'nop'; $s .= sprintf(" @ %$f/s (n=$n)", $n / ( $pu + $ps )) if $n; $s; } diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index f1102aa44e..729906dd80 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -1015,8 +1015,8 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)/.exists if ($^O eq 'solaris'); # The IRIX linker also doesn't use LD_RUN_PATH - $ldrun = "-rpath $self->{LD_RUN_PATH}" - if ($^O eq 'irix'); + $ldrun = qq{-rpath "$self->{LD_RUN_PATH}"} + if ($^O eq 'irix' && $self->{LD_RUN_PATH}); push(@m,' LD_RUN_PATH="$(LD_RUN_PATH)" $(LD) -o $@ '.$ldrun.' $(LDDLFLAGS) '.$ldfrom. ' $(OTHERLDFLAGS) $(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) $(EXPORT_LIST)'); diff --git a/lib/FileHandle.pm b/lib/FileHandle.pm index 72ecdac1b6..eec9b61f31 100644 --- a/lib/FileHandle.pm +++ b/lib/FileHandle.pm @@ -112,7 +112,7 @@ FileHandle - supply object methods for filehandles use FileHandle; $fh = new FileHandle; - if ($fh->open "< file") { + if ($fh->open("< file")) { print <$fh>; $fh->close; } |