Changeset 9c7a701

Timestamp:

Feb 15, 2008, 12:56:49 AM (17 years ago)

Author:

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

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

18a54ee

Parents:

a6a4155

Message:

Initial select() changes.
stdin, zephyr, jabber, and irc are checked and have dispatch functions.
aim is hacked in -- not entirely pretty, but documented and isolated.
We still want timers.

Files:

• Makefile.in (modified) (1 diff)
• global.c (modified) (2 diffs)
• owl.c (modified) (9 diffs)
• owl.h (modified) (2 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (4 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm (modified) (2 diffs)
• perlconfig.c (modified) (2 diffs)
• perlglue.xs (modified) (1 diff)
• select.c (added)
• zephyr.c (modified) (1 diff)

Makefile.in

@@ -26 +26 @@
      keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c \
      aim.c buddy.c buddylist.c timer.c style.c stylefunc.c errqueue.c \
-     zbuddylist.c muxevents.c popexec.c obarray.c
+     zbuddylist.c muxevents.c popexec.c obarray.c select.c
 OWL_SRC = owl.c
 TESTER_SRC = tester.c

global.c

@@ -117 +117 @@
 
   owl_message_init_fmtext_cache();
+  owl_list_create(&(g->dispatchlist));
 }
 
@@ -932 +933 @@
   return owl_obarray_insert(&(g->obarray), string);
 }
+
+owl_list *owl_global_get_dispatchlist(owl_global *g)
+{
+  return &(g->dispatchlist);
+}

owl.c

@@ -46 +46 @@
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <termios.h>
 #include <sys/stat.h>
@@ -60 +61 @@
 #endif
 
+#define STDIN 0
+
 static const char fileIdent[] = "$Id$";
 
@@ -69 +72 @@
   owl_editwin *tw;
   owl_popwin *pw;
-  int j, ret, initialsubs, debug, argcsave, followlast;
+  int ret, initialsubs, debug, argcsave, followlast;
   int newmsgs, nexttimediff;
   struct sigaction sigact;
@@ -206 +209 @@
   owl_global_set_haveaim(&g);
 
+  /* prepare stdin dispatch */
+  {
+    owl_dispatch *d = owl_malloc(sizeof(owl_dispatch));
+    d->fd = STDIN;
+    d->cfunc = &owl_process_input;
+    d->pfunc = NULL;
+    owl_select_add_dispatch(d);
+  }
+  
 #ifdef HAVE_LIBZEPHYR
   /* zephyr init */
   ret=owl_zephyr_initialize();
-  if (!ret)
-      owl_global_set_havezephyr(&g);
+  if (!ret) {
+    owl_dispatch *d = owl_malloc(sizeof(owl_dispatch));
+    d->fd = ZGetFD();
+    d->cfunc = &owl_zephyr_process_events;
+    d->pfunc = NULL;
+    owl_select_add_dispatch(d);
+    owl_global_set_havezephyr(&g);
+  }
+
 #endif
 
@@ -425 +444 @@
     followlast=owl_global_should_followlast(&g);
     
-    /* Do AIM stuff */
-    if (owl_global_is_doaimevents(&g)) {
-      owl_aim_process_events();
-
-      if (owl_global_is_aimloggedin(&g)) {
-        if (owl_timer_is_expired(owl_global_get_aim_buddyinfo_timer(&g))) {
-          /* owl_buddylist_request_idletimes(owl_global_get_buddylist(&g)); */
-          owl_timer_reset(owl_global_get_aim_buddyinfo_timer(&g));
-        }
-      }
-    }
-
     owl_perlconfig_mainloop();
 
@@ -454 +461 @@
     }
 
-    owl_zephyr_process_events();
-    
     /* Grab incoming messages. */
     newmsgs=0;
@@ -530 +535 @@
      * little bit, but otherwise do not.  This lets input be grabbed
      * as quickly as possbile */
