Touch the pid file when frames are processed from RTSP, this allows a…

…n external process to detect that motion has hung so it can be shot in the face and restarted

motion.c

@@ -21,6 +21,7 @@
 #include "event.h"
 #include "picture.h"
 #include "rotate.h"
+#include <utime.h>
 
 /* Forward declarations */
 static int motion_init(struct context *cnt);
@@ -396,6 +397,30 @@ static void motion_remove_pid(void)
 
 }
 
+/**
+ * motion_touch_pid
+ *
+ *   This function touches the pid file, to let an external process detect that motion hasn't hung itself.
+ */
+time_t last_pid_touch = 0;
+void motion_touch_pid(void)
+{
+
+  time_t now = time(NULL);
+  if (now-last_pid_touch < 2) { // Limit the frequency of file touching, because it could end up being expensive.
+    return;
+  }
+  last_pid_touch = now;
+
+  //MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO, "%s: Touching (%s).", cnt_list[0]->conf.pid_file);
+
+  if ((cnt_list[0]->daemon) && (cnt_list[0]->conf.pid_file)) {
+    struct utimbuf new_times;
+    new_times.actime = new_times.modtime = time(NULL);
+    utime(cnt_list[0]->conf.pid_file, &new_times);
+  }
+}
+
 /**
  * motion_detected
  *

motion.h

@@ -458,4 +458,7 @@ FILE * myfopen(const char *, const char *, size_t);
 int myfclose(FILE *);
 size_t mystrftime(const struct context *, char *, size_t, const char *, const struct tm *, const char *, int, unsigned long long);
 int create_path(const char *);
+
+void motion_touch_pid();
+
 #endif /* _INCLUDE_MOTION_H */

netcam_rtsp.c

@@ -302,8 +302,6 @@ static int netcam_read_rtsp_image(netcam_context_ptr netcam)
   if (size_decoded != usual_size_decoded) {
     MOTION_LOG(WRN, TYPE_NETCAM, SHOW_ERRNO, "%s: unusual frame size of %d!", size_decoded);
     usual_size_decoded = size_decoded;
-  } else {
-    MOTION_LOG(DBG, TYPE_NETCAM, SHOW_ERRNO, "%s: usual frame size of %d!", size_decoded);
   }
 
   // at this point, we are finished with the packet and frame, so free them.
@@ -357,6 +355,9 @@ static int netcam_read_rtsp_image(netcam_context_ptr netcam)
 
   pthread_mutex_unlock(&netcam->mutex);
 
+  // We got a frame, so let the watchdog know that we're still alive
+  motion_touch_pid();
+
   return 0;
 }