Changeset 23406 for docs/hidek

Timestamp:

11/12/08 20:21:36 (5 years ago)

Author:

hidek

Message:

update NanoA benchmark

Location:

docs/hidek/bench/nanoa

Files:

• benchmark.out (modified) (1 diff)
• lib/NanoA.pm (modified) (8 diffs)

docs/hidek/bench/nanoa/benchmark.out

@@ -14 +14 @@
 
 Concurrency Level:      100
-Time taken for tests:   19.393726 seconds
+Time taken for tests:   19.531023 seconds
 Complete requests:      1000
 Failed requests:        0
 Write errors:           0
-Total transferred:      156720 bytes
+Total transferred:      142680 bytes
 HTML transferred:       10000 bytes
-Requests per second:    51.56 [#/sec] (mean)
-Time per request:       1939.373 [ms] (mean)
-Time per request:       19.394 [ms] (mean, across all concurrent requests)
-Transfer rate:          7.89 [Kbytes/sec] received
+Requests per second:    51.20 [#/sec] (mean)
+Time per request:       1953.102 [ms] (mean)
+Time per request:       19.531 [ms] (mean, across all concurrent requests)
+Transfer rate:          7.12 [Kbytes/sec] received
 
 Connection Times (ms)
               min  mean[+/-sd] median   max
-Connect:        0    0   1.4      0       8
-Processing:    39 1856 1942.1   1454   19325
-Waiting:       38 1848 1943.3   1449   19324
-Total:         39 1856 1942.3   1454   19327
+Connect:        0    0   1.3      0       8
+Processing:   151 1874 1367.8   1616   19484
+Waiting:      151 1861 1365.3   1611   19483
+Total:        151 1874 1367.9   1616   19485
 
 Percentage of the requests served within a certain time (ms)
-  50%   1454
-  66%   1487
-  75%   1563
-  80%   1701
-  90%   2193
-  95%   2901
-  98%   7020
-  99%  13180
- 100%  19327 (longest request)
+  50%   1616
+  66%   1647
+  75%   1692
+  80%   1743
+  90%   2172
+  95%   2907
+  98%   6538
+  99%   8099
+ 100%  19485 (longest request)

docs/hidek/bench/nanoa/lib/NanoA.pm

@@ -36 +36 @@
         my $cgi_path = $cgi_klass;
         $cgi_path =~ s{::}{/}g;
-        require "$cgi_path.pm";
+        require_once("$cgi_path.pm");
         $self->{query} = $cgi_klass->new;
     }
@@ -74 +74 @@
     my $self = shift;
     my $headers = $self->{headers};
-    my $ct =
-        delete($headers->{-type}) . "; charset=" . delete($headers->{-charset});
+    my $ct = delete $headers->{-type};
+    if ($ct =~ /;\s*charset=/) {
+        delete $headers->{-charset};
+    } else {
+        $ct .= "; charset=" . delete $headers->{-charset};
+    }
     print "Content-Type: $ct\n";
     foreach my $n (sort keys %$headers) {
@@ -91 +95 @@
     print "\n";
 }
-    
+
+my %REQUIRED;
+
+sub require_once {
+    my $path = shift;
+    return if $REQUIRED{$path};
+    require $path;
+    $REQUIRED{$path} = 1;
+}
+
+my %LOADED;
+
+sub load_once {
+    my ($path, $mark_path) = @_;
+    $mark_path ||= $path;
+    return if $LOADED{$mark_path};
+    local $@;
+    do "$path"
+        or return;
+    die $@
+        if $@;
+    $LOADED{$mark_path} = 1;
+}
+
+sub loaded {
+    my $path = shift;
+    $LOADED{$path} = shift
+        if @_;
+    $LOADED{$path};
+}
+
 package NanoA::Dispatch;
 
@@ -140 +174 @@
     $path =~ s{/+$}{};
     local $@;
-    eval {
-        # should have a different invocation model for mod_perl and fastcgi
-        require "$path.pm";
-    };
-    unless ($@) {
-        my $module = $path;
-        $module =~ s{/}{::}g;
-        return $module;
-    }
-    return
-        if $@ =~ /^Can't locate /;
-    die $@;
+    NanoA::load_once("$path.pm")
+        or return;
+    my $module = $path;
+    $module =~ s{/}{::}g;
+    return $module;
 }
 
@@ -159 +186 @@
     return
         unless -e "$path.mt";
-    NanoA::Mojo::Template->__load($config, $path);
+    NanoA::Mojo::Template::__load($config, $path);
 }
 
@@ -187 +214 @@
 use base qw(NanoA);
 
-my %LOADED;
-
 sub include {
     my ($app, $path) = @_;
-    my $module = $app->__load($app->config, $app->config->{prefix} . "/$path");
+    my $module = __load($app->config, $app->config->{prefix} . "/$path");
     $module->run_as($app);
 }
 
 sub __load {
-    my ($self, $config, $path) = @_;
+    my ($config, $path) = @_;
     my $module = $path;
     $module =~ s{/}{::}g;
     return $module
-        if $LOADED{$path};
-    if ($self->__use_cache($config, $path)) {
-        require "$config->{mt_cache_dir}/$path.mtc";
-        $LOADED{$path} = 1;
+        if NanoA::loaded($path);
+    if (__use_cache($config, $path)) {
+        NanoA::load_once("$config->{mt_cache_dir}/$path.mtc", "$path.mt");
         return $module;
     }
-    my $code = $self->__compile($path, $module);
+    my $code = __compile($path, $module);
     local $@;
     eval $code;
     die $@ if $@;
-    $self->__update_cache($config, $path, $code)
+    __update_cache($config, $path, $code)
         if $config->{mt_cache_dir};
-    $LOADED{$path} = 1;
+    NanoA::loaded($path, 1);
     $module;
 }
 
+my $mt_loaded;
+
 sub __compile {
-    my ($self, $path, $module) = @_;
-    __load_once("Mojo/Template.pm");
+    my ($path, $module) = @_;
+    unless ($mt_loaded) {
+        NanoA::require_once("Mojo/Template.pm");
+        $mt_loaded = 1;
+    }
     my $mt = Mojo::Template->new;
     $mt->parse(__read_file("$path.mt"));
@@ -241 +270 @@
 }
 
-sub __load_once {
-    my $path = shift;
-    return if $LOADED{$path};
-    require "$path";
-}
-
 sub __update_cache {
-    my ($self, $config, $path, $code) = @_;
+    my ($config, $path, $code) = @_;
     my $cache_path = $config->{mt_cache_dir};
     foreach my $p (split '/', $path) {
@@ -262 +285 @@
 
 sub __use_cache {
-    my ($self, $config, $path) = @_;
+    my ($config, $path) = @_;
     return unless $config->{mt_cache_dir};
     my @orig = stat "$path.mt"