[ViewVC] Diff of: cvs/AnyEvent/lib/AnyEvent/Handle.pm

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents):
Revision 1.254 by root, Mon Feb 10 11:34:13 2020 UTC vs.
Revision 1.255 by root, Wed Jul 29 13:02:48 2020 UTC

                   } else {
                      if ($self->{on_connect_error}) {
                         $self->{on_connect_error}($self, "$!");
                         $self->destroy if $self;
                      } else {
-                        $self->_error ($!, 1);
+                        $self->error ($!, 1);
                      }
                   }
                },
                sub {
                   local $self->{fh} = $_[0];
       if $self->{on_read} || @{ $self->{_queue} };
    $self->_drain_wbuf;
 }
+=item $handle->error ($errno[, $fatal[, $message]])
+Generates an error event, just like AnyEvent::Handle itself would do, i.e.
+calls the C<on_error> callback.
+Te only rerquired parameter is C<$errno>, which sets C<$!>. C<$fatal>
+defaults to false and C<$message> defaults to the stringified version
+of C<$1>.
+Example: generate C<EIO> when you read unexpected data.
+   $handle->push_read (line => sub {
+      $_[1] eq "hello"
+         or return $handle->error (Errno::EIO);
+   });
+=cut
-sub _error {
+sub error {
    my ($self, $errno, $fatal, $message) = @_;
    $! = $errno;
    $message ||= "$!";
             $self->{$activity} = $NOW;
             if ($self->{$on_timeout}) {
                $self->{$on_timeout}($self);
             } else {
-               $self->_error (Errno::ETIMEDOUT);
+               $self->error (Errno::ETIMEDOUT);
             }
             # callback could have changed timeout value, optimise
             return unless $self->{$timeout};
                if $self->{low_water_mark} >= (length $self->{wbuf}) + (length $self->{_tls_wbuf})
                   && $self->{on_drain};
             delete $self->{_ww} unless length $self->{wbuf};
          } elsif ($! != EAGAIN && $! != EINTR && $! != EWOULDBLOCK && $! != WSAEWOULDBLOCK) {
-            $self->_error ($!, 1);
+            $self->error ($!, 1);
          }
       };
       # try to write data immediately
       $cb->() unless $self->{autocork};
       if (
          defined $self->{wbuf_max}
          && $self->{wbuf_max} < length $self->{wbuf}
       ) {
-         $self->_error (Errno::ENOSPC, 1), return;
+         $self->error (Errno::ENOSPC, 1), return;
       }
    };
 }
 our %WH;
       if (my $cb = shift @{ $self->{_queue} }) {
          unless ($cb->($self)) {
             # no progress can be made
             # (not enough data and no data forthcoming)
-            $self->_error (Errno::EPIPE, 1), return
+            $self->error (Errno::EPIPE, 1), return
                if $self->{_eof};
             unshift @{ $self->{_queue} }, $cb;
             last;
          }
             && !@{ $self->{_queue} }     # and the queue is still empty
             && $self->{on_read}          # but we still have on_read
          ) {
             # no further data will arrive
             # so no progress can be made
-            $self->_error (Errno::EPIPE, 1), return
+            $self->error (Errno::EPIPE, 1), return
                if $self->{_eof};
             last; # more data might arrive
          }
       } else {
    }
    if ($self->{_eof}) {
       $self->{on_eof}
          ? $self->{on_eof}($self)
-         : $self->_error (0, 1, "Unexpected end-of-file");
+         : $self->error (0, 1, "Unexpected end-of-file");
       return;
    }
    if (
       defined $self->{rbuf_max}
       && $self->{rbuf_max} < length $self->{rbuf}
    ) {
-      $self->_error (Errno::ENOSPC, 1), return;
+      $self->error (Errno::ENOSPC, 1), return;
    }
    # may need to restart read watcher
    unless ($self->{_rw}) {
       $self->start_read
          return 1;
       }
       # reject
       if ($reject && $$rbuf =~ $reject) {
-         $_[0]->_error (Errno::EBADMSG);
+         $_[0]->error (Errno::EBADMSG);
       }
       # skip
       if ($skip && $$rbuf =~ $skip) {
          $data .= substr $$rbuf, 0, $+[0], "";
    my ($self, $cb) = @_;
    sub {
       unless ($_[0]{rbuf} =~ s/^(0|[1-9][0-9]*)://) {
          if ($_[0]{rbuf} =~ /[^0-9]/) {
-            $_[0]->_error (Errno::EBADMSG);
+            $_[0]->error (Errno::EBADMSG);
          }
          return;
       }
       my $len = $1;
          my $string = $_[1];
          $_[0]->unshift_read (chunk => 1, sub {
             if ($_[1] eq ",") {
                $cb->($_[0], $string);
             } else {
-               $_[0]->_error (Errno::EBADMSG);
+               $_[0]->error (Errno::EBADMSG);
             }
          });
       });
       1
          $json->incr_skip;
          $_[0]{rbuf} = $json->incr_text;
          $json->incr_text = "";
