X-Git-Url: http://git.rot13.org/?p=Fuse-DBI;a=blobdiff_plain;f=DBI.pm;h=89889bd60b1e67430b0eaef2f0f7be4a5e58654e;hp=3537bf070cad63466a64fc3743b2a7c8e4002089;hb=73d0b06304c5f122f550b153f47a9f573e57fde8;hpb=8b53b090ace163fc02e100998eda16f4a0c0435b diff --git a/DBI.pm b/DBI.pm index 3537bf0..89889bd 100755 --- a/DBI.pm +++ b/DBI.pm @@ -12,8 +12,10 @@ use DBI; use Carp; use Data::Dumper; +our $VERSION = '0.08'; -our $VERSION = '0.05'; +# block size for this filesystem +use constant BLOCK => 1024; =head1 NAME @@ -29,7 +31,7 @@ See C below for examples how to set parameters. =head1 DESCRIPTION This module will use C module, part of C -available at L to mount +available at L to mount your database as file system. That will give you possibility to use normal file-system tools (cat, grep, vi) @@ -132,6 +134,11 @@ sub mount { print Dumper($arg); + unless ($self->fuse_module_loaded) { + print STDERR "no fuse module loaded. Trying sudo modprobe fuse!\n"; + system "sudo modprobe fuse" || die "can't modprobe fuse using sudo!\n"; + } + carp "mount needs 'dsn' to connect to (e.g. dsn => 'DBI:Pg:dbname=test')" unless ($arg->{'dsn'}); carp "mount needs 'mount' as mountpoint" unless ($arg->{'mount'}); @@ -148,12 +155,20 @@ sub mount { my $pid; if ($arg->{'fork'}) { - $self->{'mounted'} = 1; $pid = fork(); die "fork() failed: $!" unless defined $pid; # child will return to caller if ($pid) { - return $self; + my $counter = 4; + while ($counter && ! $self->is_mounted) { + select(undef, undef, undef, 0.5); + $counter--; + } + if ($self->is_mounted) { + return $self; + } else { + return undef; + } } } @@ -170,8 +185,6 @@ sub mount { $self->{'read_filenames'} = sub { $self->read_filenames }; $self->read_filenames; - $self->{'mounted'} = 1 unless ($arg->{'fork'}); - $fuse_self = \$self; Fuse::main( @@ -189,14 +202,38 @@ sub mount { debug=>0, ); - $self->{'mounted'} = 0; - exit(0) if ($arg->{'fork'}); return 1; }; +=head2 is_mounted + +Check if fuse filesystem is mounted + + if ($mnt->is_mounted) { ... } + +=cut + +sub is_mounted { + my $self = shift; + + my $mounted = 0; + my $mount = $self->{'mount'} || confess "can't find mount point!"; + if (open(MTAB, "/etc/mtab")) { + while() { + $mounted = 1 if (/ $mount fuse /i); + } + close(MTAB); + } else { + warn "can't open /etc/mtab: $!"; + } + + return $mounted; +} + + =head2 umount Unmount your database as filesystem. @@ -211,23 +248,35 @@ database to filesystem. sub umount { my $self = shift; - if ($self->{'mounted'}) { - system "fusermount -u ".$self->{'mount'} || warn "umount error: $!" && return 0; + if ($self->{'mount'} && $self->is_mounted) { + system "( fusermount -u ".$self->{'mount'}." 2>&1 ) >/dev/null"; + if ($self->is_mounted) { + system "sudo umount ".$self->{'mount'} || + return 0; + } + return 1; } - return 1; + return 0; } $SIG{'INT'} = sub { - print STDERR "umount called by SIG INT\n"; - umount; + if ($fuse_self && $$fuse_self->umount) { + print STDERR "umount called by SIG INT\n"; + } +}; + +$SIG{'QUIT'} = sub { + if ($fuse_self && $$fuse_self->umount) { + print STDERR "umount called by SIG QUIT\n"; + } }; sub DESTROY { my $self = shift; - return if (! $self->{'mounted'}); - print STDERR "umount called by DESTROY\n"; - $self->umount; + if ($self->umount) { + print STDERR "umount called by DESTROY\n"; + } } =head2 fuse_module_loaded @@ -252,7 +301,6 @@ sub fuse_module_loaded { } my %files; -my %dirs; sub read_filenames { my $self = shift; @@ -265,6 +313,10 @@ sub read_filenames { type => 0040, mode => 0755, }, + '..' => { + type => 0040, + mode => 0755, + }, # a => { # cont => "File 'a'.\n", # type => 0100, @@ -277,18 +329,19 @@ sub read_filenames { # read them in with sesible defaults while (my $row = $sth->{'filenames'}->fetchrow_hashref() ) { + $row->{'filename'} ||= 'NULL-'.$row->{'id'}; $files{$row->{'filename'}} = { size => $row->{'size'}, mode => $row->{'writable'} ? 0644 : 0444, id => $row->{'id'} || 99, }; + my $d; foreach (split(m!/!, $row->{'filename'})) { # first, entry is assumed to be file if ($d) { $files{$d} = { - size => $dirs{$d}++, mode => 0755, type => 0040 }; @@ -306,7 +359,7 @@ sub read_filenames { } } - print "found ",scalar(keys %files)-scalar(keys %dirs)," files, ",scalar(keys %dirs), " dirs\n"; + print "found ",scalar(keys %files)," files\n"; } @@ -322,8 +375,8 @@ sub e_getattr { $file =~ s,^/,,; $file = '.' unless length($file); return -ENOENT() unless exists($files{$file}); - my ($size) = $files{$file}{size} || 1; - my ($dev, $ino, $rdev, $blocks, $gid, $uid, $nlink, $blksize) = (0,0,0,1,0,0,1,1024); + my ($size) = $files{$file}{size} || 0; + my ($dev, $ino, $rdev, $blocks, $gid, $uid, $nlink, $blksize) = (0,0,0,int(($size+BLOCK-1)/BLOCK),0,0,1,BLOCK); my ($atime, $ctime, $mtime); $atime = $ctime = $mtime = $files{$file}{ctime} || $ctime_start; @@ -331,7 +384,7 @@ sub e_getattr { # 2 possible types of return values: #return -ENOENT(); # or any other error you care to - #print(join(",",($dev,$ino,$modes,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks)),"\n"); + #print "getattr($file) ",join(",",($dev,$ino,$modes,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks)),"\n"; return ($dev,$ino,$modes,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks); } @@ -381,6 +434,7 @@ sub e_open { read_content($file,$files{$file}{id}) unless exists($files{$file}{cont}); + $files{$file}{cont} ||= ''; print "open '$file' ",length($files{$file}{cont})," bytes\n"; return 0; } @@ -496,17 +550,37 @@ sub e_utime { return 0; } -sub e_statfs { return 255, 1, 1, 1, 1, 2 } +sub e_statfs { + + my $size = 0; + my $inodes = 0; + + foreach my $f (keys %files) { + if ($f !~ /(^|\/)\.\.?$/) { + $size += $files{$f}{size} || 0; + $inodes++; + } + print "$inodes: $f [$size]\n"; + } + + $size = int(($size+BLOCK-1)/BLOCK); + + my @ret = (255, $inodes, 1, $size, $size-1, BLOCK); + + #print "statfs: ",join(",",@ret),"\n"; + + return @ret; +} sub e_unlink { my $file = filename_fixup(shift); - if (exists( $dirs{$file} )) { - print "unlink '$file' will re-read template names\n"; - print Dumper($fuse_self); - $$fuse_self->{'read_filenames'}->(); - return 0; - } elsif (exists( $files{$file} )) { +# if (exists( $dirs{$file} )) { +# print "unlink '$file' will re-read template names\n"; +# print Dumper($fuse_self); +# $$fuse_self->{'read_filenames'}->(); +# return 0; + if (exists( $files{$file} )) { print "unlink '$file' will invalidate cache\n"; read_content($file,$files{$file}{id}); return 0; @@ -521,10 +595,16 @@ __END__ Nothing. +=head1 BUGS + +Size information (C) is wrong. It's a problem in upstream Fuse module +(for which I'm to blame lately), so when it gets fixes, C will +automagically pick it up. + =head1 SEE ALSO C website -L +L Example for WebGUI which comes with this distribution in directory C. It also contains a lot of documentation