Changeset 29702

Timestamp:

Nov 8, 2010, 2:24:42 PM (16 years ago)

Author:

rhenders

Message:

improvments to temp file handling

File:

• trunk/tools/czartool/CzarDb.pm (modified) (5 diffs)

trunk/tools/czartool/CzarDb.pm

@@ -5 +5 @@
 use warnings;
 use strict;
+
+use File::Temp;
 
 my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist"); # TODO put elsewhere
@@ -573 +575 @@
     $query->execute;
 
-    ${$dataFile} = "/tmp/czarplot_gnuplot_".$label."_".$stage."_t.dat";
+    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_gnuplot_".$label."_".$stage."_t.XXXXX", DIR => '/tmp', SUFFIX => '.dat');
+    $tmpFile->unlink_on_destroy( 0 );
+    ${$dataFile} = $tmpFile->filename;
     open (GNUDAT, ">${$dataFile}") or print "* Problem opening gnuplot data file for plot for '$label' '$stage'\n";
 
@@ -726 +730 @@
 ###########################################################################
 sub createHostsData {
-    my ($self, $limit) = @_;
-
-    my $dataFile = "/tmp/czarplot_hosts_space.dat";
-    open (GNUDAT, ">$dataFile");
+    my ($self, $limit, $tmpFile) = @_;
+
+    open (GNUDAT, ">".$tmpFile->filename);
 
     my $query = $self->{_db}->prepare(<<SQL);
@@ -775 +778 @@
         print GNUDAT "\n";
     }
+
     close(GNUDAT);
-
-    return $dataFile;
 }
 
@@ -861 +863 @@
     my $faults;
     my $timestamp;
-    ${$dataFile} = "/tmp/czarplot_gnuplot_".$label."_".$stage."_r.dat";
+
+    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_gnuplot_".$label."_".$stage."_r.XXXXX", DIR => '/tmp', SUFFIX => 'dat');
+    $tmpFile->unlink_on_destroy( 0 );
+    ${$dataFile} = $tmpFile->filename;
+
     open (GNUDAT, ">${$dataFile}") or print "* Problem opening gnuplot data file for plot for '$label' '$stage'\n";
     my $cleanupCarry = 0;