Graceful exit

It's necessary to do serious checks for the memory leaks using tools like valgrind. This patch tries to implement a graceful exit for all tvheadend components and free allocated memory. Also, some memory leaks were fixed.
tvheadend · Feb 17, 2014 · c07824a · c07824a · BtbN · Mar 6, 2014
1 parent 56a39c5
commit c07824a
Show file tree

Hide file tree

Showing 93 changed files with 1,268 additions and 290 deletions.
diff --git a/src/access.c b/src/access.c
@@ -520,6 +520,7 @@ access_entry_destroy(access_entry_t *ae)
   free(ae->ae_id);
   free(ae->ae_username);
   free(ae->ae_password);
+  free(ae->ae_comment);
   TAILQ_REMOVE(&access_entries, ae, ae_link);
   free(ae);
 }
@@ -769,3 +770,13 @@ access_init(int createdefault, int noacl)
     htsmsg_destroy(m);
   }
 }
+
+void
+access_done(void)
+{
+  access_entry_t *ae;
+
+  dtable_delete("accesscontrol");
+  while ((ae = TAILQ_FIRST(&access_entries)) != NULL)
+    access_entry_destroy(ae);
+}
diff --git a/src/access.h b/src/access.h
@@ -111,5 +111,6 @@ uint32_t access_get_by_addr(struct sockaddr *src);
  *
  */
 void access_init(int createdefault, int noacl);
+void access_done(void);
 
 #endif /* ACCESS_H_ */
diff --git a/src/api.c b/src/api.c
@@ -29,6 +29,7 @@ typedef struct api_link {
 } api_link_t;
 
 RB_HEAD(,api_link) api_hook_tree;
+SKEL_DECLARE(api_skel, api_link_t);
 
 static int ah_cmp
   ( api_link_t *a, api_link_t *b )
@@ -39,15 +40,15 @@ static int ah_cmp
 void
 api_register ( const api_hook_t *hook )
 {
-  static api_link_t *t, *skel = NULL;
-  if (!skel)
-    skel = calloc(1, sizeof(api_link_t));
-  skel->hook = hook;
-  t = RB_INSERT_SORTED(&api_hook_tree, skel, link, ah_cmp);
-  if (t)
+  api_link_t *t;
+  SKEL_ALLOC(api_skel);
+  api_skel->hook = hook;
+  t = RB_INSERT_SORTED(&api_hook_tree, api_skel, link, ah_cmp);
+  if (t) {
     tvherror("api", "trying to re-register subsystem");
-  else
-    skel = NULL;
+  } else {
+    SKEL_USED(api_skel);
+  }
 }
 
 void
@@ -125,3 +126,14 @@ void api_init ( void )
   api_status_init();
   api_imagecache_init();
 }
+
+void api_done ( void )
+{
+  api_link_t *t;
+
+  while ((t = RB_FIRST(&api_hook_tree)) != NULL) {
+    RB_REMOVE(&api_hook_tree, t, link);
+    free(t);
+  }
+  SKEL_FREE(api_skel);
+}
diff --git a/src/api.h b/src/api.h
@@ -56,6 +56,7 @@ int  api_exec ( const char *subsystem, htsmsg_t *args, htsmsg_t **resp );
  * Initialise
  */
 void api_init               ( void );
+void api_done               ( void );
 void api_idnode_init        ( void );
 void api_input_init         ( void );
 void api_service_init       ( void );

diff --git a/src/api/api_idnode.c b/src/api/api_idnode.c
@@ -170,6 +170,8 @@ api_idnode_load_by_class
       if (e)
         htsmsg_add_msg(l, NULL, e);
     }
+    free(is->is_array);
+    free(is);
   }
   *resp = htsmsg_create_map();
   htsmsg_add_msg(*resp, "entries", l);

diff --git a/src/avahi.c b/src/avahi.c
@@ -54,6 +54,7 @@
 
 static AvahiEntryGroup *group = NULL;
 static char *name = NULL;
+static AvahiSimplePoll *avahi_asp = NULL;
 
 static void create_services(AvahiClient *c);
 
