spawn: implement spawn_kill, improve IPTV pipe (busy loop)

diff --git a/src/config.c b/src/config.c
index ea1e93f5462ab1bf958b4ea9b5f420963bc1d893..4c3b1f778828b49662b12754d3a458e27bbcd1dc 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1147,7 +1147,7 @@ dobackup(const char *oldver)
                                      root, oldver);
   tvhinfo("config", "backup: running, output file %s", outfile);
 
-  spawnv(argv[0], (void *)argv, 1, 1);
+  spawnv(argv[0], (void *)argv, NULL, 1, 1);
 
   while ((code = spawn_reap(errtxt, sizeof(errtxt))) == -EAGAIN)
     usleep(20000);

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index d80c0cd812e5bad8c699c8f91993dd5f460ad672..58d8fc7ee2520096086ec0744281b54b3aa1bc9d 100644 (file)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -679,7 +679,7 @@ dvr_spawn_postproc(dvr_entry_t *de, const char *dvr_postproc)
     args[i] = s;
   }
   
-  spawnv(args[0], (void *)args, 1, 1);
+  spawnv(args[0], (void *)args, NULL, 1, 1);
     
   htsstr_argsplit_free(args);
 }

diff --git a/src/epggrab/module.c b/src/epggrab/module.c
index 9f2f71e8bcaff239d188ad8971975366be2bd75b..43d2b1c8a150b94989d40e65c9deb84b9af3813c 100644 (file)
--- a/src/epggrab/module.c
+++ b/src/epggrab/module.c
@@ -287,7 +287,7 @@ char *epggrab_module_grab_spawn ( void *m )
   tvhlog(LOG_INFO, mod->id, "grab %s", mod->path);
 
   /* Grab */
-  outlen = spawn_and_give_stdout(mod->path, NULL, &rd, 1);
+  outlen = spawn_and_give_stdout(mod->path, NULL, &rd, NULL, 1);
 
   if (outlen < 0)
     goto error;

diff --git a/src/epggrab/module/xmltv.c b/src/epggrab/module/xmltv.c
index 8e42448c863d95dc9d14bcc393988fc885aa5724..e859aa6716feec71831d61e40eb9471f12c2c7f1 100755 (executable)
--- a/src/epggrab/module/xmltv.c
+++ b/src/epggrab/module/xmltv.c
@@ -683,7 +683,7 @@ static void _xmltv_load_grabbers ( void )
   char *tmp, *tmp2 = NULL, *path;
 
   /* Load data */
-  if (spawn_and_give_stdout(XMLTV_FIND, NULL, &rd, 1) >= 0)
+  if (spawn_and_give_stdout(XMLTV_FIND, NULL, &rd, NULL, 1) >= 0)
     outlen = file_readall(rd, &outbuf);
   if (rd >= 0)
     close(rd);
@@ -731,7 +731,7 @@ static void _xmltv_load_grabbers ( void )
           if (!(st.st_mode & S_IEXEC)) continue;
           if (!S_ISREG(st.st_mode)) continue;
           rd = -1;
