[ViewVC] Diff of: cvs/AnyEvent-DBI/DBI.pm

Comparing AnyEvent-DBI/DBI.pm (file contents):
Revision 1.13 by root, Sat Oct 23 21:47:13 2010 UTC vs.
Revision 1.14 by root, Sat Oct 30 20:23:44 2010 UTC

 separate "DBI-Server" processes and sending them requests.
 It means that you can run DBI requests in parallel to other tasks.
 The overhead for very simple statements ("select 0") is somewhere
-around 120% to 200% (dual/single core CPU) compared to an explicit
+around 100% to 120% (dual/single core CPU) compared to an explicit
 prepare_cached/execute/fetchrow_arrayref/finish combination.
 =head2 ERROR HANDLING
 This module defines a number of functions that accept a callback
 =cut
 package AnyEvent::DBI;
-use strict qw(vars subs);
+use common::sense;
-no warnings;
 use Carp;
 use Socket ();
 use Scalar::Util ();
 use Storable ();
-use DBI ();
+use DBI (); # only needed in child actually - do it before fork & !exec?
 use AnyEvent ();
 use AnyEvent::Util ();
 use Errno ();
 use Fcntl ();
 use POSIX ();
-our $VERSION = '2.0';
+our $VERSION = '2.1';
 our $FD_MAX = eval { POSIX::sysconf (&POSIX::_SC_OPEN_MAX) - 1 } || 1023;
 # this is the forked server code, could/should be bundled as it's own file
 sub new {
    my ($class, $dbi, $user, $pass, %arg) = @_;
    my ($client, $server) = AnyEvent::Util::portable_socketpair
-      or croak "unable to create Anyevent::DBI communications pipe: $!";
+      or croak "unable to create AnyEvent::DBI communications pipe: $!";
    my %dbi_args = %arg;
    delete @dbi_args{qw(on_connect on_error timeout exec_server)};
    my $self = bless \%arg, $class;
    my @caller = (caller)[1,2]; # the "default" caller
    {
       Scalar::Util::weaken (my $self = $self);
-      $self->{rw} = AnyEvent->io (fh => $client, poll => "r", cb => sub {
+      $self->{rw} = AE::io $client, 0, sub {
          return unless $self;
-         $self->{last_activity} = AnyEvent->now;
+         $self->{last_activity} = AE::now;
          my $len = sysread $client, $rbuf, 65536, length $rbuf;
          if ($len > 0) {
             # we received data, so reset the timer
             $self->_error ("unexpected eof", @caller, 1);
          } elsif ($! != Errno::EAGAIN) {
             # todo, caller?
             $self->_error ("read error: $!", @caller, 1);
          }
-      });
+      };
       $self->{tw_cb} = sub {
          if ($self->{timeout} && $self->{last_activity}) {
-            if (AnyEvent->now > $self->{last_activity} + $self->{timeout}) {
+            if (AE::now > $self->{last_activity} + $self->{timeout}) {
                # we did time out
                my $req = $self->{queue}[0];
                $self->_error (timeout => $req->[1], $req->[2], 1); # timeouts are always fatal
             } else {
                # we need to re-set the timeout watcher
-               $self->{tw} = AnyEvent->timer (
+               $self->{tw} = AE::timer
-                  after => $self->{last_activity} + $self->{timeout} - AnyEvent->now,
+                  $self->{last_activity} + $self->{timeout} - AE::now,
+                  0,
-                  cb    => $self->{tw_cb},
+                  $self->{tw_cb},
-               );
+               ;
-               Scalar::Util::weaken $self;
             }
          } else {
             # no timeout check wanted, or idle
             undef $self->{tw};
          }
       };
       $self->{ww_cb} = sub {
          return unless $self;
-         $self->{last_activity} = AnyEvent->now;
+         $self->{last_activity} = AE::now;
          my $len = syswrite $client, $self->{wbuf}
             or return delete $self->{ww};
          substr $self->{wbuf}, 0, $len, "";
 sub _server_pid {
    shift->{child_pid}
 }
 sub kill_child {
-   my $self      = shift;
+   my $self = shift;
-   my $child_pid = delete $self->{child_pid};
+   if (my $pid = delete $self->{child_pid}) {
-   if ($child_pid) {
+      kill TERM => $pid;
-      # send SIGKILL in two seconds
+   }
-      my $murder_timer = AnyEvent->timer (
-         after => 2,
-         cb    => sub {
-            kill 9, $child_pid;
-         },
-      );
-      # reap process
-      my $kid_watcher; $kid_watcher = AnyEvent->child (
-         pid => $child_pid,
-         cb  => sub {
-            # just hold on to this so it won't go away
-            undef $kid_watcher;
-            # cancel SIGKILL
-            undef $murder_timer;
-         },
-      );
-      close $self->{fh};
+   close delete $self->{fh};
-   }
 }
 sub DESTROY {
    shift->kill_child;
 }
    push @{ $self->{queue} }, [$cb, $filename, $line];
    # re-start timeout if necessary
    if ($self->{timeout} && !$self->{tw}) {
-      $self->{last_activity} = AnyEvent->now;
+      $self->{last_activity} = AE::now;
       $self->{tw_cb}->();
    }
    $self->{wbuf} .= pack "L/a*", Storable::freeze \@_;
    unless ($self->{ww}) {
       my $len = syswrite $self->{fh}, $self->{wbuf};
       substr $self->{wbuf}, 0, $len, "";
       # still any left? then install a write watcher
-      $self->{ww} = AnyEvent->io (fh => $self->{fh}, poll => "w", cb => $self->{ww_cb})
+      $self->{ww} = AE::io $self->{fh}, 1, $self->{ww_cb}
          if length $self->{wbuf};
    }
 }
 =item $dbh->exec ("statement", @args, $cb->($dbh, \@rows, $rv))

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing AnyEvent-DBI/DBI.pm (file contents): Revision 1.13 by root, Sat Oct 23 21:47:13 2010 UTC vs. Revision 1.14 by root, Sat Oct 30 20:23:44 2010 UTC

Diff Legend

Comparing AnyEvent-DBI/DBI.pm (file contents):
Revision 1.13 by root, Sat Oct 23 21:47:13 2010 UTC vs.
Revision 1.14 by root, Sat Oct 30 20:23:44 2010 UTC