@@ -247,14 +248,13 @@ client_callback(AvahiClient *c, AvahiClientState state, void *userdata)
 static void *
 avahi_thread(void *aux)
 {
-  AvahiSimplePoll *asp = avahi_simple_poll_new();
   const AvahiPoll *ap = avahi_simple_poll_get(asp);
 
   name = avahi_strdup("Tvheadend");
 
   avahi_client_new(ap, AVAHI_CLIENT_NO_FAIL, client_callback, NULL, NULL);
 
-  while((avahi_simple_poll_iterate(asp, -1)) != -1) {}
+  while(avahi_simple_poll_iterate(asp, -1) == 0);
 
   return NULL;
 
@@ -264,10 +264,19 @@ avahi_thread(void *aux)
 /**
  *
  */
+pthread_t avahi_tid;
+
 void
 avahi_init(void)
 {
-  pthread_t tid;
+  avahi_asp = avahi_simple_poll_new();
+  tvhthread_create(&avahi_tid, NULL, avahi_thread, NULL, 0);
+}
 
-  tvhthread_create(&tid, NULL, avahi_thread, NULL, 1);
+void
+avahi_done(void)
+{
+  avahi_simple_poll_quit(avahi_asp);
+  pthread_kill(avahi_tid, SIGTERM);
+  pthread_join(avahi_tid, NULL);
 }
diff --git a/src/avahi.h b/src/avahi.h
@@ -1 +1,7 @@
+#ifdef CONFIG_AVAHI
 void avahi_init(void);
+void avahi_done(void);
+#else
+static inline void avahi_init(void) { }
+static inline void avahi_done(void) { }
+#endif
diff --git a/src/channels.c b/src/channels.c
@@ -48,9 +48,12 @@ struct channel_tag_queue channel_tags;
 static dtable_t *channeltags_dtable;
 
 static void channel_tag_init ( void );
+static void channel_tag_done ( void );
 static channel_tag_t *channel_tag_find(const char *id, int create);
 static void channel_tag_mapping_destroy(channel_tag_mapping_t *ctm, 
 					int flags);
+static void channel_tag_destroy(channel_tag_t *ct, int delconf);
+
 
 #define CTM_DESTROY_UPDATE_TAG     0x1
 #define CTM_DESTROY_UPDATE_CHANNEL 0x2
@@ -74,7 +77,7 @@ channel_class_save ( idnode_t *self )
 static void
 channel_class_delete ( idnode_t *self )
 {
-  channel_delete((channel_t*)self);
+  channel_delete((channel_t*)self, 1);
 }
 
 static const void *
@@ -540,22 +543,23 @@ channel_create0
 }
 
 void
-channel_delete ( channel_t *ch )
+channel_delete ( channel_t *ch, int delconf )
 {
   th_subscription_t *s;
   channel_tag_mapping_t *ctm;
   channel_service_mapping_t *csm;
 
   lock_assert(&global_lock);
 
-  tvhinfo("channel", "%s - deleting", channel_get_name(ch));
+  if (delconf)
+    tvhinfo("channel", "%s - deleting", channel_get_name(ch));
 
   /* Tags */
   while((ctm = LIST_FIRST(&ch->ch_ctms)) != NULL)
     channel_tag_mapping_destroy(ctm, CTM_DESTROY_UPDATE_TAG);
 
   /* DVR */
-  autorec_destroy_by_channel(ch);
+  autorec_destroy_by_channel(ch, delconf);
   dvr_destroy_by_channel(ch);
 
   /* Services */
@@ -573,7 +577,8 @@ channel_delete ( channel_t *ch )
   epg_channel_unlink(ch);
 
   /* Settings */
-  hts_settings_remove("channel/%s", idnode_uuid_as_str(&ch->ch_id));
+  if (delconf)
+    hts_settings_remove("channel/%s", idnode_uuid_as_str(&ch->ch_id));
 
   /* Free memory */
   RB_REMOVE(&channels, ch, ch_link);
@@ -619,6 +624,21 @@ channel_init ( void )
   htsmsg_destroy(c);
 }
 
+/**
+ *
+ */
+void
+channel_done ( void )
+{
+  channel_t *ch;
+
+  pthread_mutex_lock(&global_lock);
+  while ((ch = RB_FIRST(&channels)) != NULL)
+    channel_delete(ch, 0);
+  pthread_mutex_unlock(&global_lock);
+  channel_tag_done();
+}
+
 /* ***
  * Channel tags TODO
  */
@@ -732,15 +752,17 @@ channel_tag_find(const char *id, int create)
  *
  */
 static void
