Changeset c6adf17

Timestamp:

Oct 1, 2010, 9:22:20 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

afaef6e

Parents:

385cce2

git-author:

David Benjamin <davidben@mit.edu> (09/25/10 02:02:45)

git-committer:

David Benjamin <davidben@mit.edu> (10/01/10 21:22:20)

Message:

Track names along with timers, add :show timers

This will help people with BarnOwls eating CPU to diagnose timer leaks.

Files:

• aim.c (modified) (2 diffs)
• commands.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• perl/lib/BarnOwl/Complete/Client.pm (modified) (1 diff)
• perl/lib/BarnOwl/MainLoopCompatHook.pm (modified) (1 diff)
• perl/lib/BarnOwl/Timer.pm (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (2 diffs)
• perlglue.xs (modified) (3 diffs)
• select.c (modified) (3 diffs)
• variable.c (modified) (1 diff)

aim.c

@@ -184 +184 @@
   owl_function_debugmsg("owl_aim_login: connecting");
 
-  g.aim_nop_timer = owl_select_add_timer(30, 30, owl_aim_send_nop, NULL, NULL);
+  g.aim_nop_timer = owl_select_add_timer("owl_aim_send_nop", 30, 30, owl_aim_send_nop, NULL, NULL);
 
   return(0);
@@ -210 +210 @@
   /* start the ingorelogin timer */
   owl_global_set_ignore_aimlogin(&g);
-  owl_select_add_timer(owl_global_get_aim_ignorelogin_timer(&g),
+  owl_select_add_timer("owl_aim_unset_ignorelogin",
+                       owl_global_get_aim_ignorelogin_timer(&g),
                        0, owl_aim_unset_ignorelogin, NULL, NULL);
 

commands.c

@@ -654 +654 @@
               "show subscriptions / show subs\n"
               "show terminal\n"
+              "show timers\n"
               "show variables\n"
               "show variable <variable>\n"
@@ -2243 +2244 @@
   } else if (!strcmp(argv[1], "styles")) {
     owl_function_show_styles();
+  } else if (!strcmp(argv[1], "timers")) {
+    owl_function_show_timers();
   } else if (!strcmp(argv[1], "subs") || !strcmp(argv[1], "subscriptions")) {
     owl_function_getsubs();

functions.c

@@ -90 +90 @@
   owl_function_popless_fmtext(&fm);
   owl_list_cleanup(&l, owl_free);
+  owl_fmtext_cleanup(&fm);
+}
+
+static void _owl_function_timer_append_fmtext(gpointer data, gpointer user_data) {
+  owl_fmtext *fm = user_data;
+  owl_timer *timer = data;
+  char *str = owl_sprintf("- %s: in %d seconds",
+                          timer->name ? timer->name : "(unnamed)",
+                          timer->time - time(NULL));
+  owl_fmtext_append_normal(fm, str);
+  owl_free(str);
+  if (timer->interval) {
+    str = owl_sprintf(", repeat every %d seconds", timer->interval);
+    owl_fmtext_append_normal(fm, str);
+    owl_free(str);
+  }
+  owl_fmtext_append_normal(fm, "\n");
+}
+
+void owl_function_show_timers(void) {
+  owl_fmtext fm;
+  GList **timers;
+
+  owl_fmtext_init_null(&fm);
+  owl_fmtext_append_bold(&fm, "Active timers:\n");
+
+  timers = owl_global_get_timerlist(&g);
+  g_list_foreach(*timers, _owl_function_timer_append_fmtext, &fm);
+
+  owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 }

owl.h

@@ -532 +532 @@
   void (*destroy)(struct _owl_timer *);
   void *data;
+  char *name;
 } owl_timer;
 

perl/lib/BarnOwl/Complete/Client.pm

@@ -37 +37 @@
     subs        => undef,
     terminal    => undef,
+    timers      => undef,
     variables   => undef,
     variable    => \&complete_variable,

perl/lib/BarnOwl/MainLoopCompatHook.pm

