From c3756b2ef7af9a2f0385f1069c228ccea334ada6 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sun, 1 May 2016 10:14:28 +0000
Subject: daemon: reduce timer-related allocations

We can reduce the allocation and overhead needed for
Danga::Socket timers for immediately-executed responses by
combining identical timers and reducing anonymous sub creation.
---
 lib/PublicInbox/HTTP.pm | 12 +++++++++++-
 lib/PublicInbox/NNTP.pm | 30 ++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 414fc733..88b6fb81 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -223,6 +223,15 @@ sub more ($$) {
 	$self->write($_[1]);
 }
 
+my $pipelineq = [];
+my $next_tick;
+sub process_pipelineq () {
+	$next_tick = undef;
+	my $q = $pipelineq;
+	$pipelineq = [];
+	rbuf_process($_) foreach @$q;
+}
+
 # overrides existing Danga::Socket method
 sub event_write {
 	my ($self) = @_;
@@ -232,7 +241,8 @@ sub event_write {
 	if ($self->{rbuf} eq '') { # wait for next request
 		$self->watch_read(1);
 	} else { # avoid recursion for pipelined requests
-		Danga::Socket->AddTimer(0, sub { rbuf_process($self) });
+		push @$pipelineq, $self;
+		$next_tick ||= Danga::Socket->AddTimer(0, *process_pipelineq);
 	}
 }
 
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index e143d15c..a4cf25e2 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -41,6 +41,23 @@ our $EXPTIME = 180; # 3 minutes
 my $WEAKEN = {}; # string(nntpd) -> nntpd
 my $WEAKTIMER;
 
+my $next_tick;
+my $nextq = [];
+sub next_tick () {
+	$next_tick = undef;
+	my $q = $nextq;
+	$nextq = [];
+	foreach my $nntp (@$q) {
+		# for request && response protocols, always finish writing
+		# before finishing reading:
+		if (my $long_cb = $nntp->{long_res}) {
+			$nntp->write($long_cb);
+		} elsif (&Danga::Socket::POLLIN & $nntp->{event_watch}) {
+			event_read($nntp);
+		}
+	}
+}
+
 sub update_idle_time ($) {
 	my ($self) = @_;
 	my $tmp = $self->{sock} or return;
@@ -591,9 +608,9 @@ sub long_response ($$$$) {
 			# no recursion, schedule another call ASAP
 			# but only after all pending writes are done
 			update_idle_time($self);
-			Danga::Socket->AddTimer(0, sub {
-				$self->write($self->{long_res});
-			});
+
+			push @$nextq, $self;
+			$next_tick ||= Danga::Socket->AddTimer(0, *next_tick);
 		} else { # all done!
 			$self->{long_res} = undef;
 			$self->watch_read(1);
@@ -952,11 +969,8 @@ sub watch_read {
 		# and we must double-check again by the time the timer fires
 		# in case we really did dispatch a read event and started
 		# another long response.
-		Danga::Socket->AddTimer(0, sub {
-			if (&Danga::Socket::POLLIN & $self->{event_watch}) {
-				event_read($self);
-			}
-		});
+		push @$nextq, $self;
+		$next_tick ||= Danga::Socket->AddTimer(0, *next_tick);
 	}
 	$rv;
 }
-- 
cgit v1.2.3-24-ge0c7