-    j=wgetch(typwin);
-    if (j==ERR) {
-      usleep(10000);
-    } else {
-      owl_global_set_lastinputtime(&g, now);
-      /* find and activate the current keymap.
-       * TODO: this should really get fixed by activating
-       * keymaps as we switch between windows... 
-       */
-      if (pw && owl_popwin_is_active(pw) && owl_global_get_viewwin(&g)) {
-        owl_context_set_popless(owl_global_get_context(&g), 
-                                owl_global_get_viewwin(&g));
-        owl_function_activate_keymap("popless");
-      } else if (owl_global_is_typwin_active(&g) 
-                 && owl_editwin_get_style(tw)==OWL_EDITWIN_STYLE_ONELINE) {
-        /*
-          owl_context_set_editline(owl_global_get_context(&g), tw);
-          owl_function_activate_keymap("editline");
-        */
-      } else if (owl_global_is_typwin_active(&g) 
-                 && owl_editwin_get_style(tw)==OWL_EDITWIN_STYLE_MULTILINE) {
-        owl_context_set_editmulti(owl_global_get_context(&g), tw);
-        owl_function_activate_keymap("editmulti");
-      } else {
-        owl_context_set_recv(owl_global_get_context(&g));
-        owl_function_activate_keymap("recv");
-      }
-      /* now actually handle the keypress */
-      ret = owl_keyhandler_process(owl_global_get_keyhandler(&g), j);
-      if (ret!=0 && ret!=1) {
-        owl_function_makemsg("Unable to handle keypress");
-      }
-    }
+
+    /* select on FDs we know about. */
+    owl_select();
 
     /* Log any error signals */
@@ -680 +655 @@
 }
 
+void owl_process_aim()
+{
+  if (owl_global_is_doaimevents(&g)) {
+    owl_aim_process_events();
+    
+    if (owl_global_is_aimloggedin(&g)) {
+      if (owl_timer_is_expired(owl_global_get_aim_buddyinfo_timer(&g))) {
+        /* owl_buddylist_request_idletimes(owl_global_get_buddylist(&g)); */
+        owl_timer_reset(owl_global_get_aim_buddyinfo_timer(&g));
+      }
+    }
+  }
+}
+
+void owl_process_input()
+{
+  int ret, j;
+  owl_popwin *pw;
+  owl_editwin *tw;
+
+  j = wgetch(owl_global_get_curs_typwin(&g));
+  if (j == ERR) return;
+
+  owl_global_set_lastinputtime(&g, time(NULL));
+  pw=owl_global_get_popwin(&g);
+  tw=owl_global_get_typwin(&g);
+
+  /* find and activate the current keymap.
+   * TODO: this should really get fixed by activating
+   * keymaps as we switch between windows... 
+   */
+  if (pw && owl_popwin_is_active(pw) && owl_global_get_viewwin(&g)) {
+    owl_context_set_popless(owl_global_get_context(&g), 
+                            owl_global_get_viewwin(&g));
+    owl_function_activate_keymap("popless");
+  } else if (owl_global_is_typwin_active(&g) 
+             && owl_editwin_get_style(tw) == OWL_EDITWIN_STYLE_ONELINE) {
+    /*
+      owl_context_set_editline(owl_global_get_context(&g), tw);
+      owl_function_activate_keymap("editline");
+    */
+  } else if (owl_global_is_typwin_active(&g) 
+             && owl_editwin_get_style(tw) == OWL_EDITWIN_STYLE_MULTILINE) {
+    owl_context_set_editmulti(owl_global_get_context(&g), tw);
+    owl_function_activate_keymap("editmulti");
+  } else {
+    owl_context_set_recv(owl_global_get_context(&g));
+    owl_function_activate_keymap("recv");
+  }
+  /* now actually handle the keypress */
+  ret = owl_keyhandler_process(owl_global_get_keyhandler(&g), j);
+  if (ret != 0 && ret != 1) {
+    owl_function_makemsg("Unable to handle keypress");
+  }
+}
+
 void sig_handler(int sig, siginfo_t *si, void *data)
 {
@@ -694 +725 @@
     owl_function_quit();
   }
-
 }
 

owl.h

@@ -537 +537 @@
   owl_list strings;
 } owl_obarray;
+
+typedef struct _owl_dispatch {
+  int fd;           /* FD to watch for dispatch. */
+  void (*cfunc)();  /* C function to dispatch to. */
+  SV *pfunc;        /* Perl function to dispatch to. */
+} owl_dispatch;
 
 typedef struct _owl_global {
@@ -608 +614 @@
   struct termios startup_tio;
   owl_obarray obarray;
+  owl_list dispatchlist;
 } owl_global;
 

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

@@ -69 +69 @@
 }
 