-         $_[0]->_error (Errno::EBADMSG);
+         $_[0]->error (Errno::EBADMSG);
          ()
       } else {
          $_[0]{rbuf} = "";
          1
       } elsif ($@) {
          # error case
          $cbor->incr_reset;
-         $_[0]->_error (Errno::EBADMSG);
+         $_[0]->error (Errno::EBADMSG);
          ()
       } else {
          ()
       }
       if ($format + $len <= length $_[0]{rbuf}) {
          my $data = substr $_[0]{rbuf}, $format, $len;
          substr $_[0]{rbuf}, 0, $format + $len, "";
          eval { $cb->($_[0], Storable::thaw ($data)); 1 }
-            or return $_[0]->_error (Errno::EBADMSG);
+            or return $_[0]->error (Errno::EBADMSG);
       } else {
          # remove prefix
          substr $_[0]{rbuf}, 0, $format, "";
          # read remaining chunk
          $_[0]->unshift_read (chunk => $len, sub {
             eval { $cb->($_[0], Storable::thaw ($_[1])); 1 }
-               or $_[0]->_error (Errno::EBADMSG);
+               or $_[0]->error (Errno::EBADMSG);
          });
       }
       1
    }
             delete $self->{_rw};
             $self->{_eof} = 1;
             $self->_drain_rbuf;
          } elsif ($! != EAGAIN && $! != EINTR && $! != EWOULDBLOCK && $! != WSAEWOULDBLOCK) {
-            return $self->_error ($!, 1);
+            return $self->error ($!, 1);
          }
       };
    }
 }
 our $ERROR_WANT_READ;
 sub _tls_error {
    my ($self, $err) = @_;
-   return $self->_error ($!, 1)
+   return $self->error ($!, 1)
       if $err == Net::SSLeay::ERROR_SYSCALL ();
    my $err = Net::SSLeay::ERR_error_string (Net::SSLeay::ERR_get_error ());
    # reduce error string to look less scary
    if ($self->{_on_starttls}) {
       (delete $self->{_on_starttls})->($self, undef, $err);
       &_freetls;
    } else {
       &_freetls;
-      $self->_error (Errno::EPROTO, 1, $err);
+      $self->error (Errno::EPROTO, 1, $err);
    }
 }
 # poll the write BIO and send the data if applicable
 # also decode read data if possible
    unless (defined $AnyEvent::TLS::VERSION) {
       eval {
          require Net::SSLeay;
          require AnyEvent::TLS;
          1
-      } or return $self->_error (Errno::EPROTO, 1, "TLS support not available on this system");
+      } or return $self->error (Errno::EPROTO, 1, "TLS support not available on this system");
    }
    $self->{tls}     = $tls;
    $self->{tls_ctx} = $ctx if @_ > 2;

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents): Revision 1.254 by root, Mon Feb 10 11:34:13 2020 UTC vs. Revision 1.255 by root, Wed Jul 29 13:02:48 2020 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents):
Revision 1.254 by root, Mon Feb 10 11:34:13 2020 UTC vs.
Revision 1.255 by root, Wed Jul 29 13:02:48 2020 UTC