Keeping track of write_buf_size was redundant and pointless when
we can simply check the number of elements in the buffer array.
Multiple sources of truth leads to confusion; confusion leads to
bugs.
Finally, rename the prefixes to 'wbuf' to ensure we loudly
(instead of silently) break any external dependencies being
ported over from Danga::Socket, as further changes are pending.
use fields ('sock', # underlying socket
'fd', # numeric file descriptor
use fields ('sock', # underlying socket
'fd', # numeric file descriptor
- 'write_buf', # arrayref of scalars, scalarrefs, or coderefs to write
- 'write_buf_offset', # offset into first array of write_buf to start writing at
- 'write_buf_size', # total length of data in all write_buf items
+ 'wbuf', # arrayref of scalars, scalarrefs, or coderefs to write
+ 'wbuf_off', # offset into first element of wbuf to start writing at
'closed', # bool: socket is closed
'event_watch', # bitmask of events the client is interested in (POLLIN,OUT,etc.)
);
'closed', # bool: socket is closed
'event_watch', # bitmask of events the client is interested in (POLLIN,OUT,etc.)
);
unless $sock && $fd;
$self->{fd} = $fd;
unless $sock && $fd;
$self->{fd} = $fd;
- $self->{write_buf} = [];
- $self->{write_buf_offset} = 0;
- $self->{write_buf_size} = 0;
+ $self->{wbuf} = [];
+ $self->{wbuf_off} = 0;
$self->{closed} = 0;
my $ev = $self->{event_watch} = POLLERR|POLLHUP|POLLNVAL;
$self->{closed} = 0;
my $ev = $self->{event_watch} = POLLERR|POLLHUP|POLLNVAL;
# we need to flush our write buffer, as there may
# be self-referential closures (sub { $client->close })
# preventing the object from being destroyed
# we need to flush our write buffer, as there may
# be self-referential closures (sub { $client->close })
# preventing the object from being destroyed
- $self->{write_buf} = [];
# if we're using epoll, we have to remove this from our epoll fd so we stop getting
# notifications about it
# if we're using epoll, we have to remove this from our epoll fd so we stop getting
# notifications about it
# just queue data if there's already a wait
my $need_queue;
# just queue data if there's already a wait
my $need_queue;
+ my $wbuf = $self->{wbuf};
if (defined $data) {
$bref = ref $data ? $data : \$data;
if (defined $data) {
$bref = ref $data ? $data : \$data;
- if ($self->{write_buf_size}) {
- push @{$self->{write_buf}}, $bref;
- $self->{write_buf_size} += ref $bref eq "SCALAR" ? length($$bref) : 1;
+ if (scalar @$wbuf) {
+ push @$wbuf, $bref;
- return 1 unless $bref ||= $self->{write_buf}[0];
+ return 1 unless $bref ||= $wbuf->[0];
if ($@) {
if (UNIVERSAL::isa($bref, "CODE")) {
unless ($need_queue) {
if ($@) {
if (UNIVERSAL::isa($bref, "CODE")) {
unless ($need_queue) {
- $self->{write_buf_size}--; # code refs are worth 1
- shift @{$self->{write_buf}};
die "Write error: $@ <$bref>";
}
die "Write error: $@ <$bref>";
}
- my $to_write = $len - $self->{write_buf_offset};
+ my $to_write = $len - $self->{wbuf_off};
my $written = syswrite($self->{sock}, $$bref, $to_write,
my $written = syswrite($self->{sock}, $$bref, $to_write,
- $self->{write_buf_offset});
if (! defined $written) {
if ($! == EPIPE) {
if (! defined $written) {
if ($! == EPIPE) {
# since connection has stuff to write, it should now be
# interested in pending writes:
if ($need_queue) {
# since connection has stuff to write, it should now be
# interested in pending writes:
if ($need_queue) {
- push @{$self->{write_buf}}, $bref;
- $self->{write_buf_size} += $len;
}
$self->watch_write(1);
return 0;
}
$self->watch_write(1);
return 0;
DebugLevel >= 2 && $self->debugmsg("Wrote PARTIAL %d bytes to %d",
$written, $self->{fd});
if ($need_queue) {
DebugLevel >= 2 && $self->debugmsg("Wrote PARTIAL %d bytes to %d",
$written, $self->{fd});
if ($need_queue) {
- push @{$self->{write_buf}}, $bref;
- $self->{write_buf_size} += $len;
}
# since connection has stuff to write, it should now be
# interested in pending writes:
}
# since connection has stuff to write, it should now be
# interested in pending writes:
- $self->{write_buf_offset} += $written;
- $self->{write_buf_size} -= $written;
+ $self->{wbuf_off} += $written;
$self->on_incomplete_write;
return 0;
} elsif ($written == $to_write) {
DebugLevel >= 2 && $self->debugmsg("Wrote ALL %d bytes to %d (nq=%d)",
$written, $self->{fd}, $need_queue);
$self->on_incomplete_write;
return 0;
} elsif ($written == $to_write) {
DebugLevel >= 2 && $self->debugmsg("Wrote ALL %d bytes to %d (nq=%d)",
$written, $self->{fd}, $need_queue);
- $self->{write_buf_offset} = 0;
$self->watch_write(0);
# this was our only write, so we can return immediately
$self->watch_write(0);
# this was our only write, so we can return immediately
# can't be anything else to write.
return 1 if $need_queue;
# can't be anything else to write.
return 1 if $need_queue;
- $self->{write_buf_size} -= $written;
- shift @{$self->{write_buf}};
undef $bref;
next WRITE;
}
undef $bref;
next WRITE;
}
$write->($buf); # may close in PublicInbox::DS::write
unless ($self->{closed}) {
my $next = $self->{pull};
$write->($buf); # may close in PublicInbox::DS::write
unless ($self->{closed}) {
my $next = $self->{pull};
- if ($self->{write_buf_size}) {
+ if (scalar @{$self->{wbuf}}) {
$self->write($next);
} else {
PublicInbox::EvCleanup::asap($next);
$self->write($next);
} else {
PublicInbox::EvCleanup::asap($next);
sub more ($$) {
my $self = $_[0];
return if $self->{closed};
sub more ($$) {
my $self = $_[0];
return if $self->{closed};
- if (MSG_MORE && !$self->{write_buf_size}) {
+ if (MSG_MORE && !scalar(@{$self->{wbuf}})) {
my $n = send($self->{sock}, $_[1], MSG_MORE);
if (defined $n) {
my $nlen = length($_[1]) - $n;
my $n = send($self->{sock}, $_[1], MSG_MORE);
if (defined $n) {
my $nlen = length($_[1]) - $n;
# for graceful shutdown in PublicInbox::Daemon:
sub busy () {
my ($self) = @_;
# for graceful shutdown in PublicInbox::Daemon:
sub busy () {
my ($self) = @_;
- ($self->{rbuf} ne '' || $self->{env} || $self->{write_buf_size});
+ ($self->{rbuf} ne '' || $self->{env} || scalar(@{$self->{wbuf}}));
if ($r) {
$fh->write($$bref);
unless ($http->{closed}) { # PublicInbox::DS sets this
if ($r) {
$fh->write($$bref);
unless ($http->{closed}) { # PublicInbox::DS sets this
- if ($http->{write_buf_size}) {
+ if (scalar @{$http->{wbuf}}) {
$self->watch_read(0);
$http->write(restart_read_cb($self));
}
$self->watch_read(0);
$http->write(restart_read_cb($self));
}
update_idle_time($self);
check_read($self);
}
update_idle_time($self);
check_read($self);
}
- } elsif ($more) { # $self->{write_buf_size}:
+ } elsif ($more) { # scalar @{$self->{wbuf}}:
# no recursion, schedule another call ASAP
# but only after all pending writes are done
update_idle_time($self);
# no recursion, schedule another call ASAP
# but only after all pending writes are done
update_idle_time($self);
sub do_more ($$) {
my ($self, $data) = @_;
sub do_more ($$) {
my ($self, $data) = @_;
- if (MSG_MORE && !$self->{write_buf_size}) {
+ if (MSG_MORE && !scalar(@{$self->{wbuf}})) {
my $n = send($self->{sock}, $data, MSG_MORE);
if (defined $n) {
my $dlen = length($data);
my $n = send($self->{sock}, $data, MSG_MORE);
if (defined $n) {
my $dlen = length($data);
# for graceful shutdown in PublicInbox::Daemon:
sub busy {
my ($self, $now) = @_;
# for graceful shutdown in PublicInbox::Daemon:
sub busy {
my ($self, $now) = @_;
- ($self->{rbuf} ne '' || $self->{long_res} || $self->{write_buf_size} ||
- not_idle_long($self, $now));
+ ($self->{rbuf} ne '' || $self->{long_res} ||
+ scalar(@{$self->{wbuf}}) || not_idle_long($self, $now));