* [PATCH 07/11] ds: rely on autovivification for nextq
2020-01-12 21:17 7% [PATCH 00/11] ds: various cleanups and fixes Eric Wong
@ 2020-01-12 21:17 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-12 21:17 UTC (permalink / raw)
To: meta
Another place we can delay creating arrays until needed.
---
lib/PublicInbox/DS.pm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index 7a4aa7cc..ac9065f2 100644
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -71,11 +71,10 @@ Reset all state
=cut
sub Reset {
%DescriptorMap = ();
- $nextq = [];
$WaitPids = [];
$later_queue = [];
$EXPMAP = {};
- $ToClose = $reap_timer = $later_timer = $exp_timer = undef;
+ $nextq = $ToClose = $reap_timer = $later_timer = $exp_timer = undef;
$LoopTimeout = -1; # no timeout by default
@Timers = ();
@@ -179,8 +178,8 @@ sub FirstTimeEventLoop {
sub now () { clock_gettime(CLOCK_MONOTONIC) }
sub next_tick () {
- my $q = $nextq;
- $nextq = [];
+ my $q = $nextq or return;
+ $nextq = undef;
for (@$q) {
# we avoid "ref" on blessed refs to workaround a Perl 5.16.3 leak:
# https://rt.perl.org/Public/Bug/Display.html?id=114340
@@ -196,7 +195,7 @@ sub next_tick () {
sub RunTimers {
next_tick();
- return ((@$nextq || $ToClose) ? 0 : $LoopTimeout) unless @Timers;
+ return (($nextq || $ToClose) ? 0 : $LoopTimeout) unless @Timers;
my $now = now();
@@ -207,7 +206,7 @@ sub RunTimers {
}
# timers may enqueue into nextq:
- return 0 if (@$nextq || $ToClose);
+ return 0 if ($nextq || $ToClose);
return $LoopTimeout unless @Timers;
@@ -249,7 +248,7 @@ sub reap_pids {
}
# reentrant SIGCHLD handler (since reap_pids is not reentrant)
-sub enqueue_reap ($) { push @$nextq, \&reap_pids };
+sub enqueue_reap ($) { push @$nextq, \&reap_pids }; # autovivifies
sub in_loop () { $in_loop }
@@ -353,7 +352,7 @@ sub new {
### I N S T A N C E M E T H O D S
#####################################################################
-sub requeue ($) { push @$nextq, $_[0] }
+sub requeue ($) { push @$nextq, $_[0] } # autovivifies
=head2 C<< $obj->close >>
^ permalink raw reply related [relevance 6%]
* [PATCH 00/11] ds: various cleanups and fixes
@ 2020-01-12 21:17 7% Eric Wong
2020-01-12 21:17 6% ` [PATCH 07/11] ds: rely on autovivification for nextq Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-12 21:17 UTC (permalink / raw)
To: meta
Start taking advantage of autovivification to simplify our code
and reduce allocations. Also, I believe it's my first time
using the return value of "push".
Eric Wong (11):
ds: new: avoid redundant check, make clobbering fatal
ds: add_timer: rename from AddTimer, remove a parameter
ds: add an in_loop() function for Inbox.pm use
ds: remove Timer->cancel and Timer class+bless
ds: PostEventLoop: guard ToClose against DESTROY side-effects
ds|http|nntp: simplify {wbuf} population
ds: rely on autovivification for nextq
ds: rely on autovivication for waitpid bits
ds: rely on autovivification for $later_queue
ds: flatten $EXPMAP, delete entries on close
sigfd: simplify loop and improve documentation
lib/PublicInbox/DS.pm | 200 +++++++++++++++++----------------------
lib/PublicInbox/HTTP.pm | 6 +-
lib/PublicInbox/Inbox.pm | 2 +-
lib/PublicInbox/NNTP.pm | 11 +--
lib/PublicInbox/Sigfd.pm | 13 +--
t/ds-leak.t | 2 +-
6 files changed, 105 insertions(+), 129 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-12 21:17 7% [PATCH 00/11] ds: various cleanups and fixes Eric Wong
2020-01-12 21:17 6% ` [PATCH 07/11] ds: rely on autovivification for nextq Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).