[961] in BarnOwl Developers
[D-O-H] r949 - in trunk/owl: . perl/modules/IRC/lib/BarnOwl/Module perl/modules/IRC/lib/BarnOwl/Module/IRC perl/modules/Jabber/lib/BarnOwl/Module perl/modules/Jabber/lib/BarnOwl/Module/Jabber
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:11:36 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 18 Feb 2008 19:43:11 -0500 (EST)
Author: asedeno
Date: 2008-02-18 19:43:09 -0500 (Mon, 18 Feb 2008)
New Revision: 949
Modified:
trunk/owl/Makefile.in
trunk/owl/functions.c
trunk/owl/global.c
trunk/owl/owl.c
trunk/owl/owl.h
trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm
trunk/owl/perlconfig.c
trunk/owl/perlglue.xs
trunk/owl/zephyr.c
Log:
Merging in the select branch.
Modified: trunk/owl/Makefile.in
===================================================================
--- trunk/owl/Makefile.in 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/Makefile.in 2008-02-19 00:43:09 UTC (rev 949)
@@ -25,7 +25,7 @@
regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
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
Modified: trunk/owl/functions.c
===================================================================
--- trunk/owl/functions.c 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/functions.c 2008-02-19 00:43:09 UTC (rev 949)
@@ -797,7 +797,7 @@
owl_global_set_topmsg(&g, curmsg+1);
owl_global_set_curmsg(&g, curmsg+1);
}
- owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+ /* owl_mainwin_redisplay(owl_global_get_mainwin(&g)); */
owl_global_set_direction_downwards(&g);
}
Modified: trunk/owl/global.c
===================================================================
--- trunk/owl/global.c 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/global.c 2008-02-19 00:43:09 UTC (rev 949)
@@ -116,6 +116,7 @@
owl_obarray_init(&(g->obarray));
owl_message_init_fmtext_cache();
+ owl_list_create(&(g->dispatchlist));
}
void _owl_global_setup_windows(owl_global *g) {
@@ -931,3 +932,8 @@
{
return owl_obarray_insert(&(g->obarray), string);
}
+
+owl_list *owl_global_get_dispatchlist(owl_global *g)
+{
+ return &(g->dispatchlist);
+}
Modified: trunk/owl/owl.c
===================================================================
--- trunk/owl/owl.c 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/owl.c 2008-02-19 00:43:09 UTC (rev 949)
@@ -45,6 +45,7 @@
#include <time.h>
#include <sys/param.h>
#include <sys/types.h>
+#include <sys/time.h>
#include <termios.h>
#include <sys/stat.h>
#include "owl.h"
@@ -59,6 +60,8 @@
int stderr_replace(void);
#endif
+#define STDIN 0
+
static const char fileIdent[] = "$Id$";
owl_global g;
@@ -68,7 +71,7 @@
WINDOW *recwin, *sepwin, *typwin, *msgwin;
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;
char *configfile, *tty, *perlout, *perlerr, **argvsave, buff[LINE], startupmsg[LINE];
@@ -205,11 +208,27 @@
owl_global_set_startupargs(&g, argcsave, argvsave);
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
#if OWL_STDERR_REDIR
@@ -424,18 +443,6 @@
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();
/* little hack */
@@ -453,8 +460,6 @@
}
}
- owl_zephyr_process_events();
-
/* Grab incoming messages. */
newmsgs=0;
while(owl_global_messagequeue_pending(&g)) {
@@ -529,40 +534,10 @@
/* Handle all keypresses. If no key has been pressed, sleep for a
* 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 */
{
siginfo_t si;
@@ -679,6 +654,62 @@
return 1;
}
+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)
{
if (sig==SIGWINCH) {
@@ -693,7 +724,6 @@
} else if (sig==SIGTERM || sig==SIGHUP) {
owl_function_quit();
}
-
}
void usage()
Modified: trunk/owl/owl.h
===================================================================
--- trunk/owl/owl.h 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/owl.h 2008-02-19 00:43:09 UTC (rev 949)
@@ -537,6 +537,12 @@
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 {
owl_mainwin mw;
owl_popwin pw;
@@ -607,6 +613,7 @@
owl_timer zephyr_buddycheck_timer;
struct termios startup_tio;
owl_obarray obarray;
+ owl_list dispatchlist;
} owl_global;
/* globals */
Modified: trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-02-19 00:43:09 UTC (rev 949)
@@ -68,6 +68,12 @@
return $self;
}
+sub getSocket
+{
+ my $self = shift;
+ return $self->conn->socket;
+}
+
################################################################################
############################### IRC callbacks ##################################
################################################################################
@@ -167,7 +173,7 @@
sub on_disconnect {
my $self = shift;
delete $BarnOwl::Module::IRC::ircnets{$self->alias};
-
+ BarnOwl::remove_dispatch($self->{FD});
BarnOwl::admin_message('IRC',
"[" . $self->alias . "] Disconnected from server");
}
Modified: trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
===================================================================
--- trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-02-19 00:43:09 UTC (rev 949)
@@ -68,7 +68,15 @@
}
}
-sub mainloop_hook {
+#sub mainloop_hook {
+# return unless defined $irc;
+# eval {
+# $irc->do_one_loop();
+# };
+# return;
+#}
+
+sub OwlProcess {
return unless defined $irc;
eval {
$irc->do_one_loop();
@@ -76,6 +84,7 @@
return;
}
+
sub register_handlers {
if(!$irc) {
$irc = Net::IRC->new;
@@ -108,7 +117,7 @@
$BarnOwl::Hooks::startup->add(\&startup);
$BarnOwl::Hooks::shutdown->add(\&shutdown);
-$BarnOwl::Hooks::mainLoop->add(\&mainloop_hook);
+#$BarnOwl::Hooks::mainLoop->add(\&mainloop_hook);
################################################################################
######################## Owl command handlers ##################################
@@ -164,6 +173,9 @@
if ($conn->conn->connected) {
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: $!");
}
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm 2008-02-19 00:43:09 UTC (rev 949)
@@ -109,6 +109,45 @@
}
+=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}->GetSock($sid) || -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!");
+ BarnOwl::Module::Jabber::do_logout($jid);
+ }
+}
+
=head1 SEE ALSO
L<Net::Jabber::Client>, L<BarnOwl::Module::Jabber>
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm 2008-02-19 00:43:09 UTC (rev 949)
@@ -36,6 +36,7 @@
my $jidStr = shift;
return 0 unless exists $self->{$jidStr};
+ BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
$self->{$jidStr}->{Client}->Disconnect()
if $self->{$jidStr}->{Client};
delete $self->{$jidStr};
@@ -50,7 +51,7 @@
return 0 unless exists $self->{$oldJidStr};
return 0 if $oldJidStr eq $newJidStr;
- $self->{$newJidStr} = $self->{$oldJidStr};
+ $self->{$newJidStr} = $self->{$oldJidStr};
delete $self->{$oldJidStr};
return 1;
}
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-02-19 00:43:09 UTC (rev 949)
@@ -115,7 +115,7 @@
$conn->removeConnection($jid);
BarnOwl::error("Connection for $jid undefined -- error in reload?");
}
-
+ # We keep this in the mainloop hook for keep-alives
my $status = $client->Process(0);
if ( !defined($status) ) {
BarnOwl::error("Jabber account $jid disconnected!");
@@ -123,8 +123,9 @@
}
if ($::shutdown) {
do_logout($jid);
- return;
+ next;
}
+
if ($vars{status_changed}) {
my $p = new Net::Jabber::Presence;
$p->SetShow($vars{show}) if $vars{show};
@@ -386,6 +387,11 @@
my $fullJid = $client->{SESSION}->{FULLJID} || $jidStr;
$conn->renameConnection($jidStr, $fullJid);
queue_admin_msg("Connected to jabber as $fullJid");
+ # The remove_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() });
}
}
}
Modified: trunk/owl/perlconfig.c
===================================================================
--- trunk/owl/perlconfig.c 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/perlconfig.c 2008-02-19 00:43:09 UTC (rev 949)
@@ -484,6 +484,11 @@
SvREFCNT_dec(cmd->cmd_perl);
}
+void owl_perlconfig_dispatch_free(owl_dispatch *d)
+{
+ SvREFCNT_dec(d->pfunc);
+}
+
void owl_perlconfig_edit_callback(owl_editwin *e)
{
SV *cb = (SV*)(e->cbdata);
@@ -527,3 +532,28 @@
}
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;
+}
Modified: trunk/owl/perlglue.xs
===================================================================
--- trunk/owl/perlglue.xs 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/perlglue.xs 2008-02-19 00:43:09 UTC (rev 949)
@@ -341,3 +341,17 @@
summ,
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);
Modified: trunk/owl/zephyr.c
===================================================================
--- trunk/owl/zephyr.c 2008-02-18 22:38:32 UTC (rev 948)
+++ trunk/owl/zephyr.c 2008-02-19 00:43:09 UTC (rev 949)
@@ -29,7 +29,6 @@
return(0);
}
-
int owl_zephyr_shutdown()
{
#ifdef HAVE_LIBZEPHYR
