Changeset ffc4df61a846d99a75783f7d348fb98dd19910aa

Timestamp:

10/27/09 00:41:17 (4 weeks ago)

Author:

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

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> / 2009-10-24T14:56:01Z-0400

Parents:

df0138f05e0bae986f09d167195c6ce676bac37d

Children:

18fdd5f9be6de827a19aceb95d4769058b145869

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> / 2009-10-27T00:41:17Z-0400

Message:

Switch perl API to new I/O Dispatch API.

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

Files:

• perl/lib/BarnOwl.pm (modified) (3 diffs)
• perlconfig.c (modified) (2 diffs)
• perlglue.xs (modified) (2 diffs)
• select.c (modified) (1 diff)

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

perlconfig.c

@@ -504 +504 @@
 }
 
-void owl_perlconfig_dispatch_free(owl_dispatch *d)
-{
-  SvREFCNT_dec(d->data);
-  owl_free(d);
-}
-
 void owl_perlconfig_io_dispatch_destroy(const owl_io_dispatch *d)
 {
@@ -560 +554 @@
 }
 
-void owl_perlconfig_dispatch(owl_dispatch *d)
-{
-  SV *cb = d->data;
-  dSP;
-  if(cb == NULL) {
-    owl_function_error("Perl callback is NULL!");
-    return;
-  }
-
-  ENTER;
-  SAVETMPS;
-
-  PUSHMARK(SP);
-  PUTBACK;
-  
-  call_sv(cb, G_DISCARD|G_KEEPERR|G_EVAL);
-
-  if(SvTRUE(ERRSV)) {
-    owl_function_error("%s", SvPV_nolen(ERRSV));
-  }
-
-  FREETMPS;
-  LEAVE;
-}
-
 void owl_perlconfig_io_dispatch(const owl_io_dispatch *d, void *data)
 {

perlglue.xs

@@ -318 +318 @@
 
 void
-add_dispatch(fd, cb)
+remove_io_dispatch(fd)
         int fd
-        SV * cb
-        CODE:
-        owl_select_add_perl_dispatch(fd, SvREFCNT_inc(cb));
-
-void
-remove_dispatch(fd)
-        int fd
-        CODE:
-        owl_select_remove_perl_dispatch(fd);
-
+        CODE:
+        owl_select_remove_perl_io_dispatch(fd);
 
 AV*
@@ -509 +501 @@
                                       ival);
 
+void
+add_io_dispatch(fd, mode, cb)
+        int fd
+        int mode
+        SV * cb
+        CODE:
+        owl_select_add_perl_io_dispatch(fd, mode, SvREFCNT_inc(cb));
+
 IV
 add_timer(after, interval, cb)

select.c

@@ -156 +156 @@
 {
   return owl_list_get_size(owl_global_get_dispatchlist(&g));
-}
-
-int owl_select_add_perl_dispatch(int fd, SV *cb)
-{
-  int elt;
-  owl_dispatch *d;
-  elt = owl_select_find_dispatch(fd);
-  if (elt != -1) {
-    d = owl_list_get_element(owl_global_get_dispatchlist(&g), elt);
-    if (d->cfunc != owl_perlconfig_dispatch) {
-      /* don't mess with non-perl dispatch functions from here. */
-      return 1;
-    }
-  }
-
-  d = owl_malloc(sizeof(owl_dispatch));
-  d->fd = fd;
-  d->cfunc = owl_perlconfig_dispatch;
-  d->destroy = owl_perlconfig_dispatch_free;
-  d->data = cb;
-  owl_select_add_dispatch(d);
-  return 0;
-}
-
-int owl_select_remove_perl_dispatch(int fd)
-{
-  int elt;
-  owl_dispatch *d;
-  
-  elt = owl_select_find_dispatch(fd);
-  if (elt != -1) {
-    d = owl_list_get_element(owl_global_get_dispatchlist(&g), elt);
-    if (d->cfunc == owl_perlconfig_dispatch) {
-      owl_select_remove_dispatch_at(elt);
-      return 0;
-    }
-  }
-  return 1;
 }