From blair at orcaware.com  Wed Dec 18 15:27:01 2002
From: blair at orcaware.com (blair at orcaware.com)
Date: Wed Dec 18 15:27:01 2002
Subject: [Orca-checkins] rev 172 - trunk/orca/orcallator
Message-ID: <200212182326.gBINQLPS024765@orcaware.com>

Author: blair
Date: 2002-12-18 15:26:10 -0800 (Wed, 18 Dec 2002)
New Revision: 172

Modified:
   trunk/orca/orcallator/orcallator.cfg.in
   trunk/orca/orcallator/orcallator.se
Log:
* orcallator/orcallator.se:
  Upgrade to version 1.36.
    Add measurements for tape (st) devices.  These tape measurements
    are only taken when the RAWDISK code is enabled.  The new
    measurements include system wide tape reads and writes per second
    (tape_rd/s and tape_wr/s), system wide tape transfer rate
    (tape_rK/s and tape_wK/s), and tape run percent
    (tape_runp_*). Patch contributed by Liston Bias <bias at pobox.com>.

* orcallator/orcallator.cfg.in:
  Add plots for the new system wide tape reads and writes per second,
  system wide tape transfer rate, and tape run percent measurements
  recorded by orcallator.se.


Modified: trunk/orca/orcallator/orcallator.cfg.in
==============================================================================
--- trunk/orca/orcallator/orcallator.cfg.in	(original)
+++ trunk/orca/orcallator/orcallator.cfg.in	2002-12-18 15:26:19.000000000 -0800
@@ -667,6 +667,47 @@
 }
 
 plot {
+title			%g Tape System Wide Reads/Writes Per Second
+source			orcallator
+data			tape_rd/s
+data			tape_wr/s
+line_type		area
+line_type		line1
+legend			Reads/s
+legend			Writes/s
+y_legend		Ops/s
+data_min		0
+href			http://www.orcaware.com/orca/docs/orcallator.html#tape_system_wide_reads_writes_per_second
+}
+
+plot {
+title			%g Tape System Wide Transfer Rate
+source			orcallator
+data			1024 * tape_rK/s
+data			1024 * tape_wK/s
+line_type		area
+line_type		line1
+legend			Read transfer rate
+legend			Write transfer rate
+y_legend		Bytes/s
+data_min		0
+href			http://www.orcaware.com/orca/docs/orcallator.html#tape_system_wide_transfer_rate
+}
+
+plot {
+title			%g Tape Run Percent
+source			orcallator
+data			tape_runp_(.*)
+line_type		line2
+legend			$1
+y_legend		Run Percent
+data_min		0
+data_max		100
+plot_min		0
+href			http://www.orcaware.com/orca/docs/orcallator.html#tape_run_percent
+}
+
+plot {
 title			%g Cache Hit Percentages
 source			orcallator
 data			dnlc_hit%

Modified: trunk/orca/orcallator/orcallator.se
==============================================================================
--- trunk/orca/orcallator/orcallator.se	(original)
+++ trunk/orca/orcallator/orcallator.se	2002-12-18 15:26:20.000000000 -0800
@@ -8,6 +8,14 @@
 //
 // Portions copied from percollator.se written by Adrian Cockroft.
 //
+// Version 1.36:   Dec 17, 2002	Add measurements for tape (st) devices.  These
+//				tape measurements are only taken when the
+//				RAWDISK code is enabled.  The new measurements
+//				include system wide tape reads and writes per
+//				second (tape_rd/s and tape_wr/s), system wide
+//				tape transfer rate (tape_rK/s and tape_wK/s),
+//				and tape run percent (tape_runp_*). Patch
+//				contributed by Liston Bias <bias at pobox.com>.
 // Version 1.35:   Aug 11, 2002	Add a new measurement, the number of secure web
 //				server processes on the system using the
 //				column name #httpsds.  If the environmental
@@ -1659,28 +1667,52 @@
 #ifdef WATCH_DISK
 measure_disk()
 {
+  // These two variables are treated as static variables to keep track
+  // of any changes to the number of disks and tapes on the system.
+  int    previous_disk_count = -1;
+  int    previous_tape_count = -1;
+
   double mean_disk_busy;
   double peak_disk_busy;
-  double total_reads;
-  double total_writes;
-  double total_readk;
-  double total_writek;
-  int    previous_count = -1;
-  int    i;
+  double total_disk_reads;
+  double total_disk_writes;
+  double total_disk_readk;
+  double total_disk_writek;
   int    disk_count;
 
-  mean_disk_busy = 0.0;
-  peak_disk_busy = 0.0;
-  total_reads    = 0.0;
-  total_writes   = 0.0;
-  total_readk    = 0.0;
-  total_writek   = 0.0;
-  disk_count     = 0;
+  double total_tape_reads;
+  double total_tape_writes;
+  double total_tape_readk;
+  double total_tape_writek;
+  int    tape_count;
+
+  int    i;
+
+  mean_disk_busy      = 0.0;
+  peak_disk_busy      = 0.0;
+  total_disk_reads    = 0.0;
+  total_disk_writes   = 0.0;
+  total_disk_readk    = 0.0;
+  total_disk_writek   = 0.0;
+  disk_count          = 0;
+
+  total_tape_reads    = 0.0;
+  total_tape_writes   = 0.0;
+  total_tape_readk    = 0.0;
+  total_tape_writek   = 0.0;
+  tape_count          = 0;
 
 #ifdef USE_RAWDISK
   for (i=0; i<RAW_disk_count; ++i) {
-    // Block the listing of tape drives for now.
-    if (RAW_disk[i].short_name[1] == 't' && RAW_disk[i].short_name[0] == 's') {
+    // Record tape drive st devices differently than regular disk devices.
+    if (RAW_disk[i].short_name[0] == 's' && RAW_disk[i].short_name[1] == 't') {
+      tape_count++;
+      total_tape_reads  += RAW_disk[i].reads;
+      total_tape_writes += RAW_disk[i].writes;
+      total_tape_readk  += RAW_disk[i].kreads;
+      total_tape_writek += RAW_disk[i].kwrites;
+      put_output(sprintf("tape_runp_%s", RAW_disk[i].long_name),
+                 sprintf("%16.5f", RAW_disk[i].run_percent));
       continue;
     }
     // Block the listing of floppy drives for now.
@@ -1706,11 +1738,11 @@
 #ifdef HAVE_EMC_DISK_CONTROL
     if ((pioGLOB_old_wlentime[i] + pioGLOB_old_rlentime[i]) > 1) {
 #endif
-      total_reads    += RAW_disk[i].reads;
-      total_writes   += RAW_disk[i].writes;
-      total_readk    += RAW_disk[i].kreads;
-      total_writek   += RAW_disk[i].kwrites;
-      mean_disk_busy += RAW_disk[i].run_percent;
+      total_disk_reads  += RAW_disk[i].reads;
+      total_disk_writes += RAW_disk[i].writes;
+      total_disk_readk  += RAW_disk[i].kreads;
+      total_disk_writek += RAW_disk[i].kwrites;
+      mean_disk_busy    += RAW_disk[i].run_percent;
       if (RAW_disk[i].run_percent > peak_disk_busy) {
          peak_disk_busy = RAW_disk[i].run_percent;
       }
@@ -1739,11 +1771,11 @@
 #ifdef HAVE_EMC_DISK_CONTROL
     if ((pioGLOB_old_wlentime[i] + pioGLOB_old_rlentime[i]) > 1) {
 #endif
-      total_reads    += GLOBAL_disk[i].reads;
-      total_writes   += GLOBAL_disk[i].writes;
-      total_readk    += GLOBAL_disk[i].kreads;
-      total_writek   += GLOBAL_disk[i].kwrites;
-      mean_disk_busy += GLOBAL_disk[i].run_percent;
+      total_disk_reads  += GLOBAL_disk[i].reads;
+      total_disk_writes += GLOBAL_disk[i].writes;
+      total_disk_readk  += GLOBAL_disk[i].kreads;
+      total_disk_writek += GLOBAL_disk[i].kwrites;
+      mean_disk_busy    += GLOBAL_disk[i].run_percent;
       if (GLOBAL_disk[i].run_percent > peak_disk_busy) {
         peak_disk_busy = GLOBAL_disk[i].run_percent;
       }
@@ -1759,16 +1791,25 @@
 
   put_output("disk_peak", sprintf("%9.3f", peak_disk_busy));
   put_output("disk_mean", sprintf("%9.3f", mean_disk_busy));
-  put_output("disk_rd/s", sprintf("%9.1f", total_reads));
-  put_output("disk_wr/s", sprintf("%9.1f", total_writes));
-  put_output("disk_rK/s", sprintf("%9.1f", total_readk));
-  put_output("disk_wK/s", sprintf("%9.1f", total_writek));
-
-  // If the number of disks has changed, say due to a add_drv, then print
-  // new headers.
-  if (previous_count != disk_count) {
-    print_header   = 1;
-    previous_count = disk_count;
+  put_output("disk_rd/s", sprintf("%9.1f", total_disk_reads));
+  put_output("disk_wr/s", sprintf("%9.1f", total_disk_writes));
+  put_output("disk_rK/s", sprintf("%9.1f", total_disk_readk));
+  put_output("disk_wK/s", sprintf("%9.1f", total_disk_writek));
+
+  put_output("tape_rd/s", sprintf("%9.1f", total_tape_reads));
+  put_output("tape_wr/s", sprintf("%9.1f", total_tape_writes));
+  put_output("tape_rK/s", sprintf("%9.1f", total_tape_readk));
+  put_output("tape_wK/s", sprintf("%9.1f", total_tape_writek));
+
+  // If the number of disks and/or tapes has changed, say due to a
+  // add_drv, then print new headers.
+  if (previous_disk_count != disk_count) {
+    print_header        = 1;
+    previous_disk_count = disk_count;
+  }
+  if (previous_tape_count != tape_count) {
+    print_header        = 1;
+    previous_tape_count = tape_count;
   }
 }
 #endif



From blair at orcaware.com  Sun Dec 29 13:27:02 2002
From: blair at orcaware.com (blair at orcaware.com)
Date: Sun Dec 29 13:27:02 2002
Subject: [Orca-checkins] rev 173 - in trunk/orca: . packages packages/Digest-MD5-2.21 packages/Digest-MD5-2.21/t packages/Digest-MD5-2.21/hints
Message-ID: <200212292126.gBTLQKhw018259@orcaware.com>

Author: blair
Date: 2002-12-29 13:26:06 -0800 (Sun, 29 Dec 2002)
New Revision: 173

Added:
   trunk/orca/packages/Digest-MD5-2.21/
   trunk/orca/packages/Digest-MD5-2.21/hints/MacOS.pl
   trunk/orca/packages/Digest-MD5-2.21/t/align.t
Removed:
   trunk/orca/packages/Digest-MD5-2.20/
Modified:
   trunk/orca/INSTALL
   trunk/orca/configure
   trunk/orca/configure.in
   trunk/orca/packages/Digest-MD5-2.21/Changes
   trunk/orca/packages/Digest-MD5-2.21/MANIFEST
   trunk/orca/packages/Digest-MD5-2.21/MD5.pm
   trunk/orca/packages/Digest-MD5-2.21/Makefile.PL
   trunk/orca/packages/Digest-MD5-2.21/t/files.t
Log:
Upgrade Digest::MD5 from 2.20 to 2.21 and require the new version for
Orca.

* INSTALL:
  Update all references to Digest::MD5's version number from 2.20 to
  2.21.

* configure.in:
  Bump Digest::MD5's version number to 2.21.

* configure:
  Bump Digest::MD5's version number to 2.21.

* packages/Digest-MD5-2.21:
  Renamed from packages/Digest-MD5-2.20.  Directory contents updated
  from Digest-MD5-2.21.tar.gz.


Modified: trunk/orca/configure
==============================================================================
--- trunk/orca/configure	(original)
+++ trunk/orca/configure	2002-12-29 13:26:19.000000000 -0800
@@ -1083,8 +1083,8 @@
 DATA_DUMPER_VER=2.101
 DATE_PARSE_DIR=TimeDate-1.14
 DATE_PARSE_VER=2.24
-DIGEST_MD5_DIR=Digest-MD5-2.20
-DIGEST_MD5_VER=2.19
+DIGEST_MD5_DIR=Digest-MD5-2.21
+DIGEST_MD5_VER=2.21
 MATH_INTERPOLATE_DIR=Math-Interpolate-1.05
 MATH_INTERPOLATE_VER=1.05
 RRDTOOL_DIR=rrdtool-1.0.40

Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in	(original)
+++ trunk/orca/configure.in	2002-12-29 13:26:19.000000000 -0800
@@ -31,8 +31,8 @@
 DATA_DUMPER_VER=2.101
 DATE_PARSE_DIR=TimeDate-1.14
 DATE_PARSE_VER=2.24
-DIGEST_MD5_DIR=Digest-MD5-2.20
-DIGEST_MD5_VER=2.19
+DIGEST_MD5_DIR=Digest-MD5-2.21
+DIGEST_MD5_VER=2.21
 MATH_INTERPOLATE_DIR=Math-Interpolate-1.05
 MATH_INTERPOLATE_VER=1.05
 RRDTOOL_DIR=rrdtool-1.0.40

Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL	(original)
+++ trunk/orca/INSTALL	2002-12-29 13:26:19.000000000 -0800
@@ -142,7 +142,7 @@
     Name			Required Version	Included With Orca
     ----------------------------------------------------------------------
     Data::Dumper		2.101 or greater	2.101
-    Digest::MD5			2.20 or greater		2.20
+    Digest::MD5			2.21 or greater		2.21
     Math::IntervalSearch	1.05 or greater		1.05
     RRDs			1.0.33 or greater	1.0.33
     Storable			2.06 or greater		2.06
@@ -173,10 +173,10 @@
 
     Digest::MD5
 
-      http://www.perl.com/CPAN/authors/id/G/GA/GAAS/Digest-MD5-2.20.tar.gz
+      http://www.perl.com/CPAN/authors/id/G/GA/GAAS/Digest-MD5-2.21.tar.gz
 
-      % gunzip -c Digest-MD5-2.20.tar.gz | tar xvf -
-      % cd Digest-MD5-2.20
+      % gunzip -c Digest-MD5-2.21.tar.gz | tar xvf -
+      % cd Digest-MD5-2.21
       % perl Makefile.PL
       % make
       % make test

Copied: Digest-MD5-2.21 (from rev 172, trunk/orca/packages/Digest-MD5-2.20)

Modified: trunk/orca/packages/Digest-MD5-2.21/MD5.pm
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.20/MD5.pm	(original)
+++ trunk/orca/packages/Digest-MD5-2.21/MD5.pm	2002-12-29 13:26:20.000000000 -0800
@@ -3,7 +3,7 @@
 use strict;
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '2.20';  # $Date: 2002/05/06 05:15:09 $
+$VERSION = '2.21';  # $Date: 2002/12/28 05:30:03 $
 
 require Exporter;
 *import = \&Exporter::import;
@@ -214,6 +214,29 @@
 
     print Digest::MD5->new->addfile(*FILE)->hexdigest, " $file\n";
 
+Perl 5.8 support Unicode characters in strings.  Since the MD5
+algorithm is only defined for strings of bytes, it can not be used on
+strings that contains chars with ordinal number above 255.  The MD5
+functions and methods will croak if you try to feed them such input
+data:
+
+    use Digest::MD5 qw(md5_hex);
+
+    my $str = "abc\x{300}";
+    print md5_hex($str), "\n";  # croaks
+    # Wide character in subroutine entry
+
+What you can do is calculate the MD5 checksum of the UTF-8
+representation of such strings.  This is achieved by filtering the
+string through encode_utf8() function:
+
+    use Digest::MD5 qw(md5_hex);
+    use Encode qw(encode_utf8);
+
+    my $str = "abc\x{300}";
+    print md5_hex(encode_utf8($str)), "\n";
+    # 8c2d46911f3f5a326455f0ed7a8ed3b3
+
 =head1 SEE ALSO
 
 L<Digest>,

Modified: trunk/orca/packages/Digest-MD5-2.21/t/files.t
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.20/t/files.t	(original)
+++ trunk/orca/packages/Digest-MD5-2.21/t/files.t	2002-12-29 13:26:20.000000000 -0800
@@ -10,30 +10,36 @@
 use strict;
 use Digest::MD5 qw(md5 md5_hex md5_base64);
 
-#
-# This is the output of: 'md5sum Changes README MD5.pm MD5.xs rfc1321.txt'
-#
-my $EXPECT;
-
 # To update the EBCDIC section even on a Latin 1 platform,
 # run this script with $ENV{EBCDIC_MD5SUM} set to a true value.
 # (You'll need to have Perl 5.7.3 or later, to have the Encode installed.)
 # (And remember that under the Perl core distribution you should
 #  also have the $ENV{PERL_CORE} set to a true value.)
+# Similarly, to update MacOS section, run with $ENV{MAC_MD5SUM} set.
 
+my $EXPECT;
 if (ord "A" == 193) { # EBCDIC
     $EXPECT = <<EOT;
-b362148b17a451f0d81e0ebb2487756e Changes
-5a591a47e8c40fe4b78c744111511c45 README
-3157e2d2e27dacddea7c54efddc32520 MD5.pm
-4850753428db9422e8e5f97b401d5a13 MD5.xs
-276da0aa4e9a08b7fe09430c9c5690aa rfc1321.txt
+36158997c99f2e1396ee40ddc4634a40  Changes
+5a591a47e8c40fe4b78c744111511c45  README
+770a5ef28ab15e66355639f21152afb0  MD5.pm
+4850753428db9422e8e5f97b401d5a13  MD5.xs
+276da0aa4e9a08b7fe09430c9c5690aa  rfc1321.txt
+EOT
+} elsif ("\n" eq "\015") { # MacOS
+    $EXPECT = <<EOT;
+e68b13fe9edf36fe13551bf410b7a745  Changes
+3519f3d02c7c91158f732f0f00064657  README
+4113db8afad83eb7c01f1bf2c53e66ee  MD5.pm
+1be293491bba726810f8e87671ee0328  MD5.xs
+754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
 } else {
+    # This is the output of: 'md5sum Changes README MD5.pm MD5.xs rfc1321.txt'
     $EXPECT = <<EOT;
-0106b67df0dbf9f4d65e9fc04907745b  Changes
+e68b13fe9edf36fe13551bf410b7a745  Changes
 3519f3d02c7c91158f732f0f00064657  README
-88c35ca46c7e8069fb5ae00c091c98d6  MD5.pm
+4113db8afad83eb7c01f1bf2c53e66ee  MD5.pm
 1be293491bba726810f8e87671ee0328  MD5.xs
 754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
@@ -77,7 +83,12 @@
          require Encode;
 	 my $data = cat_file($file);	
 	 Encode::from_to($data, 'latin1', 'cp1047');
-	 print md5_hex($data), " $base\n";
+	 print md5_hex($data), "  $base\n";
+	 next;
+     }
+     if ($ENV{MAC_MD5SUM}) {
+	 my $data = cat_file($file);	
+	 print md5_hex($data), "  $base\n";
 	 next;
      }
      my $md5bin = pack("H*", $md5hex);
@@ -172,6 +183,10 @@
     my($file) = @_;
     local $/;  # slurp
     open(FILE, $file) or die "Can't open $file: $!";
+
+    # For PerlIO in case of UTF-8 locales.
+    eval 'binmode(FILE, ":bytes")' if $] >= 5.008;
+
     my $tmp = <FILE>;
     close(FILE);
     $tmp;

Added: trunk/orca/packages/Digest-MD5-2.21/t/align.t
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.20/t/align.t	(original)
+++ trunk/orca/packages/Digest-MD5-2.21/t/align.t	2002-12-29 13:26:20.000000000 -0800
@@ -0,0 +1,22 @@
+BEGIN {
+	if ($ENV{PERL_CORE}) {
+	        chdir 't' if -d 't';
+	        @INC = '../lib';
+	}
+}
+
+# Test that md5 works on unaligned memory blocks
+
+print "1..1\n";
+
+use strict;
+use Digest::MD5 qw(md5_hex);
+
+my $str = "\100" x 20;
+substr($str, 0, 1, "");  # chopping off first char makes the string unaligned
+
+#use Devel::Peek; Dump($str); 
+
+print "not " unless md5_hex($str) eq "c7ebb510e59ee96f404f288d14cc656a";
+print "ok 1\n";
+

Added: trunk/orca/packages/Digest-MD5-2.21/hints/MacOS.pl
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.20/hints/MacOS.pl	(original)
+++ trunk/orca/packages/Digest-MD5-2.21/hints/MacOS.pl	2002-12-29 13:26:20.000000000 -0800
@@ -0,0 +1,3 @@
+# MWCPPC compiler needs to crank down the optimizations
+
+$self->{MWCPPCOptimize} = "-O1";

Modified: trunk/orca/packages/Digest-MD5-2.21/MANIFEST
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.20/MANIFEST	(original)
+++ trunk/orca/packages/Digest-MD5-2.21/MANIFEST	2002-12-29 13:26:20.000000000 -0800
@@ -3,10 +3,12 @@
 MD5.pm			Digest::MD5 Perl Module
 hints/dec_osf.pl	Workaround for DEC compiler bug
 hints/irix_6.pl		Workaround for IRIX compiler bug
+hints/MacOS.pl		Workaround for Mac compiler bug
 MD5.xs			MD5 Perl 'XS' source file
 typemap			Supplementary typemap
 Makefile.PL		Perl Makefile builder
 rfc1321.txt		The MD5 Message-Digest Algorithm
+t/align.t		Try unaligned memory blocks
 t/badfile.t             Try addfile() on unopened file
 t/files.t		Check a few files.
 t/md5-aaa.t		Exercise padding code

Modified: trunk/orca/packages/Digest-MD5-2.21/Makefile.PL
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.20/Makefile.PL	(original)
+++ trunk/orca/packages/Digest-MD5-2.21/Makefile.PL	2002-12-29 13:26:20.000000000 -0800
@@ -6,12 +6,23 @@
 my @extra;
 @extra = (DEFINE => "-DU32_ALIGNMENT_REQUIRED") unless free_u32_alignment();
 
+if ($^O eq 'VMS') {
+    if (defined($Config{ccname})) {
+        if (grep(/VMS_VAX/, @INC) && ($Config{ccname} eq 'DEC')) {
+            # VAX compiler optimizer even as late as v6.4 gets stuck
+            push(@extra, OPTIMIZE => "/Optimize=(NODISJOINT)");
+        }
+    }
+}
+
+
 WriteMakefile(
     'NAME'	   => 'Digest::MD5',
     'VERSION_FROM' => 'MD5.pm',
     @extra,
     'dist'         => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
 );
+exit;
 
 
 

Modified: trunk/orca/packages/Digest-MD5-2.21/Changes
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.20/Changes	(original)
+++ trunk/orca/packages/Digest-MD5-2.21/Changes	2002-12-29 13:26:20.000000000 -0800
@@ -1,3 +1,17 @@
+2002-12-27   Gisle Aas <gisle at ActiveState.com>
+
+   Release 2.21
+
+   Minor tweaks sync up with bleadperl:
+     - VMS optimizer tweaks to the Makefile.PL
+     - MacOS support
+     - Added alignment test
+
+   Added example to the MD5 POD that shows how to calculate the
+   digest of Unicode strings.
+
+
+
 2002-05-05   Gisle Aas <gisle at ActiveState.com>
 
    Release 2.20



From blair at orcaware.com  Sun Dec 29 14:17:02 2002
From: blair at orcaware.com (blair at orcaware.com)
Date: Sun Dec 29 14:17:02 2002
Subject: [Orca-checkins] rev 174 - in trunk/orca: . src packages
Message-ID: <200212292216.gBTMGXCZ003936@orcaware.com>

Author: blair
Date: 2002-12-29 14:16:24 -0800 (Sun, 29 Dec 2002)
New Revision: 174

Modified:
   trunk/orca/configure
   trunk/orca/configure.in
   trunk/orca/packages/Makefile.in
   trunk/orca/src/orca.pl.in
Log:
Since there two Math::Interpolate packages in CPAN, one of which is my
own, and Orca uses Math::IntervalSearch, which is included in my
Math::Interpolate package, change all tests and references from
Math::Interpolate to Math::IntervalSearch, except for the
Math-Interpolate-X.YY{,.tar.gz} file and directory names, which remain
unchanged.

* configure.in,
* configure,
* src/orca.pl.in,
* packages/Makefile.in:
  Rename
    MATH_INTERPOLATE_DIR          to MATH_INTERVALSEARCH_DIR
    MATH_INTERPOLATE_VER          to MATH_INTERVALSEARCH_VER
    MAKE_MATH_INTERPOLATE         to MAKE_MATH_INTERVALSEARCH
    TEST_MATH_INTERPOLATE         to TEST_MATH_INTERVALSEARCH
    INSTALL_PERL_MATH_INTERPOLATE to INSTALL_PERL_MATH_INTERVALSEARCH
    CLEAN_MATH_INTERPOLATE        to CLEAN_MATH_INTERVALSEARCH
    DISTCLEAN_MATH_INTERPOLATE    to DISTCLEAN_MATH_INTERVALSEARCH
    orca_cv_perl_math_interpolate to orca_cv_perl_math_intervalsearch

* configure.in,
* configure:
  Test for the installed version of Math::IntervalSearch, not
  Math::Interpolate.


Modified: trunk/orca/configure
==============================================================================
--- trunk/orca/configure	(original)
+++ trunk/orca/configure	2002-12-29 14:16:32.000000000 -0800
@@ -1085,8 +1085,8 @@
 DATE_PARSE_VER=2.24
 DIGEST_MD5_DIR=Digest-MD5-2.21
 DIGEST_MD5_VER=2.21
-MATH_INTERPOLATE_DIR=Math-Interpolate-1.05
-MATH_INTERPOLATE_VER=1.05
+MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05
+MATH_INTERVALSEARCH_VER=1.05
 RRDTOOL_DIR=rrdtool-1.0.40
 RRDTOOL_VER=1.000401
 STORABLE_DIR=Storable-2.06
@@ -2833,25 +2833,25 @@
   DISTCLEAN_DIGEST_MD5=distclean_digest_md5
 fi
 
-  echo "$as_me:2836: checking if Perl module Math::Interpolate version $MATH_INTERPOLATE_VER is installed" >&5
-echo $ECHO_N "checking if Perl module Math::Interpolate version $MATH_INTERPOLATE_VER is installed... $ECHO_C" >&6
-  if $PERL ./config/check_for_perl_mod Math::Interpolate $MATH_INTERPOLATE_VER; then
-    orca_cv_perl_math_interpolate=yes
+  echo "$as_me:2836: checking if Perl module Math::IntervalSearch version $MATH_INTERVALSEARCH_VER is installed" >&5
+echo $ECHO_N "checking if Perl module Math::IntervalSearch version $MATH_INTERVALSEARCH_VER is installed... $ECHO_C" >&6
+  if $PERL ./config/check_for_perl_mod Math::IntervalSearch $MATH_INTERVALSEARCH_VER; then
+    orca_cv_perl_math_intervalsearch=yes
 
   else
-    orca_cv_perl_math_interpolate=no
+    orca_cv_perl_math_intervalsearch=no
 
   fi
-  echo "$as_me:2845: result: $orca_cv_perl_math_interpolate" >&5
-echo "${ECHO_T}$orca_cv_perl_math_interpolate" >&6
+  echo "$as_me:2845: result: $orca_cv_perl_math_intervalsearch" >&5
+echo "${ECHO_T}$orca_cv_perl_math_intervalsearch" >&6
 
-test "$ALWAYS_BUILD_PERL_MODULES" && orca_cv_perl_math_interpolate=no
-if test "$orca_cv_perl_math_interpolate" = no; then
-  MAKE_MATH_INTERPOLATE=make_math_interpolate
-  TEST_MATH_INTERPOLATE=test_math_interpolate
-  INSTALL_PERL_MATH_INTERPOLATE=install_perl_math_interpolate
-  CLEAN_MATH_INTERPOLATE=clean_math_interpolate
-  DISTCLEAN_MATH_INTERPOLATE=distclean_math_interpolate
+test "$ALWAYS_BUILD_PERL_MODULES" && orca_cv_perl_math_intervalsearch=no
+if test "$orca_cv_perl_math_intervalsearch" = no; then
+  MAKE_MATH_INTERVALSEARCH=make_math_intervalsearch
+  TEST_MATH_INTERVALSEARCH=test_math_intervalsearch
+  INSTALL_PERL_MATH_INTERVALSEARCH=install_perl_math_intervalsearch
+  CLEAN_MATH_INTERVALSEARCH=clean_math_intervalsearch
+  DISTCLEAN_MATH_INTERVALSEARCH=distclean_math_intervalsearch
 fi
 
   echo "$as_me:2857: checking if Perl module RRDs version $RRDTOOL_VER is installed" >&5
@@ -3410,7 +3410,7 @@
 s, at DATA_DUMPER_DIR@,$DATA_DUMPER_DIR,;t t
 s, at DATE_PARSE_DIR@,$DATE_PARSE_DIR,;t t
 s, at DIGEST_MD5_DIR@,$DIGEST_MD5_DIR,;t t
-s, at MATH_INTERPOLATE_DIR@,$MATH_INTERPOLATE_DIR,;t t
+s, at MATH_INTERVALSEARCH_DIR@,$MATH_INTERVALSEARCH_DIR,;t t
 s, at RRDTOOL_DIR@,$RRDTOOL_DIR,;t t
 s, at STORABLE_DIR@,$STORABLE_DIR,;t t
 s, at TIME_HIRES_DIR@,$TIME_HIRES_DIR,;t t
@@ -3418,7 +3418,7 @@
 s, at DATA_DUMPER_VER@,$DATA_DUMPER_VER,;t t
 s, at DATE_PARSE_VER@,$DATE_PARSE_VER,;t t
 s, at DIGEST_MD5_VER@,$DIGEST_MD5_VER,;t t
-s, at MATH_INTERPOLATE_VER@,$MATH_INTERPOLATE_VER,;t t
+s, at MATH_INTERVALSEARCH_VER@,$MATH_INTERVALSEARCH_VER,;t t
 s, at RRDTOOL_VER@,$RRDTOOL_VER,;t t
 s, at STORABLE_VER@,$STORABLE_VER,;t t
 s, at TIME_HIRES_VER@,$TIME_HIRES_VER,;t t
@@ -3478,11 +3478,11 @@
 s, at INSTALL_PERL_DIGEST_MD5@,$INSTALL_PERL_DIGEST_MD5,;t t
 s, at CLEAN_DIGEST_MD5@,$CLEAN_DIGEST_MD5,;t t
 s, at DISTCLEAN_DIGEST_MD5@,$DISTCLEAN_DIGEST_MD5,;t t
-s, at MAKE_MATH_INTERPOLATE@,$MAKE_MATH_INTERPOLATE,;t t
-s, at TEST_MATH_INTERPOLATE@,$TEST_MATH_INTERPOLATE,;t t
-s, at INSTALL_PERL_MATH_INTERPOLATE@,$INSTALL_PERL_MATH_INTERPOLATE,;t t
-s, at CLEAN_MATH_INTERPOLATE@,$CLEAN_MATH_INTERPOLATE,;t t
-s, at DISTCLEAN_MATH_INTERPOLATE@,$DISTCLEAN_MATH_INTERPOLATE,;t t
+s, at MAKE_MATH_INTERVALSEARCH@,$MAKE_MATH_INTERVALSEARCH,;t t
+s, at TEST_MATH_INTERVALSEARCH@,$TEST_MATH_INTERVALSEARCH,;t t
+s, at INSTALL_PERL_MATH_INTERVALSEARCH@,$INSTALL_PERL_MATH_INTERVALSEARCH,;t t
+s, at CLEAN_MATH_INTERVALSEARCH@,$CLEAN_MATH_INTERVALSEARCH,;t t
+s, at DISTCLEAN_MATH_INTERVALSEARCH@,$DISTCLEAN_MATH_INTERVALSEARCH,;t t
 s, at MAKE_RRDTOOL@,$MAKE_RRDTOOL,;t t
 s, at TEST_RRDTOOL@,$TEST_RRDTOOL,;t t
 s, at INSTALL_PERL_RRDTOOL@,$INSTALL_PERL_RRDTOOL,;t t

Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in	(original)
+++ trunk/orca/configure.in	2002-12-29 14:16:33.000000000 -0800
@@ -33,8 +33,8 @@
 DATE_PARSE_VER=2.24
 DIGEST_MD5_DIR=Digest-MD5-2.21
 DIGEST_MD5_VER=2.21
-MATH_INTERPOLATE_DIR=Math-Interpolate-1.05
-MATH_INTERPOLATE_VER=1.05
+MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05
+MATH_INTERVALSEARCH_VER=1.05
 RRDTOOL_DIR=rrdtool-1.0.40
 RRDTOOL_VER=1.000401
 STORABLE_DIR=Storable-2.06
@@ -46,7 +46,7 @@
 AC_SUBST(DATA_DUMPER_DIR)
 AC_SUBST(DATE_PARSE_DIR)
 AC_SUBST(DIGEST_MD5_DIR)
-AC_SUBST(MATH_INTERPOLATE_DIR)
+AC_SUBST(MATH_INTERVALSEARCH_DIR)
 AC_SUBST(RRDTOOL_DIR)
 AC_SUBST(STORABLE_DIR)
 AC_SUBST(TIME_HIRES_DIR)
@@ -54,7 +54,7 @@
 AC_SUBST(DATA_DUMPER_VER)
 AC_SUBST(DATE_PARSE_VER)
 AC_SUBST(DIGEST_MD5_VER)
-AC_SUBST(MATH_INTERPOLATE_VER)
+AC_SUBST(MATH_INTERVALSEARCH_VER)
 AC_SUBST(RRDTOOL_VER)
 AC_SUBST(STORABLE_VER)
 AC_SUBST(TIME_HIRES_VER)
@@ -342,20 +342,20 @@
 AC_SUBST(CLEAN_DIGEST_MD5)
 AC_SUBST(DISTCLEAN_DIGEST_MD5)
 
-BORP_PERL_MODULE(orca_cv_perl_math_interpolate, $PERL, Math::Interpolate, $MATH_INTERPOLATE_VER)
-test "$ALWAYS_BUILD_PERL_MODULES" && orca_cv_perl_math_interpolate=no
-if test "$orca_cv_perl_math_interpolate" = no; then
-  MAKE_MATH_INTERPOLATE=make_math_interpolate
-  TEST_MATH_INTERPOLATE=test_math_interpolate
-  INSTALL_PERL_MATH_INTERPOLATE=install_perl_math_interpolate
-  CLEAN_MATH_INTERPOLATE=clean_math_interpolate
-  DISTCLEAN_MATH_INTERPOLATE=distclean_math_interpolate
-fi
-AC_SUBST(MAKE_MATH_INTERPOLATE)
-AC_SUBST(TEST_MATH_INTERPOLATE)
-AC_SUBST(INSTALL_PERL_MATH_INTERPOLATE)
-AC_SUBST(CLEAN_MATH_INTERPOLATE)
-AC_SUBST(DISTCLEAN_MATH_INTERPOLATE)
+BORP_PERL_MODULE(orca_cv_perl_math_intervalsearch, $PERL, Math::IntervalSearch, $MATH_INTERVALSEARCH_VER)
+test "$ALWAYS_BUILD_PERL_MODULES" && orca_cv_perl_math_intervalsearch=no
+if test "$orca_cv_perl_math_intervalsearch" = no; then
+  MAKE_MATH_INTERVALSEARCH=make_math_intervalsearch
+  TEST_MATH_INTERVALSEARCH=test_math_intervalsearch
+  INSTALL_PERL_MATH_INTERVALSEARCH=install_perl_math_intervalsearch
+  CLEAN_MATH_INTERVALSEARCH=clean_math_intervalsearch
+  DISTCLEAN_MATH_INTERVALSEARCH=distclean_math_intervalsearch
+fi
+AC_SUBST(MAKE_MATH_INTERVALSEARCH)
+AC_SUBST(TEST_MATH_INTERVALSEARCH)
+AC_SUBST(INSTALL_PERL_MATH_INTERVALSEARCH)
+AC_SUBST(CLEAN_MATH_INTERVALSEARCH)
+AC_SUBST(DISTCLEAN_MATH_INTERVALSEARCH)
 
 BORP_PERL_MODULE(orca_cv_perl_rrds, $PERL, RRDs, $RRDTOOL_VER)
 test "$ALWAYS_BUILD_PERL_MODULES" && orca_cv_perl_rrds=no

Modified: trunk/orca/src/orca.pl.in
==============================================================================
--- trunk/orca/src/orca.pl.in	(original)
+++ trunk/orca/src/orca.pl.in	2002-12-29 14:16:33.000000000 -0800
@@ -26,7 +26,7 @@
 # modules to keep all the requiste numbers here.
 use Data::Dumper         @DATA_DUMPER_VER@;
 use Digest::MD5          @DIGEST_MD5_VER@;
-use Math::IntervalSearch @MATH_INTERPOLATE_VER@ qw(interval_search);
+use Math::IntervalSearch @MATH_INTERVALSEARCH_VER@ qw(interval_search);
 use Storable             @STORABLE_VER@;
 use RRDs                 @RRDTOOL_VER@;
 

Modified: trunk/orca/packages/Makefile.in
==============================================================================
--- trunk/orca/packages/Makefile.in	(original)
+++ trunk/orca/packages/Makefile.in	2002-12-29 14:16:33.000000000 -0800
@@ -7,7 +7,7 @@
 data_dumper_dir			= @DATA_DUMPER_DIR@
 date_parse_dir			= @DATE_PARSE_DIR@
 digest_md5_dir			= @DIGEST_MD5_DIR@
-math_interpolate_dir		= @MATH_INTERPOLATE_DIR@
+math_intervalsearch_dir		= @MATH_INTERVALSEARCH_DIR@
 rrdtool_dir			= @RRDTOOL_DIR@
 storable_dir			= @STORABLE_DIR@
 
@@ -15,28 +15,28 @@
 MAKE_DATA_DUMPER		= @MAKE_DATA_DUMPER@
 MAKE_DATE_PARSE			= @MAKE_DATE_PARSE@
 MAKE_DIGEST_MD5			= @MAKE_DIGEST_MD5@
-MAKE_MATH_INTERPOLATE		= @MAKE_MATH_INTERPOLATE@
+MAKE_MATH_INTERVALSEARCH	= @MAKE_MATH_INTERVALSEARCH@
 MAKE_RRDTOOL			= @MAKE_RRDTOOL@
 MAKE_STORABLE			= @MAKE_STORABLE@
-MAKE_TARGETS			= $(MAKE_COMPRESS_ZLIB) $(MAKE_DATA_DUMPER) $(MAKE_DATE_PARSE) $(MAKE_DIGEST_MD5) $(MAKE_MATH_INTERPOLATE) $(MAKE_RRDTOOL) $(MAKE_STORABLE)
+MAKE_TARGETS			= $(MAKE_COMPRESS_ZLIB) $(MAKE_DATA_DUMPER) $(MAKE_DATE_PARSE) $(MAKE_DIGEST_MD5) $(MAKE_MATH_INTERVALSEARCH) $(MAKE_RRDTOOL) $(MAKE_STORABLE)
 
 TEST_COMPRESS_ZLIB		= @TEST_COMPRESS_ZLIB@
 TEST_DATA_DUMPER		= @TEST_DATA_DUMPER@
 TEST_DATE_PARSE			= @TEST_DATE_PARSE@
 TEST_DIGEST_MD5			= @TEST_DIGEST_MD5@
-TEST_MATH_INTERPOLATE		= @TEST_MATH_INTERPOLATE@
+TEST_MATH_INTERVALSEARCH	= @TEST_MATH_INTERVALSEARCH@
 TEST_RRDTOOL			= @TEST_RRDTOOL@
 TEST_STORABLE			= @TEST_STORABLE@
-TEST_TARGETS			= $(TEST_COMPRESS_ZLIB) $(TEST_DATA_DUMPER) $(TEST_DATE_PARSE) $(TEST_DIGEST_MD5) $(TEST_MATH_INTERPOLATE) $(TEST_RRDTOOL) $(TEST_STORABLE)
+TEST_TARGETS			= $(TEST_COMPRESS_ZLIB) $(TEST_DATA_DUMPER) $(TEST_DATE_PARSE) $(TEST_DIGEST_MD5) $(TEST_MATH_INTERVALSEARCH) $(TEST_RRDTOOL) $(TEST_STORABLE)
 
 INSTALL_PERL_COMPRESS_ZLIB	= @INSTALL_PERL_COMPRESS_ZLIB@
 INSTALL_PERL_DATA_DUMPER	= @INSTALL_PERL_DATA_DUMPER@
 INSTALL_PERL_DATE_PARSE		= @INSTALL_PERL_DATE_PARSE@
 INSTALL_PERL_DIGEST_MD5		= @INSTALL_PERL_DIGEST_MD5@
-INSTALL_PERL_MATH_INTERPOLATE	= @INSTALL_PERL_MATH_INTERPOLATE@
+INSTALL_PERL_MATH_INTERVALSEARCH= @INSTALL_PERL_MATH_INTERVALSEARCH@
 INSTALL_PERL_RRDTOOL		= @INSTALL_PERL_RRDTOOL@
 INSTALL_PERL_STORABLE		= @INSTALL_PERL_STORABLE@
-INSTALL_PERL_TARGETS		= $(INSTALL_PERL_COMPRESS_ZLIB) $(INSTALL_PERL_DATA_DUMPER) $(INSTALL_PERL_DATE_PARSE) $(INSTALL_PERL_DIGEST_MD5) $(INSTALL_PERL_MATH_INTERPOLATE) $(INSTALL_PERL_RRDTOOL) $(INSTALL_PERL_STORABLE)
+INSTALL_PERL_TARGETS		= $(INSTALL_PERL_COMPRESS_ZLIB) $(INSTALL_PERL_DATA_DUMPER) $(INSTALL_PERL_DATE_PARSE) $(INSTALL_PERL_DIGEST_MD5) $(INSTALL_PERL_MATH_INTERVALSEARCH) $(INSTALL_PERL_RRDTOOL) $(INSTALL_PERL_STORABLE)
 
 INSTALL_LIB_RRDTOOL		= @INSTALL_LIB_RRDTOOL@
 INSTALL_LIB_TARGETS		= $(INSTALL_LIB_RRDTOOL)
@@ -45,19 +45,19 @@
 CLEAN_DATA_DUMPER		= @CLEAN_DATA_DUMPER@
 CLEAN_DATE_PARSE		= @CLEAN_DATE_PARSE@
 CLEAN_DIGEST_MD5		= @CLEAN_DIGEST_MD5@
-CLEAN_MATH_INTERPOLATE		= @CLEAN_MATH_INTERPOLATE@
+CLEAN_MATH_INTERVALSEARCH	= @CLEAN_MATH_INTERVALSEARCH@
 CLEAN_RRDTOOL			= @CLEAN_RRDTOOL@
 CLEAN_STORABLE			= @CLEAN_STORABLE@
-CLEAN_TARGETS			= $(CLEAN_COMPRESS_ZLIB) $(CLEAN_DATA_DUMPER) $(CLEAN_DATE_PARSE) $(CLEAN_DIGEST_MD5) $(CLEAN_MATH_INTERPOLATE) $(CLEAN_RRDTOOL) $(CLEAN_STORABLE)
+CLEAN_TARGETS			= $(CLEAN_COMPRESS_ZLIB) $(CLEAN_DATA_DUMPER) $(CLEAN_DATE_PARSE) $(CLEAN_DIGEST_MD5) $(CLEAN_MATH_INTERVALSEARCH) $(CLEAN_RRDTOOL) $(CLEAN_STORABLE)
 
 DISTCLEAN_COMPRESS_ZLIB		= @DISTCLEAN_COMPRESS_ZLIB@
 DISTCLEAN_DATA_DUMPER		= @DISTCLEAN_DATA_DUMPER@
 DISTCLEAN_DATE_PARSE		= @DISTCLEAN_DATE_PARSE@
 DISTCLEAN_DIGEST_MD5		= @DISTCLEAN_DIGEST_MD5@
-DISTCLEAN_MATH_INTERPOLATE	= @DISTCLEAN_MATH_INTERPOLATE@
+DISTCLEAN_MATH_INTERVALSEARCH	= @DISTCLEAN_MATH_INTERVALSEARCH@
 DISTCLEAN_RRDTOOL		= @DISTCLEAN_RRDTOOL@
 DISTCLEAN_STORABLE		= @DISTCLEAN_STORABLE@
-DISTCLEAN_TARGETS		= $(DISTCLEAN_COMPRESS_ZLIB) $(DISTCLEAN_DATA_DUMPER) $(DISTCLEAN_DATE_PARSE) $(DISTCLEAN_DIGEST_MD5) $(DISTCLEAN_MATH_INTERPOLATE) $(DISTCLEAN_RRDTOOL) $(DISTCLEAN_STORABLE)
+DISTCLEAN_TARGETS		= $(DISTCLEAN_COMPRESS_ZLIB) $(DISTCLEAN_DATA_DUMPER) $(DISTCLEAN_DATE_PARSE) $(DISTCLEAN_DIGEST_MD5) $(DISTCLEAN_MATH_INTERVALSEARCH) $(DISTCLEAN_RRDTOOL) $(DISTCLEAN_STORABLE)
 
 all:	Makefile $(MAKE_TARGETS)
 
@@ -85,11 +85,11 @@
 $(digest_md5_dir)/Makefile: $(digest_md5_dir)/Makefile.PL $(PERL)
 	cd $(digest_md5_dir) && $(PERL) Makefile.PL
 
-make_math_interpolate: $(math_interpolate_dir)/Makefile
-	cd $(math_interpolate_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
+make_math_intervalsearch: $(math_intervalsearch_dir)/Makefile
+	cd $(math_intervalsearch_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
 
-$(math_interpolate_dir)/Makefile: $(math_interpolate_dir)/Makefile.PL $(PERL)
-	cd $(math_interpolate_dir) && $(PERL) Makefile.PL
+$(math_intervalsearch_dir)/Makefile: $(math_intervalsearch_dir)/Makefile.PL $(PERL)
+	cd $(math_intervalsearch_dir) && $(PERL) Makefile.PL
 
 make_rrdtool: $(rrdtool_dir)/Makefile $(PERL)
 	cd $(rrdtool_dir) && $(MAKE) CFLAGS="$(CFLAGS)"
@@ -125,8 +125,8 @@
 test_digest_md5: $(digest_md5_dir)/Makefile
 	cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" test
 
-test_math_interpolate: $(math_interpolate_dir)/Makefile
-	cd $(math_interpolate_dir) && $(MAKE) test
+test_math_intervalsearch: $(math_intervalsearch_dir)/Makefile
+	cd $(math_intervalsearch_dir) && $(MAKE) test
 
 test_rrdtool: make_rrdtool
 	cd $(rrdtool_dir)/perl-shared && $(MAKE) CFLAGS="$(CFLAGS)" test
@@ -153,8 +153,8 @@
 install_perl_digest_md5: $(digest_md5_dir)/Makefile
 	cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
 
-install_perl_math_interpolate: $(math_interpolate_dir)/Makefile
-	cd $(math_interpolate_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+install_perl_math_intervalsearch: $(math_intervalsearch_dir)/Makefile
+	cd $(math_intervalsearch_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
 
 install_perl_rrdtool: make_rrdtool
 	cd $(rrdtool_dir)/perl-shared && $(MAKE) OPTIMIZE="$(CFLAGS)" install
@@ -188,10 +188,10 @@
 		(cd $(digest_md5_dir) && $(MAKE) clean);		\
 	fi
 
-clean_math_interpolate:
-	@if test -r $(math_interpolate_dir)/Makefile; then 		\
-		echo 'cd $(math_interpolate_dir) && $(MAKE) clean';	\
-		(cd $(math_interpolate_dir) && $(MAKE) clean);		\
+clean_math_intervalsearch:
+	@if test -r $(math_intervalsearch_dir)/Makefile; then 		\
+		echo 'cd $(math_intervalsearch_dir) && $(MAKE) clean';	\
+		(cd $(math_intervalsearch_dir) && $(MAKE) clean);	\
 	fi
 
 clean_rrdtool:
@@ -214,7 +214,7 @@
 
 distclean_digest_md5:		clean_digest_md5
 
-distclean_math_interpolate:	clean_math_interpolate
+distclean_math_intervalsearch:	clean_math_intervalsearch
 
 distclean_rrdtool:		clean_rrdtool
 	cd $(rrdtool_dir) && $(MAKE) distclean



From blair at orcaware.com  Mon Dec 30 15:22:01 2002
From: blair at orcaware.com (blair at orcaware.com)
Date: Mon Dec 30 15:22:01 2002
Subject: [Orca-checkins] rev 175 - in trunk/orca: . packages packages/Time-HiRes-1.39
Message-ID: <200212302321.gBUNL3eS030180@orcaware.com>

Author: blair
Date: 2002-12-30 15:20:50 -0800 (Mon, 30 Dec 2002)
New Revision: 175

Added:
   trunk/orca/packages/Time-HiRes-1.39/
Removed:
   trunk/orca/packages/Time-HiRes-1.38/
Modified:
   trunk/orca/configure
   trunk/orca/configure.in
   trunk/orca/packages/Time-HiRes-1.39/Changes
   trunk/orca/packages/Time-HiRes-1.39/HiRes.pm
   trunk/orca/packages/Time-HiRes-1.39/Makefile.PL
Log:
Upgrade Time::HiRes from 1.38 to 1.39.

* configure.in:
  Bump Time::HiRes' version number to 1.39.

* configure:
  Bump Time::HiRes' version number to 1.39.

* packages/Time-HiRes-1.39:
  Renamed from packages/Time-HiRes-1.38.  Directory contents updated
  from Time-HiRes-1.39.tar.gz.


Modified: trunk/orca/configure
==============================================================================
--- trunk/orca/configure	(original)
+++ trunk/orca/configure	2002-12-30 15:21:02.000000000 -0800
@@ -1091,8 +1091,8 @@
 RRDTOOL_VER=1.000401
 STORABLE_DIR=Storable-2.06
 STORABLE_VER=2.06
-TIME_HIRES_DIR=Time-HiRes-1.38
-TIME_HIRES_VER=1.38
+TIME_HIRES_DIR=Time-HiRes-1.39
+TIME_HIRES_VER=1.39
 
 # Get the current working directory and the config directory.
 cwd=`pwd`

Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in	(original)
+++ trunk/orca/configure.in	2002-12-30 15:21:02.000000000 -0800
@@ -39,8 +39,8 @@
 RRDTOOL_VER=1.000401
 STORABLE_DIR=Storable-2.06
 STORABLE_VER=2.06
-TIME_HIRES_DIR=Time-HiRes-1.38
-TIME_HIRES_VER=1.38
+TIME_HIRES_DIR=Time-HiRes-1.39
+TIME_HIRES_VER=1.39
 
 AC_SUBST(COMPRESS_ZLIB_DIR)
 AC_SUBST(DATA_DUMPER_DIR)

Copied: Time-HiRes-1.39 (from rev 174, trunk/orca/packages/Time-HiRes-1.38)

Modified: trunk/orca/packages/Time-HiRes-1.39/HiRes.pm
==============================================================================
--- trunk/orca/packages/Time-HiRes-1.38/HiRes.pm	(original)
+++ trunk/orca/packages/Time-HiRes-1.39/HiRes.pm	2002-12-30 15:21:02.000000000 -0800
@@ -15,7 +15,7 @@
 		 d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
 		 d_nanosleep);
 	
-$VERSION = '1.38';
+$VERSION = '1.39';
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 

Modified: trunk/orca/packages/Time-HiRes-1.39/Makefile.PL
==============================================================================
--- trunk/orca/packages/Time-HiRes-1.38/Makefile.PL	(original)
+++ trunk/orca/packages/Time-HiRes-1.39/Makefile.PL	2002-12-30 15:21:02.000000000 -0800
@@ -83,7 +83,9 @@
 	my $ccflags = $Config{'ccflags'} . ' ' . "-I$COREincdir";
 	if ($^O eq 'VMS') {
 	    if ($ENV{PERL_CORE}) {
-                $cccmd = "$Config{'cc'} /include=(perl_root:[000000]) $tmp.c"; 
+		# Fragile if the extensions change hierachy within
+		# the Perl core but this should do for now.
+                $cccmd = "$Config{'cc'} /include=([---]) $tmp.c";
 	    } else {
 		my $perl_core = $Config{'installarchlib'};
 		$perl_core =~ s/\]$/.CORE]/;

Modified: trunk/orca/packages/Time-HiRes-1.39/Changes
==============================================================================
--- trunk/orca/packages/Time-HiRes-1.38/Changes	(original)
+++ trunk/orca/packages/Time-HiRes-1.39/Changes	2002-12-30 15:21:03.000000000 -0800
@@ -1,5 +1,8 @@
 Revision history for Perl extension Time::HiRes.
 
+1.39
+	- fix from Craig Berry for better building in VMS with PERL_CORE
+
 1.38
 	- no functional changes
 	- move lib/Time/HiRes.pm as Hires.pm



From blair at orcaware.com  Mon Dec 30 16:05:02 2002
From: blair at orcaware.com (blair at orcaware.com)
Date: Mon Dec 30 16:05:02 2002
Subject: [Orca-checkins] rev 176 - trunk/orca/orcallator
Message-ID: <200212310004.gBV04af2002419@orcaware.com>

Author: blair
Date: 2002-12-30 16:04:27 -0800 (Mon, 30 Dec 2002)
New Revision: 176

Modified:
   trunk/orca/orcallator/orcallator.se
Log:
* orcallator/orcallator.se:
  Upgrade to version 1.37.
    (raw_disk_short_name_cmp): New function that compares two short
      disk names and returns if they have the same physical device
      name, ignoring slice info.
    (raw_disk_map): Use raw_disk_short_name_cmp instead of strncmp.
      Improved algorithm which detects the end of the GLOBAL_disk_info
      array.  To deal with occasions when the first disk is a CD-ROM
      and the second disk is an unmounted CD-ROM, revise the check in
      raw_disk_map() to detect both the first and second disk
      mentioned in GLOBAL_disk_info.
    Patch contributed by Alan LeGrand <alegrand at wallace.com>.


Modified: trunk/orca/orcallator/orcallator.se
==============================================================================
--- trunk/orca/orcallator/orcallator.se	(original)
+++ trunk/orca/orcallator/orcallator.se	2002-12-30 16:04:35.000000000 -0800
@@ -8,6 +8,14 @@
 //
 // Portions copied from percollator.se written by Adrian Cockroft.
 //
+// Version 1.37:   Dec 28, 2002	Improved algorithm in raw_disk_map() which
+//				detects the end of the GLOBAL_disk_info array.
+//				To deal with occasions when the first disk is a
+//				CD-ROM and the second disk is an unmounted
+//				CD-ROM, revise the check in raw_disk_map() to
+//				detect both the first and second disk mentioned
+//				in GLOBAL_disk_info.  Patch contributed by Alan
+//				LeGrand <alegrand at wallace.com>.
 // Version 1.36:   Dec 17, 2002	Add measurements for tape (st) devices.  These
 //				tape measurements are only taken when the
 //				RAWDISK code is enabled.  The new measurements
@@ -288,8 +296,7 @@
 // The maximum number of columns of data.
 #define MAX_COLUMNS		2048
 
-// Use the new raw disk code all the time because it has been very
-// well tested and there are no major bug reports in it.
+// Enable the raw disk measuring code.
 #define USE_RAWDISK		1
 
 // If WATCH_OS is defined, then measure every part of the operating
@@ -607,12 +614,49 @@
 int			RAW_disk_count=0;
 double			RAW_disk_lastupdate;
 
+// Compare two short disk names and return if they have on the same
+// physical device name, ignoring slice info.
+int raw_disk_short_name_cmp(char disk1[],
+                            int  disk1_length,
+                            char disk2[],
+                            int  disk2_length)
+{
+  int i;
+
+  // Handle dad disks first since they do not have commas.
+  if (strncmp("dad", disk1, 3) == 0) {
+    return strncmp(disk1, disk2, disk1_length);
+  }
+
+  // Extract the physical disk name from disk slices.  This only works
+  // with SCSI disks where slices have commma separators.
+  for (i=0; i<disk1_length; ++i) {
+    if (disk1[i] == ',') {
+      disk1_length = i;
+      break;
+    }
+  }
+  for (i=0; i<disk2_length; ++i) {
+    if (disk2[i] == ',') {
+      disk2_length = i;
+      break;
+    }
+  }
+  if (disk1_length != disk2_length) {
+    return 1;
+  }
+  return strncmp(disk1, disk2, disk1_length);
+}
+
 // Function to scan kstat and map short device names to long device names.
 raw_disk_map() {
-  int  first_len;
+  int  first_name_length;
   char first_name[16];
+  int  second_name_length;
+  char second_name[16];
   char long_name[16];
   char short_name[16];
+  int  short_name_length;
   int  i;
   int  j;
 
@@ -627,25 +671,49 @@
   // uses MAX_RAWDISKS for the table length and the assumption that
   // short disks names come before short disk partition names to
   // detect the end of the table.  If it fails to detect the end it
-  // will coredump when it addresses unallocated memory.
+  // will core dump when it addresses unallocated memory.
+  //
+  // These symbols are used to recognize when we slip past the end of
+  // the raw devices in GLOBAL_disk_info.  It would be nice to just
+  // look for a slice like sd0,a but unfortunately EIDE disks do not
+  // have slices.
+  //
+  // Check for the first and second disk in case the CD-ROM shows up
+  // as the first disk since it will not show slice information unless
+  // it is mounted.
   strcpy(first_name, GLOBAL_disk_info[0].short_name);
-  first_len = strlen(first_name);
+  first_name_length = strlen(first_name);
+  if (MAX_RAWDISKS > 1) {
+    strcpy(second_name, GLOBAL_disk_info[1].short_name);
+    second_name_length = strlen(second_name);
+  }
   for (i=0; i<RAW_disk_count; ++i) {
     // Do not map st & fd devices.
-    if (strncmp(RAW_disk[i].short_name, "st", 2) != 0) {
-      if (strncmp(RAW_disk[i].short_name, "fd", 2) != 0) {
-        for (j=0; j<MAX_RAWDISKS; ++j) {
-          strcpy(short_name, GLOBAL_disk_info[j].short_name);
-          if (j > 0) {
-            if (strncmp(first_name, short_name, first_len) == 0) {
+    if (strncmp(RAW_disk[i].short_name, "st", 2) != 0 &&
+        strncmp(RAW_disk[i].short_name, "fd", 2) != 0) {
+      for (j=0; j<MAX_RAWDISKS; ++j) {
+        strcpy(short_name, GLOBAL_disk_info[j].short_name);
+        if (j > 0) {
+          short_name_length = strlen(short_name);
+          if (raw_disk_short_name_cmp(first_name,
+                                      first_name_length,
+                                      short_name,
+                                      short_name_length) == 0) {
+            break;
+          }
+          if (j > 1) {
+            if (raw_disk_short_name_cmp(second_name,
+                                        second_name_length,
+                                        short_name,
+                                        short_name_length) == 0) {
               break;
             }
           }
-          if (strcmp(RAW_disk[i].short_name, short_name) == 0) {
-            strcpy(long_name,GLOBAL_disk_info[j].long_name);
-            strcpy(RAW_disk[i].long_name, long_name);
-            break;
-          }
+        }
+        if (strcmp(RAW_disk[i].short_name, short_name) == 0) {
+          strcpy(long_name, GLOBAL_disk_info[j].long_name);
+          strcpy(RAW_disk[i].long_name, long_name);
+          break;
         }
       }
     }



From blair at orcaware.com  Mon Dec 30 16:27:00 2002
From: blair at orcaware.com (blair at orcaware.com)
Date: Mon Dec 30 16:27:00 2002
Subject: [Orca-checkins] rev 177 - trunk/orca/orcallator
Message-ID: <200212310026.gBV0Q6Cm002778@orcaware.com>

Author: blair
Date: 2002-12-30 16:25:59 -0800 (Mon, 30 Dec 2002)
New Revision: 177

Modified:
   trunk/orca/orcallator/orcallator.se
Log:
* orcallator/orcallator.se
  (raw_disk_update): Add a space after comma's in function arguments.


Modified: trunk/orca/orcallator/orcallator.se
==============================================================================
--- trunk/orca/orcallator/orcallator.se	(original)
+++ trunk/orca/orcallator/orcallator.se	2002-12-30 16:26:04.000000000 -0800
@@ -759,14 +759,14 @@
 
   kc[0] = kstat_open();
   // Read them.
-  if (kstat_read(kc,kp,0) == -1) {
+  if (kstat_read(kc, kp, 0) == -1) {
     perror("raw_disk_update:kstat_read");
     exit(1);
   }
 
   // Traverse the chain looking for IO events.
   for (ul=kc[0].kc_chain; ul !=0; ul=nkp[0].ks_next) {
-    struct_fill(nkp[0],ul);
+    struct_fill(nkp[0], ul);
     if (nkp[0].ks_type == KSTAT_TYPE_IO) {
       strcpy(short_name, nkp[0].ks_name);
       if (short_name[0] != 'm' &&
@@ -800,7 +800,7 @@
         }
 
         // Update the device registers.
-        if (kstat_read(kc,nkp,0) == -1) {
+        if (kstat_read(kc, nkp, 0) == -1) {
           perror("raw_disk_update:kstat_read error");
           exit(1);
         } else {
@@ -813,7 +813,7 @@
           // choice.  Currently only kio.nread glitches.  Correcting
           // the error forces the IOs to get attributed to the next IO
           // cycle.
-          struct_fill(kio,nkp[0].ks_data);
+          struct_fill(kio, nkp[0].ks_data);
           _nread  =  kio.nread;
           if (RAW_disk[rdisk]._nread > _nread) {
             _nread = RAW_disk[rdisk]._nread;