-channel_tag_destroy(channel_tag_t *ct)
+channel_tag_destroy(channel_tag_t *ct, int delconf)
 {
   channel_tag_mapping_t *ctm;
   channel_t *ch;
 
-  while((ctm = LIST_FIRST(&ct->ct_ctms)) != NULL) {
-    ch = ctm->ctm_channel;
-    channel_tag_mapping_destroy(ctm, CTM_DESTROY_UPDATE_CHANNEL);
-    channel_save(ch);
+  if (delconf) {
+    while((ctm = LIST_FIRST(&ct->ct_ctms)) != NULL) {
+      ch = ctm->ctm_channel;
+      channel_tag_mapping_destroy(ctm, CTM_DESTROY_UPDATE_CHANNEL);
+      channel_save(ch);
+    }
   }
 
   if(ct->ct_enabled && !ct->ct_internal)
@@ -878,7 +900,7 @@ channel_tag_record_delete(void *opaque, const char *id)
 
   if((ct = channel_tag_find(id, 0)) == NULL)
     return -1;
-  channel_tag_destroy(ct);
+  channel_tag_destroy(ct, 1);
   return 0;
 }
 
@@ -949,3 +971,15 @@ channel_tag_init ( void )
   channeltags_dtable = dtable_create(&channel_tags_dtc, "channeltags", NULL);
   dtable_load(channeltags_dtable);
 }
+
+static void
+channel_tag_done ( void )
+{
+  channel_tag_t *ct;
+
+  pthread_mutex_lock(&global_lock);
+  while ((ct = TAILQ_FIRST(&channel_tags)) != NULL)
+    channel_tag_destroy(ct, 0);
+  pthread_mutex_unlock(&global_lock);
+  dtable_delete("channeltags");
+}
diff --git a/src/channels.h b/src/channels.h
@@ -120,14 +120,15 @@ typedef struct channel_service_mapping {
 extern const idclass_t channel_class;
 
 void channel_init(void);
+void channel_done(void);
 
 channel_t *channel_create0
   (channel_t *ch, const idclass_t *idc, const char *uuid, htsmsg_t *conf,
    const char *name);
 #define channel_create(u, c, n)\
   channel_create0(calloc(1, sizeof(channel_t)), &channel_class, u, c, n)
 
-void channel_delete(channel_t *ch);
+void channel_delete(channel_t *ch, int delconf);
 
 channel_t *channel_find_by_name(const char *name);
 #define channel_find_by_uuid(u)\

diff --git a/src/config2.c b/src/config2.c
@@ -33,6 +33,11 @@ void config_init ( void )
   }
 }
 
+void config_done ( void )
+{
+  htsmsg_destroy(config);
+}
+
 void config_save ( void )
 {
   hts_settings_save(config, "config");

diff --git a/src/config2.h b/src/config2.h
@@ -24,6 +24,7 @@
 #include "htsmsg.h"
 
 void        config_init    ( void );
+void        config_done    ( void );
 void        config_save    ( void );
 
 htsmsg_t   *config_get_all ( void );

diff --git a/src/descrambler.h b/src/descrambler.h
@@ -77,6 +77,7 @@ typedef enum {
 LIST_HEAD(caid_list, caid);
 
 void descrambler_init          ( void );
+void descrambler_done          ( void );
 void descrambler_service_start ( struct service *t );
 const char *descrambler_caid2name(uint16_t caid);
 uint16_t descrambler_name2caid(const char *str);

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
@@ -185,6 +185,8 @@ typedef struct capmt {
 
   struct capmt_service_list capmt_services;
 
+  pthread_t capmt_tid;
+
   /* from capmt configuration */
   char *capmt_sockfile;
   char *capmt_hostname;
@@ -1114,7 +1116,6 @@ capmt_destroy(capmt_t *capmt)
 static capmt_t *
 capmt_entry_find(const char *id, int create)
 {
-  pthread_t ptid;
   char buf[20];
   capmt_t *capmt;
   static int tally;
@@ -1143,7 +1144,7 @@ capmt_entry_find(const char *id, int create)
 
   TAILQ_INSERT_TAIL(&capmts, capmt, capmt_link);  
 
-  tvhthread_create(&ptid, NULL, capmt_thread, capmt, 1);
+  tvhthread_create(&capmt->capmt_tid, NULL, capmt_thread, capmt, 1);
 
   return capmt;
 }
@@ -1281,3 +1282,19 @@ capmt_init(void)
   dtable_load(dt);
 }
 
+void
+capmt_done(void)
+{
+  capmt_t *capmt, *n;
+  pthread_t tid;
+
+  for (capmt = TAILQ_FIRST(&capmts); capmt != NULL; capmt = n) {
+    n = TAILQ_NEXT(capmt, capmt_link);
+    pthread_mutex_lock(&global_lock);
+    tid = capmt->capmt_tid;
+    capmt_destroy(capmt);
+    pthread_mutex_unlock(&global_lock);
+    pthread_join(tid, NULL);
+  }
+  dtable_delete("capmt");
+}
diff --git a/src/descrambler/capmt.h b/src/descrambler/capmt.h
@@ -21,6 +21,8 @@
 
 void capmt_init(void);
 
+void capmt_done(void);
+
 void capmt_service_start(struct service *t);
 
 #endif /* CAPMT_H_ */