Changeset 151

Timestamp:

05/23/07 18:22:57 (3 years ago)

Author:

bradfitz

Message:

start of tempfile leak auditing, moving all tempfile creation into Brackup::Util wrapper, which currently does nothing.

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• TODO (modified) (1 diff)
• lib/Brackup/GPGProcess.pm (modified) (2 diffs)
• lib/Brackup/Restore.pm (modified) (1 diff)
• lib/Brackup/Root.pm (modified) (2 diffs)
• lib/Brackup/Test.pm (modified) (6 diffs)
• t/01-backup.t (modified) (1 diff)
• t/02-gpg.t (modified) (1 diff)
• t/03-combine-little-files.t (modified) (1 diff)

trunk/MANIFEST

@@ -31 +31 @@
 lib/Brackup/Target/Filesystem.pm
 lib/Brackup/Test.pm
+lib/Brackup/Util.pm
 Makefile.PL
 MANIFEST                        This list of files

trunk/TODO

@@ -36 +36 @@
 -- ionice stuff.  network nice stuff.
 
--- leaking 3 /tmp files after each run?x
+-- leaking 3 /tmp files after each run?
 
 -- make tests pass without 'noatime' mount option

trunk/lib/Brackup/GPGProcess.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use File::Temp qw(tempfile);
+use Brackup::Util qw(tempfile);
 use POSIX qw(_exit);
 
@@ -8 +8 @@
     my ($class, $pchunk) = @_;
 
-    # FIXME: let users control where their temp files go?
     my ($destfh, $destfn) = tempfile();
 

trunk/lib/Brackup/Restore.pm

@@ -4 +4 @@
 use Carp qw(croak);
 use Digest::SHA1;
-use File::Temp qw(tempfile);
+use Brackup::Util qw(tempfile);
 
 sub new {

trunk/lib/Brackup/Root.pm

@@ -5 +5 @@
 use File::Find;
 use Brackup::DigestCache;
-use File::Temp qw(tempfile);
+use Brackup::Util qw(tempfile);
 use IPC::Open2;
 use Symbol;
@@ -204 +204 @@
     $data = \$data unless ref $data;
 
-    # FIXME: let users control where their temp files go?
     my ($tmpfh, $tmpfn) = tempfile();
     print $tmpfh $$data

trunk/lib/Brackup/Test.pm

@@ -9 +9 @@
 use Test::More;
 use FindBin qw($Bin);
-use File::Temp qw(tempdir tempfile);
+use Brackup::Util qw(tempdir tempfile);
 use File::Find;
 use File::stat ();
@@ -23 +23 @@
     if ($$ == $par_pid) {
         my $rv = unlink @to_unlink;
+        temp_audit();
     }
+}
+
+my $start_temps;
+sub num_temps {
+    opendir(my $dh, "/tmp") or return 0;
+    my @items = readdir($dh);
+    return scalar @items;
+}
+sub temp_audit {
+    my $now = num_temps();
+    $start_temps ||= $now;
+    unless ($now == $start_temps) {
+        print "# temp files changed: $start_temps -> $now\n";
+    }
+}
+
+BEGIN {
+    temp_audit();
 }
 
@@ -32 +51 @@
     die if %opts;
 
+    temp_audit();
     my $initer = shift;
 
@@ -75 +95 @@
     }
     ok(-s $meta_filename, "backup file has size");
+
+    temp_audit();
     return wantarray ? ($meta_filename, $backup) : $meta_filename;
 }
@@ -81 +103 @@
     my $backup_file = shift;
     my $restore_dir = tempdir( CLEANUP => 1 );
+    temp_audit();
     ok_dir_empty($restore_dir);
 
@@ -91 +114 @@
     ok(eval { $restore->restore; }, "did the restore")
         or die "restore failed: $@";
+    temp_audit();
     return $restore_dir;
 }

trunk/t/01-backup.t

@@ -6 +6 @@
 use Brackup::Test;
 use FindBin qw($Bin);
-use File::Temp qw(tempdir tempfile);
+use Brackup::Util qw(tempfile);
 
 ############### Backup

trunk/t/02-gpg.t

@@ -6 +6 @@
 use Brackup::Test;
 use FindBin qw($Bin);
-use File::Temp qw(tempdir tempfile);
+use Brackup::Util qw(tempfile);
 
 ############### Backup

trunk/t/03-combine-little-files.t

@@ -6 +6 @@
 use Brackup::Test;
 use FindBin qw($Bin);
-use File::Temp qw(tempdir tempfile);
+use Brackup::Util qw(tempfile);
 
 ############### Backup