From 7c0f51de89955f60f5c7304ab8c4a8f8e9b7f185 Mon Sep 17 00:00:00 2001
From: notaz
Date: Thu, 20 Jan 2011 01:29:38 +0200
Subject: add watchdog thread to detect lockups

---
 frontend/main.c       |  3 +++
 frontend/plugin_lib.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--
 frontend/plugin_lib.h |  1 +
 3 files changed, 59 insertions(+), 2 deletions(-)

(limited to 'frontend')

diff --git a/frontend/main.c b/frontend/main.c
index 5f8fd5c..cb37bd7 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -16,6 +16,7 @@
 
 #include "main.h"
 #include "plugin.h"
+#include "plugin_lib.h"
 #include "pcnt.h"
 #include "menu.h"
 #include "../libpcsxcore/misc.h"
@@ -243,6 +244,8 @@ int main(int argc, char *argv[])
 	else
 		menu_loop();
 
+	pl_start_watchdog();
+
 	while (1)
 	{
 		psxCpu->Execute();
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index b4f26f6..287b551 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -14,6 +14,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <pthread.h>
 
 #include "plugin_lib.h"
 #include "linux/fbdev.h"
@@ -146,6 +147,7 @@ static void update_input(void)
 void pl_frame_limit(void)
 {
 	static struct timeval tv_old, tv_expect;
+	static int vsync_cnt_prev;
 	struct timeval now;
 	int diff;
 
@@ -162,9 +164,10 @@ void pl_frame_limit(void)
 		diff = tvdiff(now, tv_old);
 		vsps_cur = 0.0f;
 		if (0 < diff && diff < 2000000)
-			vsps_cur = 1000000.0f * vsync_cnt / diff;
+			vsps_cur = 1000000.0f * (vsync_cnt - vsync_cnt_prev) / diff;
+		vsync_cnt_prev = vsync_cnt;
 		flips_per_sec = flip_cnt;
-		vsync_cnt = flip_cnt = 0;
+		flip_cnt = 0;
 		tv_old = now;
 		if (g_opts & OPT_SHOWCPU)
 			tick_per_sec = get_cpu_ticks();
@@ -249,3 +252,53 @@ const struct rearmed_cbs pl_rearmed_cbs = {
 	&UseFrameSkip,
 };
 
+/* watchdog */
+static void *watchdog_thread(void *unused)
+{
+	int vsync_cnt_old = 0;
+	int seen_dead = 0;
+	int sleep_time = 5;
+
+	while (1)
+	{
+		sleep(sleep_time);
+
+		if (stop) {
+			seen_dead = 0;
+			sleep_time = 5;
+			continue;
+		}
+		if (vsync_cnt != vsync_cnt_old) {
+			vsync_cnt_old = vsync_cnt;
+			seen_dead = 0;
+			sleep_time = 2;
+			continue;
+		}
+
+		seen_dead++;
+		sleep_time = 1;
+		if (seen_dead > 1)
+			fprintf(stderr, "watchdog: seen_dead %d\n", seen_dead);
+		if (seen_dead > 4) {
+			fprintf(stderr, "watchdog: lockup detected, aborting\n");
+			// we can't do any cleanup here really, the main thread is
+			// likely touching resources and would crash anyway
+			abort();
+		}
+	}
+}
+
+void pl_start_watchdog(void)
+{
+	pthread_attr_t attr;
+	pthread_t tid;
+	int ret;
+	
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+	ret = pthread_create(&tid, &attr, watchdog_thread, NULL);
+	if (ret != 0)
+		fprintf(stderr, "could not start watchdog: %d\n", ret);
+}
+
diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
index 22ab285..6b01cea 100644
--- a/frontend/plugin_lib.h
+++ b/frontend/plugin_lib.h
@@ -27,6 +27,7 @@ void *pl_fbdev_flip(void);
 void  pl_fbdev_close(void);
 
 void pl_text_out16(int x, int y, const char *texto, ...);
+void pl_start_watchdog(void);
 
 struct rearmed_cbs {
 	void  (*pl_get_layer_pos)(int *x, int *y, int *w, int *h);
-- 
cgit v1.2.3