frontend: redo frame skip/limiter yet again

[pcsx_rearmed.git] / frontend / plugin_lib.c

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index b4f26f6..17ed79a 100644 (file)
--- 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,10 @@ 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;
+static int plugin_skip_advice;
+// P.E.Op.S.
+extern int UseFrameSkip;
+extern float fps_skip;
 
 static int get_cpu_ticks(void)
 {
@@ -146,6 +151,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 +168,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();
@@ -177,18 +184,25 @@ void pl_frame_limit(void)
        }
 #endif
 
-       if (!(g_opts & OPT_NO_FRAMELIM)) {
-               tvadd(tv_expect, pl_frame_interval);
-               diff = tvdiff(tv_expect, now);
-               if (diff > MAX_LAG_FRAMES * pl_frame_interval || diff < -MAX_LAG_FRAMES * pl_frame_interval) {
-                       //printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
-                       tv_expect = now;
-               }
-               else if (diff > pl_frame_interval) {
-                       // yay for working usleep on pandora!
-                       //printf("usleep %d\n", diff - pl_frame_interval / 2);
-                       usleep(diff - pl_frame_interval / 2);
-               }
+       tvadd(tv_expect, pl_frame_interval);
+       diff = tvdiff(tv_expect, now);
+       if (diff > MAX_LAG_FRAMES * pl_frame_interval || diff < -MAX_LAG_FRAMES * pl_frame_interval) {
+               //printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
+               tv_expect = now;
+               diff = 0;
+       }
+
+       if (!(g_opts & OPT_NO_FRAMELIM) && diff > pl_frame_interval) {
+               // yay for working usleep on pandora!
+               //printf("usleep %d\n", diff - pl_frame_interval / 2);
+               usleep(diff - pl_frame_interval / 2);
+       }
+
+       plugin_skip_advice = 0;
+       if (UseFrameSkip && diff < -pl_frame_interval) {
+               // P.E.Op.S. makes skip decision based on this
+               fps_skip = 1.0f;
+               plugin_skip_advice = 1;
        }
 
        pcnt_start(PCNT_ALL);
@@ -238,14 +252,62 @@ static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
        *h = g_layer_h;
 }
 
-extern int UseFrameSkip; // hmh
-
 const struct rearmed_cbs pl_rearmed_cbs = {
        pl_get_layer_pos,
        pl_fbdev_open,
        pl_fbdev_set_mode,
        pl_fbdev_flip,
        pl_fbdev_close,
-       &UseFrameSkip,
+       &plugin_skip_advice,
 };
 
+/* 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);
+}
+