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

Comparing AnyEvent-MP/MP/Node.pm (file contents):
Revision 1.42 by root, Wed Sep 23 11:57:16 2009 UTC vs.
Revision 1.47 by root, Sat Nov 28 12:40:22 2009 UTC

    $self->{transport} = $transport;
    my $transport_send = $transport->can ("send");
+   AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
    $self->{send} = sub {
       $transport_send->($transport, $_[0]);
    };
-   AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
    $transport->send ($_)
       for @{ delete $self->{queue} || [] };
 }
 sub connect {
    # we are trivially connected
 }
 # delay every so often to avoid recursion, also used to delay after spawn
-our $DELAY;
+our $DELAY = -50;
 our @DELAY;
 our $DELAY_W;
 sub _send_delayed {
    local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
          or return; # killing nonexistent ports is O.K.
       delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
       my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
          or !@reason
-         or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
+         or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
       $_->(@reason) for values %$mon;
    };
-   $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
+   # we _always_ delay kil's, to avoid calling mon callbacks
+   # from anything but the event loop context.
+   $DELAY = 1;
+   push @DELAY, $delay_cb;
+   $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
 }
 sub monitor {
    my ($self, $portid, $cb) = @_;

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