@@ -44 +44 @@
   unless ($self->{timer}) {
     $self->{timer} = BarnOwl::Timer->new( {
+        name => "BarnOwl::MainLoopCompatHook",
         after => 0,
         interval => 1,

perl/lib/BarnOwl/Timer.pm

@@ -13 +13 @@
     my $self = {cb => $cb};
 
+    my $name = $args->{name};
+    $name = "(unnamed)" unless defined $name;
+
     bless($self, $class);
 
     $self->{timer} = BarnOwl::Internal::add_timer($args->{after} || 0,
                                                   $args->{interval} || 0,
-                                                  $self);
+                                                  $self,
+                                                  $name);
     return $self;
 }

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

@@ -324 +324 @@
     $self->{reconnect_timer} = 
         BarnOwl::Timer->new( {
+            name  => 'IRC (' . $self->alias . ') reconnect_timer',
             after => $interval,
             cb    => sub {

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

@@ -198 +198 @@
         $BarnOwl::Module::Jabber::vars{keepAliveTimer} =
             BarnOwl::Timer->new({
+                'name' => "Jabber ($fullJid) keepAliveTimer",
                 'after' => 5,
                 'interval' => 5,

perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm

@@ -160 +160 @@
     }
 
+    my $nickname = $self->{cfg}->{account_nickname};
     if($self->{cfg}->{poll_for_tweets}) {
         $self->{timer} = BarnOwl::Timer->new({
+            name     => "Twitter ($nickname) poll_for_tweets",
             after    => $delay,
             interval => 90,
@@ -170 +172 @@
     if($self->{cfg}->{poll_for_dms}) {
         $self->{direct_timer} = BarnOwl::Timer->new({
+            name     => "Twitter ($nickname) poll_for_dms",
             after    => $delay,
             interval => 180,

perlglue.xs

@@ -516 +516 @@
 
 IV
-add_timer(after, interval, cb)
+add_timer(after, interval, cb, name = NULL)
         int after
         int interval
         SV *cb
+        const char *name
         PREINIT:
                 SV *ref;
@@ -525 +526 @@
         CODE:
                 ref = sv_rvweaken(newSVsv(cb));
-                t = owl_select_add_timer(after,
+                t = owl_select_add_timer(name,
+                                         after,
                                          interval,
                                          owl_perlconfig_perl_timer,
                                          owl_perlconfig_perl_timer_destroy,
                                          ref);
-        owl_function_debugmsg("Created timer %p", t);
+                owl_function_debugmsg("Created timer %s: %p", t->name ? t->name : "(unnamed)", t);
         RETVAL = (IV)t;
         OUTPUT:
@@ -542 +544 @@
         CODE:
                 t = (owl_timer*)timer;
-                owl_function_debugmsg("Freeing timer %p", t);
-                                owl_select_remove_timer(t);
+                owl_function_debugmsg("Freeing timer %s: %p", t->name ? t->name : "(unnamed)", t);
+                owl_select_remove_timer(t);
 
 MODULE = BarnOwl                PACKAGE = BarnOwl::Editwin

select.c

@@ -13 +13 @@
 }
 
-owl_timer *owl_select_add_timer(int after, int interval, void (*cb)(owl_timer *, void *), void (*destroy)(owl_timer*), void *data)
+owl_timer *owl_select_add_timer(const char* name, int after, int interval, void (*cb)(owl_timer *, void *), void (*destroy)(owl_timer*), void *data)
 {
   owl_timer *t = owl_malloc(sizeof(owl_timer));
@@ -23 +23 @@
   t->destroy = destroy;
   t->data = data;
+  t->name = name ? owl_strdup(name) : NULL;
 
   *timers = g_list_insert_sorted(*timers, t,
@@ -37 +38 @@
       t->destroy(t);
     }
+    owl_free(t->name);
     owl_free(t);
   }

variable.c

@@ -435 +435 @@
       owl_function_zephyr_buddy_check(0);
       if (timer == NULL) {
-        timer = owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
+        timer = owl_select_add_timer("owl_zephyr_buddycheck_timer",
+                                     180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
       }
     } else {