Add two packages: GitwebCache::Capture, which defines interface, and
GitwebCache::Capture::SelectFH, which is actually implements simple
capturing. GitwebCache::Capture::SelectFH captures output by using
select(FILEHANDLE) to change default filehandle for output. This
means that output of a "print" or a "printf" (or a "write") without
a filehandle would be captured.
To change mode of filehandle used for capturing correctly,
binmode select(), <mode>;
needs to be used in place of
binmode STDOUT, <mode>;
Capturing is done using in-memory file held in Perl scalar.
Using select(FILEHANDLE) is a bit fragile as a method of capturing
output, as it assumes that we always use "print" or "printf" without
filehandle, and use select() which returns default filehandle for
output in place of explicit STDOUT. On the other hand it has the
advantage of being simple. Alternate solutions include using tie
(like in CGI::Cache), or using PerlIO layers - but the last requires
non-standard PerlIO::Util module.
Includes separate tests for capturing output.
Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
---
You can see alternate solutions for capturing output in 21/17 patch of
this series: "gitweb/lib - Alternate ways of capturing output" (an
appendix to this series).
Differences from v4:
* The capture interface tests are now invoked by a separate test
script t/t9504-gitweb-capture-interface.sh, for 'prove' to work
correctly (as test_external doesn't yet work as subtest).
* The t/t9504/test_capture_interface.pl uses GIT_BUILD_DIR rather than
TEST_DIRECTORY, and respect GITWEBLIBDIR to make it possible to test
installed version of module.
* Removed spurious changes and fixes to commits earlier in series
(patch cleanup).
Differences from relevant parts of J.H. patch:
* Capturing gitweb output will be done without need to modify gitweb
to either save generated output into $output variable, and then
print it or save it in cache after it is generated in full (original
J.H. patch in "Gitweb caching v2"), or changing all print statements
to print to explicit filehandle which points to STDOUT if caching is
disabled and to in-memory file if caching is enabled (modified
J.H. patch in "Gitweb caching v5").
* Contrary to the '$output .= <sth>' solution, and similar to the
'print {$out} <sth>' or 'print $out <sth>' (which can be thought of
as explicit version of select($out)), this way of capturing output
doesn't change gitweb behavior when caching is turned off; in
particular it preserves streaming.
Also the '$output .= <sth>' solution can affect performance because
of repeated string concatenation.
* The most important issue is that I/O "layers" (PerlIO), like ':utf8'
or ':raw', are *already applied* to the output that is captured.
This means that captured output is *always* in binary (':raw') mode.
In Perl 6 language it means that data returned by capturing engine
is an equivalent of Buf, a collection of bytes, whether Buf or Str
(a colection of logical characters) is printed.
The overal result is that we would not need separate code path for
caching binary output, and separate naming conventions for cache
files for binary data.
The t9504 test is about checking if both ':utf8' and ':raw' output
is captured correctly.
gitweb/lib/GitwebCache/Capture.pm | 66 ++++++++++++++++++++++
gitweb/lib/GitwebCache/Capture/SelectFH.pm | 82 ++++++++++++++++++++++++++++
t/t9504-gitweb-capture-interface.sh | 34 ++++++++++++
t/t9504/test_capture_interface.pl | 76 ++++++++++++++++++++++++++
4 files changed, 258 insertions(+), 0 deletions(-)
create mode 100644 gitweb/lib/GitwebCache/Capture.pm
create mode 100644 gitweb/lib/GitwebCache/Capture/SelectFH.pm
create mode 100755 t/t9504-gitweb-capture-interface.sh
create mode 100755 t/t9504/test_capture_interface.pl
diff --git a/gitweb/lib/GitwebCache/Capture.pm b/gitweb/lib/GitwebCache/Capture.pm
new file mode 100644
index 0000000..3e9fe81
--- /dev/null
+++ b/gitweb/lib/GitwebCache/Capture.pm
@@ -0,0 +1,66 @@
+# gitweb - simple web interface to track changes in git repositories
+#
+# (C) 2010, Jakub Narebski <jnareb@xxxxxxxxx>
+#
+# This program is licensed under the GPLv2
+
+#
+# Output capturing for gitweb caching engine
+#
+
+# It is base abstract class (a role) for capturing output of gitweb
+# actions for gitweb caching engine.
+#
+# Child (derived) concrete classes, which actually implement some method
+# of capturing STDOUT output, must implement the following methods:
+# * ->new(), to create new object of a capturing class
+# * ->start(), to start capturing output
+# * ->stop(), to stop capturing output and return it
+#
+# Before starting capture by using capture_block etc. subroutines,
+# one has to run <child class>->setup().
+
+package GitwebCache::Capture;
+
+use strict;
+use warnings;
+
+use Exporter qw(import);
+our @EXPORT = qw(capture_start capture_stop capture_block);
+our @EXPORT_OK = qw(setup_capture);
+our %EXPORT_TAGS = (all => [ @EXPORT, @EXPORT_OK ]);
+
+# Holds object used for capture (of child class)
+my $capture;
+
+sub setup_capture {
+ my $self = shift || __PACKAGE__;
+
+ $capture = $self->new(@_);
+}
+
+sub capture {
+ my ($self, $code) = @_;
+
+ $self->start();
+ $code->();
+ return $self->stop();
+}
+
+# Wrap caching data; capture only STDOUT
+sub capture_block (&) {
+ my $code = shift;
+ return $capture->capture($code);
+}
+
+sub capture_start {
+ $capture->start(@_);
+}
+
+sub capture_stop {
+ return $capture->stop(@_);
+}
+
+1;
+__END__
+# end of package GitwebCache::Capture;
diff --git a/gitweb/lib/GitwebCache/Capture/SelectFH.pm b/gitweb/lib/GitwebCache/Capture/SelectFH.pm
new file mode 100644
index 0000000..18ce5c3
--- /dev/null
+++ b/gitweb/lib/GitwebCache/Capture/SelectFH.pm
@@ -0,0 +1,82 @@
+# gitweb - simple web interface to track changes in git repositories
+#
+# (C) 2010, Jakub Narebski <jnareb@xxxxxxxxx>
+#
+# This program is licensed under the GPLv2
+
+#
+# Simple output capturing using select(FH);
+#
+
+# This module (class) captures output of 'print <sth>', 'printf <sth>'
+# and 'write <sth>' (without a filehandle) by using select(FILEHANDLE)
+# to change default filehandle for output, changing it to in-memory
+# file (saving output to scalar).
+#
+# Note that when using this simplest way of capturing, to change mode of
+# filehandle using for capturing correctly, "binmode STDOUT, <mode>;"
+# has to be changed to "binmode select(), <mode>;". This has no change
+# if we are not capturing output using GitwebCache::Capture::SelectFH.
+
+package GitwebCache::Capture::SelectFH;
+
+use PerlIO;
+
+use strict;
+use warnings;
+
+use base qw(GitwebCache::Capture);
+use GitwebCache::Capture qw(:all);
+
+use Exporter qw(import);
+our @EXPORT = @GitwebCache::Capture::EXPORT;
+our @EXPORT_OK = @GitwebCache::Capture::EXPORT_OK;
+our %EXPORT_TAGS = %GitwebCache::Capture::EXPORT_TAGS;
+
+# Constructor
+sub new {
+ my $proto = shift;
+
+ my $class = ref($proto) || $proto;
+ my $self = {};
+ $self = bless($self, $class);
+
+ $self->{'oldfh'} = select();
+ $self->{'data'} = '';
+
+ return $self;
+}
+
+# Start capturing data (STDOUT)
+# (printed using 'print <sth>' or 'printf <sth>')
+sub start {
+ my $self = shift;
+
+ $self->{'data'} = '';
+ $self->{'data_fh'} = undef;
+
+ open $self->{'data_fh'}, '>', \$self->{'data'}
+ or die "Couldn't open in-memory file for capture: $!";
+ $self->{'oldfh'} = select($self->{'data_fh'});
+
+ # note: this does not cover all cases
+ binmode select(), ':utf8'
+ if ((PerlIO::get_layers($self->{'oldfh'}))[-1] eq 'utf8');
+}
+
+# Stop capturing data (required for die_error)
+sub stop {
+ my $self = shift;
+
+ # return if we didn't start capturing
+ return unless defined $self->{'data_fh'};
+
+ select($self->{'oldfh'});
+ close $self->{'data_fh'}
+ or die "Couldn't close in-memory file for capture: $!";
+ return $self->{'data'};
+}
+
+1;
+__END__
+# end of package GitwebCache::Capture::SelectFH;
diff --git a/t/t9504-gitweb-capture-interface.sh b/t/t9504-gitweb-capture-interface.sh
new file mode 100755
index 0000000..82623f1
--- /dev/null
+++ b/t/t9504-gitweb-capture-interface.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Jakub Narebski
+#
+
+test_description='gitweb capturing interface
+
+This test checks capturing interface used for capturing gitweb output
+in gitweb caching (GitwebCache::Capture* modules).'
+
+# for now we are running only cache interface tests
+. ./test-lib.sh
+
+# this test is present in gitweb-lib.sh
+if ! test_have_prereq PERL; then
+ skip_all='perl not available, skipping test'
+ test_done
+fi
+
+"$PERL_PATH" -MTest::More -e 0 >/dev/null 2>&1 || {
+ skip_all='perl module Test::More unavailable, skipping test'
+ test_done
+}
+
+# ----------------------------------------------------------------------
+
+# The external test will outputs its own plan
+test_external_has_tap=1
+
+test_external \
+ 'GitwebCache::Capture Perl API (in gitweb/lib/)' \
+ "$PERL_PATH" "$TEST_DIRECTORY"/t9504/test_capture_interface.pl
+
+test_done
diff --git a/t/t9504/test_capture_interface.pl b/t/t9504/test_capture_interface.pl
new file mode 100755
index 0000000..55c402a
--- /dev/null
+++ b/t/t9504/test_capture_interface.pl
@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+use lib (split(/:/, $ENV{GITPERLLIB}));
+
+use warnings;
+use strict;
+use utf8;
+
+use Test::More;
+
+# test source version
+use lib $ENV{GITWEBLIBDIR} || "$ENV{GIT_BUILD_DIR}/gitweb/lib";
+
+# ....................................................................
+
+# prototypes must be known at compile time, otherwise they do not work
+BEGIN { use_ok('GitwebCache::Capture::SelectFH', qw(:all)); }
+
+# Test setting up capture
+#
+my $capture = new_ok('GitwebCache::Capture::SelectFH' => [], 'The $capture');
+isa_ok($capture, 'GitwebCache::Capture', 'The $capture');
+ok(setup_capture('GitwebCache::Capture::SelectFH'),
+ 'setup_capture with package name: GitwebCache::Capture::SelectFH');
+ok(setup_capture($capture),
+ 'setup_capture with subclass object: $capture');
+
+# Test properties of capture_block
+#
+is(prototype('capture_block'), '&', 'capture_block has (&) prototype');
+
+# Test capturing
+#
+diag('Should not print anything except test results and diagnostic');
+my $test_data = 'Capture this';
+my $captured = capture_block {
+ print $test_data;
+};
+is($captured, $test_data, 'capture_block captures simple data');
+
+binmode STDOUT, ':utf8';
+$test_data = <<'EOF';
+ÃÃÃ ÃÃ
+ÃÃÃÃÃ
+ÃbÃdÃfg
+ZaÅÃÅÄ gÄsiÄ jaÅÅ
+åç åé
+ããããããããããã
+
+ããããã
+
+ãããããããããããã
+ææããããããããããããã
+EOF
+utf8::decode($test_data);
+$captured = capture_block {
+ binmode select(), ':utf8';
+
+ print $test_data;
+};
+utf8::decode($captured);
+is($captured, $test_data, 'capture_block captures utf8 data');
+
+$test_data = '|\x{fe}\x{ff}|\x{9F}|\000|'; # invalid utf-8
+$captured = capture_block {
+ binmode select(), ':raw';
+
+ print $test_data;
+};
+is($captured, $test_data, 'capture_block captures raw data');
+
+
+done_testing();
+
+# Local Variables:
+# encoding: utf-8
+# End:
--
1.7.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html