-          if (spawn_and_give_stdout(bin, argv, &rd, 1) >= 0 &&
+          if (spawn_and_give_stdout(bin, argv, &rd, NULL, 1) >= 0 &&
               (outlen = file_readall(rd, &outbuf)) > 0) {
             close(rd);
             if (outbuf[outlen-1] == '\n') outbuf[outlen-1] = '\0';

diff --git a/src/input/mpegts/iptv/iptv_pipe.c b/src/input/mpegts/iptv/iptv_pipe.c
index 898c48e5cc5a2a9391cf158731e50dd25aad8db2..900349c8e0d24e30e24b05dff3f39536aaa05aa1 100644 (file)
--- a/src/input/mpegts/iptv/iptv_pipe.c
+++ b/src/input/mpegts/iptv/iptv_pipe.c
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <assert.h>
 
 /*
@@ -35,6 +36,7 @@ iptv_pipe_start ( iptv_mux_t *im, const char *_raw, const url_t *url )
 {
   char *argv[64], *f, *raw, *s, *p, *a;
   int i = 1, rd;
+  pid_t pid;
 
   if (strncmp(_raw, "pipe://", 7))
     return -1;
@@ -73,7 +75,7 @@ iptv_pipe_start ( iptv_mux_t *im, const char *_raw, const url_t *url )
   }
   argv[i] = NULL;
 
-  if (spawn_and_give_stdout(raw, argv, &rd, 1)) {
+  if (spawn_and_give_stdout(raw, argv, &rd, &pid, 1)) {
     tvherror("iptv", "Unable to start pipe '%s' (wrong executable?)", raw);
     return -1;
   }
@@ -82,6 +84,7 @@ iptv_pipe_start ( iptv_mux_t *im, const char *_raw, const url_t *url )
   fcntl(rd, F_SETFL, fcntl(rd, F_GETFL) | O_NONBLOCK);
 
   im->mm_iptv_fd = rd;
+  im->im_data = (void *)(intptr_t)pid;
 
   iptv_input_mux_started(im);
   return 0;
@@ -92,6 +95,8 @@ iptv_pipe_stop
   ( iptv_mux_t *im )
 {
   int rd = im->mm_iptv_fd;
+  pid_t pid = (intptr_t)im->im_data;
+  spawn_kill(pid, SIGKILL);
   if (rd > 0)
     close(rd);
   im->mm_iptv_fd = -1;
@@ -103,17 +108,24 @@ iptv_pipe_read ( iptv_mux_t *im )
   int r, rd = im->mm_iptv_fd;
   ssize_t res = 0;
   char buf[64*1024];
+  pid_t pid;
 
-  while (rd > 0 && res < 1024*1024) {
+  while (rd > 0 && res < sizeof(buf)) {
     r = read(rd, buf, sizeof(buf));
     if (r < 0) {
+      if (errno == EAGAIN)
+        break;
       if (ERRNO_AGAIN(errno))
         continue;
-      break;
     }
-    if (!r) {
+    if (r <= 0) {
+      tvherror("iptv", "stdin pipe unexpectedly closed: %s",
+               r < 0 ? strerror(errno) : "No data");
       close(rd);
+      pid = (intptr_t)im->im_data;
+      spawn_kill(pid, SIGKILL);
       im->mm_iptv_fd = -1;
+      im->im_data = NULL;
       break;
     }
     sbuf_append(&im->mm_iptv_buffer, buf, r);

diff --git a/src/spawn.c b/src/spawn.c
index 4cfb48a9aecc22bd1bb612a8c476e5d0dc06f552..ba78a9ed86caa06d16151f7f51d9428a32f0100e 100644 (file)
--- a/src/spawn.c
+++ b/src/spawn.c
@@ -282,6 +282,31 @@ spawn_reaper(void)
   while (spawn_reap(NULL, 0) != -EAGAIN) ;
 }
 
+/**
+ * Kill the pid (only if waiting)
+ */
+int
+spawn_kill(pid_t pid, int sig)
+{
+  int r = -ESRCH;
+  spawn_t *s;
+
+  if (pid > 0) {
+    spawn_reaper();
+
+    pthread_mutex_lock(&spawn_mutex);
+    LIST_FOREACH(s, &spawns, link)
+      if(s->pid == pid)
+        break;
+    if (s) {
+      r = kill(pid, sig);
+      if (r < 0)
+        r = -errno;
+    }
+    pthread_mutex_unlock(&spawn_mutex);
+  }
+  return r;
+}
 
 /**
  * Enqueue a spawn on the pending spawn list
@@ -298,12 +323,13 @@ spawn_enq(const char *name, int pid)
   return s;
 }
 
+
+
 /**
  * Execute the given program and return its standard output as file-descriptor (pipe).
  */
-
 int
-spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
+spawn_and_give_stdout(const char *prog, char *argv[], int *rd, pid_t *pid, int redir_stderr)
 {
   pid_t p;
   int fd[2], f, maxfd;
@@ -374,6 +400,8 @@ spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
   close(fd[1]);
 
   *rd = fd[0];
+  if (pid)
+    *pid = p;
   return 0;
 }
 
@@ -384,7 +412,7 @@ spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
  * The function will return the size of the buffer
  */
 int
-spawnv(const char *prog, char *argv[], int redir_stdout, int redir_stderr)
+spawnv(const char *prog, char *argv[], pid_t *pid, int redir_stdout, int redir_stderr)
 {
   pid_t p, f, maxfd;
   char bin[256];
@@ -445,6 +473,9 @@ spawnv(const char *prog, char *argv[], int redir_stdout, int redir_stderr)
 
   spawn_enq(prog, p);
 
+  if (pid)
+    *pid = p;
+
   return 0;
 }
 

diff --git a/src/spawn.h b/src/spawn.h
index 81b1951b92e25ac0431158d9085dc362894b72d5..f4d5930b6745ae1f11ea65d803ad2273023e425c 100644 (file)
--- a/src/spawn.h
+++ b/src/spawn.h
@@ -25,12 +25,14 @@ void spawn_error ( const char *fmt, ... );
 
 int find_exec ( const char *name, char *out, size_t len );
 
-int spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr);
+int spawn_and_give_stdout(const char *prog, char *argv[], int *rd, pid_t *pid, int redir_stderr);
 
-int spawnv(const char *prog, char *argv[], int redir_stdout, int redir_stderr);
+int spawnv(const char *prog, char *argv[], pid_t *pid, int redir_stdout, int redir_stderr);
 
 int spawn_reap(char *stxt, size_t stxtlen);
 
+int spawn_kill(pid_t pid, int sig);
+
 void spawn_init(void);
 
 void spawn_done(void);