X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=248177943a11b6774b1df1e24242d537f5317b5c;hp=688bb12b59af1020828115bef78055577d158ca6;hb=907b1e90dff65f404907aeff405742030b62671e;hpb=bce6b05695beb988b607eb1dd82c27c1ed841faa

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 688bb12b..24817794 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"
@@ -30,6 +31,9 @@ int keystate;
 static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp;
 static int flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
 static float vsps_cur;
+// P.E.Op.S.
+extern int UseFrameSkip;
+extern float fps_skip;
 
 static int get_cpu_ticks(void)
 {
@@ -124,8 +128,8 @@ static void update_input(void)
 	keystate = actions[IN_BINDTYPE_PLAYER12];
 
 #ifdef X11
-	extern void x11_update_keys(void);
-	x11_update_keys();
+	extern int x11_update_keys(void);
+	keystate |= x11_update_keys();
 #endif
 }
 
@@ -146,6 +150,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 +167,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();
@@ -189,6 +195,10 @@ void pl_frame_limit(void)
 			//printf("usleep %d\n", diff - pl_frame_interval / 2);
 			usleep(diff - pl_frame_interval / 2);
 		}
+		else if (diff < 0 && UseFrameSkip) {
+			// P.E.Op.S. makes skip decision based on this
+			fps_skip = 1000000.0f / (float)-diff;
+		}
 	}
 
 	pcnt_start(PCNT_ALL);
@@ -249,3 +259,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);
+}
+