ds: remove fields.pm usage

[public-inbox.git] / lib / PublicInbox / InboxIdle.pm

diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm
index 97e9d53250eb43285ae7eba56c3f4ae79d898d8e..59cb833fd5a10b466ae74ac8a65d91df3987ffa6 100644 (file)
--- a/lib/PublicInbox/InboxIdle.pm
+++ b/lib/PublicInbox/InboxIdle.pm
@@ -1,12 +1,14 @@
 # Copyright (C) 2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
+# fields:
+# pi_config: PublicInbox::Config ref
+# inot: Linux::Inotify2-like object
+# pathmap => { inboxdir => [ ibx, watch1, watch2, watch3... ] } mapping
 package PublicInbox::InboxIdle;
 use strict;
-use base qw(PublicInbox::DS);
-use fields qw(pi_config inot pathmap);
+use parent qw(PublicInbox::DS);
 use Cwd qw(abs_path);
-use Symbol qw(gensym);
 use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
 my $IN_MODIFY = 0x02; # match Linux inotify
 my $ino_cls;
@@ -51,18 +53,12 @@ sub refresh {
 
 sub new {
        my ($class, $pi_config) = @_;
-       my $self = fields::new($class);
+       my $self = bless {}, $class;
        my $inot;
        if ($ino_cls) {
                $inot = $ino_cls->new or die "E: $ino_cls->new: $!";
-               my $sock = gensym;
-               tie *$sock, 'PublicInbox::In2Tie', $inot;
-               $inot->blocking(0);
-               if ($inot->can('on_overflow')) {
-                        # broadcasts everything on overflow
-                       $inot->on_overflow(undef);
-               }
-               $self->SUPER::new($sock, EPOLLIN | EPOLLET);
+               my $io = PublicInbox::In2Tie::io($inot);
+               $self->SUPER::new($io, EPOLLIN | EPOLLET);
        } else {
                require PublicInbox::FakeInotify;
                $inot = PublicInbox::FakeInotify->new;