-sub mainloop_hook {
+#sub mainloop_hook {
+#    return unless defined $irc;
+#    eval {
+#        $irc->do_one_loop();
+#    };
+#    return;
+#}
+
+sub OwlProcess {
     return unless defined $irc;
     eval {
@@ -76 +84 @@
     return;
 }
+
 
 sub register_handlers {
@@ -109 +118 @@
 $BarnOwl::Hooks::startup->add(\&startup);
 $BarnOwl::Hooks::shutdown->add(\&shutdown);
-$BarnOwl::Hooks::mainLoop->add(\&mainloop_hook);
+#$BarnOwl::Hooks::mainLoop->add(\&mainloop_hook);
 
 ################################################################################
@@ -165 +174 @@
         BarnOwl::admin_message("IRC", "Connected to $alias as $nick");
         $ircnets{$alias} = $conn;
+        my $fd = $conn->getSocket()->fileno();
+        BarnOwl::add_dispatch($fd, \&OwlProcess);
+        $conn->{FD} = $fd;
     } else {
         die("IRC::Connection->connect failed: $!");

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

@@ -69 +69 @@
 }
 
+sub getSocket
+{
+    my $self = shift;
+    return $self->conn->socket;
+}
+
 ################################################################################
 ############################### IRC callbacks ##################################
@@ -168 +174 @@
     my $self = shift;
     delete $BarnOwl::Module::IRC::ircnets{$self->alias};
-
+    BarnOwl::remove_dispatch($self->{FD});
     BarnOwl::admin_message('IRC',
                            "[" . $self->alias . "] Disconnected from server");

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

@@ -116 +116 @@
             BarnOwl::error("Connection for $jid undefined -- error in reload?");
         }
-
-        my $status = $client->Process(0);
-        if ( !defined($status) ) {
-            BarnOwl::error("Jabber account $jid disconnected!");
-            do_logout($jid);
-        }
         if ($::shutdown) {
             do_logout($jid);
-            return;
+            next;
         }
         if ($vars{status_changed}) {
@@ -387 +381 @@
                 $conn->renameConnection($jidStr, $fullJid);
                 queue_admin_msg("Connected to jabber as $fullJid");
+                # The remove_dispatch() method is called from the
+                # ConnectionManager's removeConnection() method.
+                BarnOwl::add_dispatch($client->getSocket()->fileno(), sub { $client->OwlProcess() });
             }
         }

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

@@ -110 +110 @@
 
 
+=head2 getSID
+
+Returns the StreamID for this connection.
+
+=cut
+
+sub getStreamID {
+    my $self = shift;
+    return $self->{SESSION}->{id} || "";
+}
+
+=head2 getSocket
+
+Returns the IO::Socket for this connection.
+
+=cut
+
+sub getSocket {
+    my $self = shift;
+    my $sid = getStreamID($self);
+    return $self->{STREAM}->{SIDS}->{$sid}->{sock} || -1;
+}
+
+=head2 OwlProcess
+
+Non-blocking connection processing. For use in a select loop.
+
+=cut
+
+sub OwlProcess {
+    my $self = shift;
+    my $status = $self->Process(0);
+    if ( !defined($status) ) {
+        my $jid = $self->{SESSION}->{FULLJID};
+        BarnOwl::error("Jabber account $jid disconnected!");
+        do_logout($jid);
+    }
+}
+
 =head1 SEE ALSO
 

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

@@ -37 +37 @@
     return 0 unless exists $self->{$jidStr};
 
+    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->getSocket()->fileno());
     $self->{$jidStr}->{Client}->Disconnect()
       if $self->{$jidStr}->{Client};
@@ -51 +52 @@
     return 0 if $oldJidStr eq $newJidStr;
 
-    $self->{$newJidStr} = $self->{$oldJidStr}; 
+    $self->{$newJidStr} = $self->{$oldJidStr};
     delete $self->{$oldJidStr};
     return 1;

perlconfig.c

@@ -485 +485 @@
 }
 
+void owl_perlconfig_dispatch_free(owl_dispatch *d)
+{
+  SvREFCNT_dec(d->pfunc);
+}
+
 void owl_perlconfig_edit_callback(owl_editwin *e)
 {
@@ -528 +533 @@
   return;
 }
+
+void owl_perlconfig_do_dispatch(owl_dispatch *d)
+{
+  SV *cb = d->pfunc;
+  unsigned int n_a;
+  dSP;
+  if(cb == NULL) {
+    owl_function_error("Perl callback is NULL!");
+  }
+
+  ENTER;
+  SAVETMPS;
+
+  PUSHMARK(SP);
+  PUTBACK;
+  
+  call_sv(cb, G_DISCARD|G_KEEPERR|G_EVAL);
+
+  if(SvTRUE(ERRSV)) {
+    owl_function_error("%s", SvPV(ERRSV, n_a));
+  }
+
+  FREETMPS;
+  LEAVE;
+}

perlglue.xs

@@ -342 +342 @@
                                       desc,
                                       ival);
+
+void
+add_dispatch(fd, cb)
+        int fd
+        SV * cb
+        CODE:
+        SvREFCNT_inc(cb);
+        owl_select_add_perl_dispatch(fd, cb);
+
+void
+remove_dispatch(fd)
+        int fd
+        CODE:
+        owl_select_remove_perl_dispatch(fd);

zephyr.c

@@ -29 +29 @@
   return(0);
 }
-
 
 int owl_zephyr_shutdown()