diff options
| -rw-r--r-- | lib/PublicInbox/DS.pm | 24 | ||||
| -rw-r--r-- | t/dir_idle.t | 2 | ||||
| -rw-r--r-- | t/ds-leak.t | 4 | ||||
| -rw-r--r-- | xt/mem-imapd-tls.t | 8 | ||||
| -rw-r--r-- | xt/mem-nntpd-tls.t | 8 |
5 files changed, 18 insertions, 28 deletions
diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 9960937d..6041c6b5 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -47,7 +47,7 @@ our (%AWAIT_PIDS, # pid => [ $callback, @args ] @post_loop_do, # subref + args to call at the end of each loop - $LoopTimeout, # timeout of event loop in milliseconds + $loop_timeout, # timeout of event loop in milliseconds @Timers, # timers %UniqTimer, $in_loop, @@ -89,20 +89,10 @@ sub Reset { scalar(@{$cur_runq // []})); # do not vivify cur_runq $reap_armed = undef; - $LoopTimeout = -1; # no timeout by default + $loop_timeout = -1; # no timeout by default $Poller = PublicInbox::Select->new; } -=head2 C<< CLASS->SetLoopTimeout( $timeout ) >> - -Set the loop timeout for the event loop to some value in milliseconds. - -A timeout of 0 (zero) means poll forever. A timeout of -1 means poll and return -immediately. - -=cut -sub SetLoopTimeout { $LoopTimeout = $_[1] + 0 } - sub _add_named_timer { my ($name, $secs, $coderef, @args) = @_; my $fire_time = now() + $secs; @@ -163,7 +153,7 @@ sub next_tick () { sub RunTimers { next_tick(); - return (($nextq || $ToClose) ? 0 : $LoopTimeout) unless @Timers; + return (($nextq || $ToClose) ? 0 : $loop_timeout) unless @Timers; my $now = now(); @@ -177,16 +167,16 @@ sub RunTimers { # timers may enqueue into nextq: return 0 if ($nextq || $ToClose); - return $LoopTimeout unless @Timers; + return $loop_timeout unless @Timers; # convert time to an even number of milliseconds, adding 1 # extra, otherwise floating point fun can occur and we'll # call RunTimers like 20-30 times, each returning a timeout # of 0.0000212 seconds - my $timeout = int(($Timers[0][0] - $now) * 1000) + 1; + my $t = int(($Timers[0][0] - $now) * 1000) + 1; # -1 is an infinite timeout, so prefer a real timeout - ($LoopTimeout < 0 || $LoopTimeout >= $timeout) ? $timeout : $LoopTimeout + ($loop_timeout < 0 || $loop_timeout >= $t) ? $t : $loop_timeout } sub sig_setmask { sigprocmask(SIG_SETMASK, @_) or die "sigprocmask: $!" } @@ -305,7 +295,7 @@ sub event_loop (;$$) { sig_setmask($oldset) if $oldset; sigprocmask(SIG_UNBLOCK, unblockset($sig)) or die "SIG_UNBLOCK: $!"; - PublicInbox::DS->SetLoopTimeout(1000); + $loop_timeout = 1000; } $_[0] = $sigfd = $sig = undef; # $_[0] == sig local $in_loop = 1; diff --git a/t/dir_idle.t b/t/dir_idle.t index 02759b54..35c800f9 100644 --- a/t/dir_idle.t +++ b/t/dir_idle.t @@ -11,7 +11,7 @@ my @x; my $cb = sub { push @x, \@_ }; my $di = PublicInbox::DirIdle->new($cb); $di->add_watches(["$tmpdir/a", "$tmpdir/c"], 1); -PublicInbox::DS->SetLoopTimeout(1000); +$PublicInbox::DS::loop_timeout = 1000; my $end = 3 + now; local @PublicInbox::DS::post_loop_do = (sub { scalar(@x) == 0 && now < $end }); rmdir("$tmpdir/a/b") or xbail "rmdir $!"; diff --git a/t/ds-leak.t b/t/ds-leak.t index eaca05b8..179997eb 100644 --- a/t/ds-leak.t +++ b/t/ds-leak.t @@ -11,7 +11,7 @@ if ('close-on-exec for epoll and kqueue') { my $pid; my $evfd_re = qr/(?:kqueue|eventpoll)/i; - PublicInbox::DS->SetLoopTimeout(0); + $PublicInbox::DS::loop_timeout = 0; local @PublicInbox::DS::post_loop_do = (sub { 0 }); # make sure execve closes if we're using fork() @@ -54,7 +54,7 @@ SKIP: { } my $cb = sub {}; for my $i (0..$n) { - PublicInbox::DS->SetLoopTimeout(0); + $PublicInbox::DS::loop_timeout = 0; local @PublicInbox::DS::post_loop_do = ($cb); PublicInbox::DS::event_loop(); PublicInbox::DS->Reset; diff --git a/xt/mem-imapd-tls.t b/xt/mem-imapd-tls.t index 00199a9b..58581017 100644 --- a/xt/mem-imapd-tls.t +++ b/xt/mem-imapd-tls.t @@ -81,7 +81,7 @@ sub once { 0 }; # stops event loop # setup the event loop so that it exits at every step # while we're still doing connect(2) -PublicInbox::DS->SetLoopTimeout(0); +$PublicInbox::DS::loop_timeout = 0; local @PublicInbox::DS::post_loop_do = (\&once); my $pid = $td->{pid}; if ($^O eq 'linux' && open(my $f, '<', "/proc/$pid/status")) { @@ -100,21 +100,21 @@ foreach my $n (1..$nfd) { # try not to overflow the listen() backlog: if (!($n % 128) && $DONE != $n) { diag("nr: ($n) $DONE/$nfd"); - PublicInbox::DS->SetLoopTimeout(-1); + $PublicInbox::DS::loop_timeout = -1; local @PublicInbox::DS::post_loop_do = (sub { $DONE != $n }); # clear the backlog: PublicInbox::DS::event_loop(); # resume looping - PublicInbox::DS->SetLoopTimeout(0); + $PublicInbox::DS::loop_timeout = 0; } } # run the event loop normally, now: diag "done?: @".time." $DONE/$nfd"; if ($DONE != $nfd) { - PublicInbox::DS->SetLoopTimeout(-1); + $PublicInbox::DS::loop_timeout = -1; local @PublicInbox::DS::post_loop_do = (sub { $DONE != $nfd }); PublicInbox::DS::event_loop(); } diff --git a/xt/mem-nntpd-tls.t b/xt/mem-nntpd-tls.t index f9b98a6b..ec639a8b 100644 --- a/xt/mem-nntpd-tls.t +++ b/xt/mem-nntpd-tls.t @@ -104,7 +104,7 @@ sub once { 0 }; # stops event loop # setup the event loop so that it exits at every step # while we're still doing connect(2) -PublicInbox::DS->SetLoopTimeout(0); +$PublicInbox::DS::loop_timeout = 0; local @PublicInbox::DS::post_loop_do = (\&once); foreach my $n (1..$nfd) { @@ -119,14 +119,14 @@ foreach my $n (1..$nfd) { # try not to overflow the listen() backlog: if (!($n % 128) && $n != $DONE) { diag("nr: ($n) $DONE/$nfd"); - PublicInbox::DS->SetLoopTimeout(-1); + $PublicInbox::DS::loop_timeout = -1; @PublicInbox::DS::post_loop_do = (sub { $DONE != $n }); # clear the backlog: PublicInbox::DS::event_loop(); # resume looping - PublicInbox::DS->SetLoopTimeout(0); + $PublicInbox::DS::loop_timeout = 0; @PublicInbox::DS::post_loop_do = (\&once); } } @@ -140,7 +140,7 @@ $dump_rss->(); # run the event loop normally, now: if ($DONE != $nfd) { - PublicInbox::DS->SetLoopTimeout(-1); + $PublicInbox::DS::loop_timeout = -1; @PublicInbox::DS::post_loop_do = (sub { diag "done: ".time." $DONE"; $DONE != $nfd; |