Changeset a01ed7c for perl

Timestamp:

Oct 27, 2009, 2:15:08 PM (14 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

7ca5d3e

Parents:

e7f5970 (diff), f1a2736 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'io_dispatch_rewrite'

Location:

perl

Files:

• lib/BarnOwl.pm (modified) (3 diffs)
• modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (1 diff)
• modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)
• modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm (modified) (2 diffs)
• lib/BarnOwl/Complete/Client.pm (modified) (2 diffs)

perl/lib/BarnOwl.pm

@@ -13 +13 @@
                     error debug
                     create_style getnumcolors wordwrap
-                    add_dispath remove_dispatch
+                    add_dispatch remove_dispatch
+                    add_io_dispatch remove_io_dispatch
                     new_command
                     new_variable_int new_variable_bool new_variable_string
@@ -62 +63 @@
 Returns the current message as a C<BarnOwl::Message> subclass, or
 undef if there is no message selected
-
 =head2 getnumcols
 
@@ -160 +160 @@
 read from C<FD>.
 
+C<add_dispatch> has been deprecated in favor of C<add_io_dispatch>,
+and is now a wrapper for it called with C<mode> set to C<'r'>.
+
+=cut
+
+sub add_dispatch {
+    my $fd = shift;
+    my $cb = shift;
+    add_io_dispatch($fd, 'r', $cb);
+}
+
 =head2 remove_dispatch FD
 
 Remove a file descriptor previously registered via C<add_dispatch>
+
+C<remove_dispatch> has been deprecated in favor of
+C<remove_io_dispatch>.
+
+=cut
+
+*remove_dispatch = \&remove_io_dispatch;
+
+=head2 add_io_dispatch FD MODE CB
+
+Adds a file descriptor to C<BarnOwl>'s internal C<select()>
+loop. <MODE> can be 'r', 'w', or 'rw'. C<CALLBACK> will be invoked
+whenever C<FD> becomes ready, as specified by <MODE>.
+
+Only one callback can be registered per FD. If a new callback is
+registered, the old one is removed.
+
+=cut
+
+sub add_io_dispatch {
+    my $fd = shift;
+    my $modeStr = shift;
+    my $cb = shift;
+    my $mode = 0;
+
+    $mode |= 0x1 if ($modeStr =~ /r/i); # Read
+    $mode |= 0x2 if ($modeStr =~ /w/i); # Write
+    if ($mode) {
+        $mode |= 0x4;                  # Exceptional
+        BarnOwl::Internal::add_io_dispatch($fd, $mode, $cb);
+    } else {
+        die("Invalid I/O Dispatch mode: $modeStr");
+    }
+}
+
+=head2 remove_io_dispatch FD
+
+Remove a file descriptor previously registered via C<add_io_dispatch>
 
 =head2 create_style NAME OBJECT

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -381 +381 @@
         $ircnets{$alias} = $conn;
         my $fd = $conn->getSocket()->fileno();
-        BarnOwl::add_dispatch($fd, \&OwlProcess);
+        BarnOwl::add_io_dispatch($fd, 'r', \&OwlProcess);
         $conn->{FD} = $fd;
     } else {

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

@@ -210 +210 @@
         }
     }
-    BarnOwl::remove_dispatch($self->{FD});
+    BarnOwl::remove_io_dispatch($self->{FD});
     BarnOwl::admin_message('IRC',
                            "[" . $self->alias . "] Disconnected from server");

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -471 +471 @@
                 $conn->renameConnection($jidStr, $fullJid);
                 queue_admin_msg("Connected to jabber as $fullJid");
-                # The remove_dispatch() method is called from the
+                # The remove_io_dispatch() method is called from the
                 # ConnectionManager's removeConnection() method.
                 $client->{fileno} = $client->getSocket()->fileno();
                 #queue_admin_msg("Connected to jabber as $fullJid ($client->{fileno})");
-                BarnOwl::add_dispatch($client->{fileno}, sub { $client->OwlProcess($fullJid) });
+                BarnOwl::add_io_dispatch($client->{fileno}, 'r', sub { $client->OwlProcess($fullJid) });
 
                 # populate completion from roster.

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm

@@ -37 +37 @@
     return 0 unless exists $self->{$jidStr};
 
-    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
+    BarnOwl::remove_io_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
     $self->{$jidStr}->{Client}->Disconnect()
       if $self->{$jidStr}->{Client};
@@ -55 +55 @@
     }
 
-    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
+    BarnOwl::remove_io_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
     $self->{$jidStr}->{Client}->Disconnect()
       if $self->{$jidStr}->{Client};

perl/lib/BarnOwl/Complete/Client.pm

@@ -24 +24 @@
     commands    => undef,
     command     => \&complete_command,
+    errors      => undef,
     filters     => undef,
     filter      => \&complete_filter_name,
     license     => undef,
+    keymaps     => undef,
+    keymap      => \&complete_keymap,
     quickstart  => undef,
     startup     => undef,
@@ -45 +48 @@
 sub complete_variable    { return @{BarnOwl::all_variables()}; }
 sub complete_style       { return @{BarnOwl::all_styles()}; }
+sub complete_keymap      { return @{BarnOwl::all_keymaps()}; }
 
 sub complete_help {