Changeset 29712

Timestamp:

Nov 8, 2010, 3:39:28 PM (16 years ago)

Author:

rhenders

Message:

more temp file cleanup

File:

• trunk/tools/czartool/Plotter.pm (modified) (6 diffs)

trunk/tools/czartool/Plotter.pm

@@ -132 +132 @@
 
     # now delete temp dat files
-    foreach my $stage (keys %gnuplotFiles) {
-        
-        unlink($gnuplotFiles{$stage});
-    
-    }
+    foreach my $stage (keys %gnuplotFiles) {unlink($gnuplotFiles{$stage});}
 }
 
@@ -182 +178 @@
     if ($numOfPlots == 0 ) {
 
-        print "Warning: No plots could be generated for stage '$selectedStage' and label '$label' during time period '$beginTime', '$endTime'\n";
+#        print "Warning: No plots could be generated for stage '$selectedStage' and label '$label' during time period '$beginTime', '$endTime'\n";
         return;
     } 
@@ -216 +212 @@
     my $outputFile = createImageFileName($self, $label, undef, "h", 0);
 
-    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_gnuplot_".$label."_h.XXXXX", DIR => '/tmp', SUFFIX => '.dat');
+    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_gnuplot_".$label."_h.XXXXX", DIR => '/tmp', SUFFIX => 'dat');
     open (GNUDAT, ">".$tmpFile->filename);
 
@@ -429 +425 @@
     my ($minX, $maxX, $minY, $maxY, $timeDiff);
 
-    my $gnuplotFile = $self->{_czarDb}->createStorageTimeSeriesData($fromTime, $toTime, \$minX, \$maxX, \$minY, \$maxY, \$timeDiff);
+    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_gnuplot_storage_timeseries.XXXXX", DIR => '/tmp', SUFFIX => 'dat');
+    $self->{_czarDb}->createStorageTimeSeriesData($tmpFile, $fromTime, $toTime, \$minX, \$maxX, \$minY, \$maxY, \$timeDiff);
 
     my $timeFormat = undef;
@@ -453 +450 @@
         "set ylabel \"Available (TB)\";" .
         "plot " . 
-        "'$gnuplotFile' using 1:2 title \"Available\" with lines lt 2 lw 2\n";
+        "'".$tmpFile->filename."' using 1:2 title \"Available\" with lines lt 2 lw 2\n";
 
     print GP "\n";
     close GP;
-    unlink($gnuplotFile);
 }
 
@@ -471 +467 @@
         my $outputFile = "$prefix/czarplot_hosts_space.png";
     my $limit = 97.0;
-    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_hosts_space.XXXXX", DIR => '/tmp', SUFFIX => '.dat');
+    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_hosts_space.XXXXX", DIR => '/tmp', SUFFIX => 'dat');
     $self->{_czarDb}->createHostsData($limit, $tmpFile);