Run watchdog every 10s #50

If current track has length (unlike internet radios), and play time
has exceeded it, kill its omxplayer.bin via omxwd script.

omxwd kills all omxplayer.bin processes in its own process group,
or just the child of an omxplayer PID supplied on command line.

Makefile

@@ -22,6 +22,7 @@ install:
 	cp init $(DESTDIR)/usr/share/doc/omxd/
 	cp omxd.service $(DESTDIR)/usr/share/doc/omxd/
 	cp logrotate $(DESTDIR)/usr/share/doc/omxd/
+	cp omxwd $(DESTDIR)/usr/bin
 	-perl -lne 'print unless /^omxd$$/' -i $(DESTDIR)/etc/rc.local # Auto migrate from rc.local
 uninstall:
 	-./prerm
@@ -32,6 +33,7 @@ uninstall:
 	-rm $(DESTDIR)/usr/share/man/man1/rpyt.1
 	rm $(DESTDIR)/usr/share/doc/omxd/init
 	rm $(DESTDIR)/usr/share/doc/omxd/logrotate
+	rm $(DESTDIR)/usr/bin/omxwd
 	-./postrm
 start:
 	-./postinst

omxwd

@@ -0,0 +1,21 @@
+#!/bin/sh
+if [ "$1" = -h ]; then
+	cat <<EOF
+omxd watchdog
+Usage: omxwd [pid]
+pid	Optional PID of an omxplayer process.
+Kills all omxplayer.bin processes in pgrp, or just the child of pid.
+EOF
+	exit
+fi
+
+p=$1
+
+read pid comm state ppid pgrp rest </proc/$$/stat
+
+ps -A -o pgid,ppid,pid,args | grep "^ *$pgrp" \
+| while read pgid ppid pid args; do
+	case "$args" in
+	/usr/bin/omxplayer.bin*) [ -z "$p" -o "$p" = $ppid ] && kill -9 $pid;;
+	esac
+done

player.c

@@ -11,6 +11,7 @@
 #include <errno.h>
 
 static void player_quit(int signum);
+static void watchdog(int signum);
 static void drop_priv(void);
 
 struct player {
@@ -38,10 +39,31 @@ static void log_opts(char *prefix);
 static struct { int argc; char **argv; } opts =
               {       -1,        NULL, };
 
+static void watchdog(int signum)
+{
+	char st[LINE_LENGTH] = { 0, };
+	char playing[LINE_LENGTH] = { 0, };
+	int t_play = 0;
+	int t_len = 0;
+	int pid = 0;
+	if (parse_status(st, playing, &t_play, &t_len, &pid) == 0 &&
+	    pid > 0 && t_len > 0 && t_play > t_len) {
+		char cmd[50] = { 0, };
+		strcpy(cmd, "/usr/bin/omxwd ");
+		scatd(cmd, pid);
+		system(cmd);
+	}
+	alarm(10);
+	signal(SIGALRM, watchdog);
+}
+
 struct player *player_new(char *file, char *out, enum pstate state)
 {
-	if (opts.argv == NULL)
+	if (opts.argv == NULL) {
 		init_opts();
+		alarm(10);
+		signal(SIGALRM, watchdog);
+	}
 	if (file == NULL || *file == 0)
 		return NULL;
 	struct player *this = find_free();