imager: comparison bin/imager.fuse

equal deleted inserted replaced

-:136d6b9b5a67
+:8c2cc26d45fc
 use Hash::Util qw(lock_keys);
 use File::Temp;
 use DB_File;
 use File::Basename;
 use Imager;
+use Smart::Comments;
 my %o = (
 debug  => undef,
 detach => 1,
 tmp    => undef,
 }
 sub max {
 (sort { $a <=> $b } @_)[-1];
 }
-my $debug = sub { print STDERR @_ };
-$debug = sub { };
+sub nop_debug { }
+sub yes_debug { print STDERR @_ }
+*{main::debug} = \&nop_debug;
 #$SIG{INT} = sub { warn "Got ^C or INT signal\n"; exit 1; };
 MAIN: {
 GetOptions(
 "d|debug!" => \$o{debug},
-"detach!"  => \$o{detach},
+"detach!"   => \$o{detach},
 "tmp:s" => sub { $o{tmp} = length $_[1] ? $_[1] : $ENV{TMP} // "/tmp" },
 "h|help"   => sub { pod2usage(-verbose => 1, -exit => 0) },
 "p|pass=s" => \$o{pass},
 "m|man"    => sub {
 pod2usage(
 },
 )
 and @ARGV == 2
 or pod2usage;
+if ($o{debug}) {
+undef &{main::debug};
+*{main::debug} = \&yes_debug;
+}
 my ($src, $mp) = @ARGV;
 $DATA = "$src/data";
 $IDX  = "$src/idx";
 tie_vars $o{tmp};
 Fuse::main(
 mountpoint => $mp,
-debug      => $o{debug} // 0,
-getattr    => \&getattr,
+#   debug      => $o{debug} // 0,
-getdir     => \&getdir,
+getattr => \&getattr,
-open       => \&openfile,
+getdir  => \&getdir,
-read       => \&readbuffer,
+open    => \&openfile,
-write      => \&writebuffer,
+read    => \&readbuffer,
-release    => \&release,
+write   => \&writebuffer,
+release => \&release,
 );
 exit;
 }
 }
 sub release {
 my $path = $IDX . shift;
 return 0 if not exists $IMAGE{$path};
-$debug->("Currently we have " . keys(%DIRTY) . " dirty blocks\n");
+debug("Currently we have " . keys(%DIRTY) . " dirty blocks\n");
 return 0;
 }
 sub readbuffer {
 my $path = $IDX . shift;
 my ($size, $offset) = @_;
 my $finfo = $IMAGE{$path} or die "File $path is not opened!";
 return "" if $offset >= $finfo->{meta}{devsize};
+	debug("<<< REQUESTED: offset:$offset size:$size\n");
 my $buffer = "";
 for (my $need = $size ; $need > 0 ; $need = $size - length($buffer)) {
+	    debug("<<<            offset:@{[$offset + length($buffer)]} size:$need\n");
 $buffer .= _readblock($finfo, $need, $offset + length($buffer));
-}
+	    debug("<<< missing: ", $size - length($buffer), "\n") if $size - length($buffer);
+}
+	debug("<<< SENDING " . length($buffer) . "\n\n");
 return $buffer;
 }
 sub _readblock {
 my ($finfo, $size, $offset) = @_;
 my ($block, $blockoffset, $length);
-$debug->("<<< block offset:$offset size:$size\n");
+debug("<<< requested: offset:$offset size:$size"
-$debug->("    block @{[int($offset/BS)]} + @{[$offset % BS]}\n");
+	    . "\tfrom $finfo->{meta}{filesystem}\n");
+debug("    mapped to:  block:@{[int($offset/BS)]}+@{[$offset % BS]}\n");
 # first check if it's an dirty block
 $block = int($offset / BS);
 if (exists $DIRTY{ $finfo . $block }) {
 $blockoffset = $offset % BS;
 $length = min(BS - $blockoffset, $size);
-$debug->(
+debug(
 "+++ dirty offset:$block*@{[BS]} + $blockoffset size:$length\n"
 );
 return substr $DIRTY{ $finfo . $block }, $blockoffset, $length;
 }
 $length = $l;
 last;
 }
 }
-$debug->("=== $length\n");
+debug("+++ disk  offset:$block*$finfo->{meta}{blocksize}"
-$debug->(
+. " + $blockoffset size:$length\n");
-"+++ disk offset:$block*$finfo->{meta}{blocksize} + $blockoffset size:$length\n"
-);
+#    die if $blockoffset == 417792;
 my $fn = "$DATA/" . $finfo->{blocklist}{$block};
+	debug("    fn:$fn\n");
 state %cache;
 if (not defined $cache{fn}
 or ($cache{fn} ne $fn))
 {
-	    Imager::get_block("$fn*" => \$cache{data});
+Imager::get_block("$fn*" => \$cache{data});
 $cache{fn} = $fn;
 }
 return substr($cache{data}, $blockoffset, $length);
 $block       = int($offset / BS);
 $blockoffset = $offset % BS;
 $length      = min(BS - $blockoffset, $size);
-$debug->(">>> offset:$offset size:$length of $size\n");
+debug(">>> offset:$offset size:$length of $size\n");
-$debug->("    block @{[int($offset/BS)]} + @{[$offset % BS]}\n");
+debug("    block @{[int($offset/BS)]} + @{[$offset % BS]}\n");
 if (not exists $DIRTY{ $finfo . $block }) {
-$debug->("+++ missing $block+$blockoffset\n");
+debug("+++ missing $block+$blockoffset\n");
 $DIRTY{ $finfo . $block } = _readblock($finfo, BS, $block * BS);
 }
 substr($DIRTY{ $finfo . $block }, $blockoffset, $length) =
 substr($buffer, 0, $length);
 my %meta;
 open(my $fh => $path);
 while (<$fh>) {
 last if /^$/;
 /^(?<k>\S+):\s+(?:(?<n>\d+)|(?<v>.*?))\s*$/
 and do {
-	      	# na sowas, die Zeitstempel dürfen nicht als Zeichenkette reinkommen!
-	      	$meta{ $+{k} } = defined $+{n} ? (0+$+{n}) : $+{v};
+# na sowas, die Zeitstempel dürfen nicht als Zeichenkette reinkommen!
-		next;
+$meta{ $+{k} } = defined $+{n} ? (0 + $+{n}) : $+{v};
-	      };
+next;
+};
 }
 return %meta;
 }
 }

changeset 118	8c2cc26d45fc
parent 115	0d4074ac2eee