Changeset 3aa0522

Timestamp:

May 19, 2010, 9:58:09 PM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

7c5d060

Parents:

8278543

git-author:

David Benjamin <davidben@mit.edu> (05/14/10 19:15:32)

git-committer:

David Benjamin <davidben@mit.edu> (05/19/10 21:58:09)

Message:

Deprecate the main loop hook, use on-demand perl timer

Users without a main loop hook shouldn't need to pay 1s wakeups, and
users with one probably want more control over the timeout anyway.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• owl.c (modified) (1 diff)
• perl/lib/BarnOwl/Hooks.pm (modified) (3 diffs)
• perl/lib/BarnOwl/MainLoopCompatHook.pm (added)
• perlconfig.c (modified) (1 diff)

owl.c

@@ -619 +619 @@
   owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv");
 
-  /* If we ever deprecate the mainloop hook, remove this. */
-  owl_select_add_timer(0, 1, owl_perlconfig_mainloop, NULL, NULL);
-
   owl_select_add_pre_select_action(owl_refresh_pre_select_action, NULL, NULL);
   owl_select_add_pre_select_action(owl_process_messages, NULL, NULL);

perl/lib/BarnOwl/Hooks.pm

@@ -79 +79 @@
 our %EXPORT_TAGS = (all => [@EXPORT_OK]);
 
+use BarnOwl::MainLoopCompatHook;
+
 our $startup = BarnOwl::Hook->new;
 our $shutdown = BarnOwl::Hook->new;
 our $receiveMessage = BarnOwl::Hook->new;
 our $newMessage = BarnOwl::Hook->new;
-our $mainLoop = BarnOwl::Hook->new;
+our $mainLoop = BarnOwl::MainLoopCompatHook->new;
 our $getBuddyList = BarnOwl::Hook->new;
 our $getQuickstart = BarnOwl::Hook->new;
@@ -162 +164 @@
     }
     
+    $mainLoop->check_owlconf();
     $startup->run(0);
     BarnOwl::startup() if *BarnOwl::startup{CODE};
@@ -186 +189 @@
     
     BarnOwl::new_msg($m) if *BarnOwl::new_msg{CODE};
-}
-
-sub _mainloop_hook {
-    $mainLoop->run;
-    BarnOwl::mainloop_hook() if *BarnOwl::mainloop_hook{CODE};
 }
 

perlconfig.c

@@ -582 +582 @@
 }
 
-void owl_perlconfig_mainloop(owl_timer *t, void *data)
-{
-  dSP;
-  if (!owl_perlconfig_is_function("BarnOwl::Hooks::_mainloop_hook"))
-    return;
-  PUSHMARK(SP) ;
-  call_pv("BarnOwl::Hooks::_mainloop_hook", G_DISCARD|G_EVAL);
-  if(SvTRUE(ERRSV)) {
-    owl_function_error("%s", SvPV_nolen(ERRSV));
-  }
-  return;
-}
-
 void owl_perlconfig_io_dispatch(const owl_io_dispatch *d, void *data)
 {