mpegts input: simplify and make faster the TS input stop procedure

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index ac49c844deb0f826502323f94746ce64090399d0..78f4bb7759a128b4932eeaa6edc106eaf0a30984 100644 (file)
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -548,8 +548,9 @@ struct mpegts_input
    * Input processing
    */
 
-  uint8_t mi_running;
-  uint8_t mi_live;
+  uint8_t mi_running;            /* threads running */
+  uint8_t mi_stop;               /* mux is in the stop state */
+  uint8_t mi_live;               /* stream is live */
   time_t mi_last_dispatch;
 
   /* Data input */
@@ -568,9 +569,6 @@ struct mpegts_input
   LIST_HEAD(,mpegts_mux_instance) mi_mux_active;
   LIST_HEAD(,service)             mi_transports;
 
-  mpegts_mux_t                  **mi_destroyed_muxes;
-  int                             mi_destroyed_muxes_count;
-  
   /* Table processing */
   pthread_t                       mi_table_tid;
   pthread_cond_t                  mi_table_cond;
@@ -600,6 +598,7 @@ struct mpegts_input
   void (*mi_close_pid)      (mpegts_input_t*,mpegts_mux_t*,int,int,void*);
   void (*mi_create_mux_instance) (mpegts_input_t*,mpegts_mux_t*);
   void (*mi_started_mux)    (mpegts_input_t*,mpegts_mux_instance_t*);
+  void (*mi_stopping_mux)   (mpegts_input_t*,mpegts_mux_instance_t*);
   void (*mi_stopped_mux)    (mpegts_input_t*,mpegts_mux_instance_t*);
   int  (*mi_has_subscription) (mpegts_input_t*, mpegts_mux_t *mm);
   idnode_set_t *(*mi_network_list) (mpegts_input_t*);

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index c5aef130016e2f21ce993b912cdfc4101ffb9170..cb52b91977887a2c2a8f3588abaaf9632350cbba 100644 (file)
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -467,11 +467,22 @@ mpegts_input_started_mux
 
   /* Update */
   mmi->mmi_mux->mm_active = mmi;
+  /* Accept packets */
+  mi->mi_stop = 0;
   LIST_INSERT_HEAD(&mi->mi_mux_active, mmi, mmi_active_link);
   notify_reload("input_status");
   mpegts_input_dbus_notify(mi, 1);
 }
 
+static void
+mpegts_input_stopping_mux
+  ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi )
+{
+  pthread_mutex_lock(&mi->mi_output_lock);
+  mi->mi_stop = 1;
+  pthread_mutex_unlock(&mi->mi_output_lock);
+}
+
 static void
 mpegts_input_stopped_mux
   ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi )
@@ -834,7 +845,7 @@ mpegts_input_thread ( void * p )
       
     /* Process */
     pthread_mutex_lock(&mi->mi_output_lock);
-    if (mp->mp_mux && mp->mp_mux->mm_active) {
+    if (!mi->mi_stop && mp->mp_mux) {
       mpegts_input_table_waiting(mi, mp->mp_mux);
       mpegts_input_process(mi, mp);
     }
@@ -860,7 +871,6 @@ mpegts_input_table_thread ( void *aux )
 {
   mpegts_table_feed_t   *mtf;
   mpegts_input_t        *mi = aux;
-  int i;
 
   pthread_mutex_lock(&mi->mi_output_lock);
   while (mi->mi_running) {
@@ -876,18 +886,8 @@ mpegts_input_table_thread ( void *aux )
     /* Process */
     if (mtf->mtf_mux) {
       pthread_mutex_lock(&global_lock);
-      if (mi->mi_destroyed_muxes) {
-        for (i = 0; i < mi->mi_destroyed_muxes_count; i++)
-          if (mtf->mtf_mux == mi->mi_destroyed_muxes[i])
-            goto clean;
-        mpegts_input_table_dispatch(mtf->mtf_mux, mtf->mtf_tsb);
-clean:
-        free(mi->mi_destroyed_muxes);
-        mi->mi_destroyed_muxes = NULL;
-        mi->mi_destroyed_muxes_count = 0;
-      } else {
+      if (!mi->mi_stop)
         mpegts_input_table_dispatch(mtf->mtf_mux, mtf->mtf_tsb);
-      }
       pthread_mutex_unlock(&global_lock);
     }
 
@@ -932,10 +932,9 @@ mpegts_input_flush_mux
     if (mtf->mtf_mux == mm)
       mtf->mtf_mux = NULL;
   }
-  mi->mi_destroyed_muxes = realloc(mi->mi_destroyed_muxes,
-                                   (mi->mi_destroyed_muxes_count + 1) *
-                                     sizeof(mpegts_mux_t *));
-  mi->mi_destroyed_muxes[mi->mi_destroyed_muxes_count++] = mm;
+  /* stop flag must be set here */
+  /* otherwise the picked mtf might be processed after mux deactivation */
+  assert(mi->mi_stop);
 }
 
 static void
@@ -1091,6 +1090,7 @@ mpegts_input_create0
   mi->mi_close_pid            = mpegts_input_close_pid;
   mi->mi_create_mux_instance  = mpegts_input_create_mux_instance;
   mi->mi_started_mux          = mpegts_input_started_mux;
+  mi->mi_stopping_mux         = mpegts_input_stopping_mux;
   mi->mi_stopped_mux          = mpegts_input_stopped_mux;
   mi->mi_has_subscription     = mpegts_input_has_subscription;
   mi->ti_get_streams          = mpegts_input_get_streams;
@@ -1110,6 +1110,9 @@ mpegts_input_create0
   /* Defaults */
   mi->mi_ota_epg = 1;
 
+  /* Stop processing until subscribed */
+  mi->mi_stop = 1;
+
   /* Add to global list */
   LIST_INSERT_HEAD(&mpegts_input_all, mi, mi_global_link);
 
@@ -1161,7 +1164,6 @@ mpegts_input_delete ( mpegts_input_t *mi, int delconf )
   pthread_mutex_destroy(&mi->mi_output_lock);
   pthread_cond_destroy(&mi->mi_table_cond);
   free(mi->mi_name);
-  free(mi->mi_destroyed_muxes);
   free(mi);
 }
 

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index a8cc6f94c04d79ae8fb5a982fd5effb937283082..2bcefbc1d012a37e11def7fda695f6550bb5ae1e 100644 (file)
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -696,9 +696,10 @@ mpegts_mux_stop ( mpegts_mux_t *mm, int force )
   tvhdebug("mpegts", "%s - stopping mux", buf);
 
   if (mmi) {
+    mi = mmi->mmi_input;
+    mi->mi_stopping_mux(mi, mmi);
     LIST_FOREACH(sub, &mmi->mmi_subs, ths_mmi_link)
       subscription_unlink_mux(sub, SM_CODE_SUBSCRIPTION_OVERRIDDEN);
-    mi = mmi->mmi_input;
     mi->mi_stop_mux(mi, mmi);
     mi->mi_stopped_mux(mi, mmi);
   }