Changeset f1a2736

Timestamp:

Oct 27, 2009, 12:41:17 AM (15 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:

050d25e

Parents:

6fc40a7

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (10/24/09 20:58:04)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (10/27/09 00:41:17)

Message:

Switch perl modules to the new I/O Dispatch API.

Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>

Location:

perl/modules

Files:

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

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};