X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=a2fb49515a843c92aaeb7e3ed3baa740794f95ab;hp=7110b35405e2e7dd3ceb0ef79567b88bbb12c860;hb=799b0b8773d6add1de99efd582c93701b82e970d;hpb=3c70c47bb2fa50066c4c3b23813253e03b8751fe diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 7110b354..a2fb4951 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -9,11 +9,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include "plugin_lib.h" #include "linux/fbdev.h" @@ -23,12 +25,18 @@ #include "menu.h" #include "pcnt.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" +#include "../libpcsxcore/psemu_plugin_defs.h" void *pl_fbdev_buf; -int keystate; +int pl_frame_interval; +int in_type, in_keystate, in_a1[2], in_a2[2]; static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp; -static int flip_cnt, flips_per_sec, tick_per_sec; -extern float fps_cur; // XXX +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) { @@ -53,7 +61,7 @@ static int get_cpu_ticks(void) static void print_fps(void) { if (pl_fbdev_bpp == 16) - pl_text_out16(2, pl_fbdev_h - 10, "%2d %4.1f", flips_per_sec, fps_cur); + pl_text_out16(2, pl_fbdev_h - 10, "%2d %4.1f", flips_per_sec, vsps_cur); } static void print_cpu_usage(void) @@ -62,18 +70,12 @@ static void print_cpu_usage(void) pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec); } -int pl_fbdev_init(void) -{ - pl_fbdev_buf = vout_fbdev_flip(layer_fb); - return 0; -} - -int pl_fbdev_set_mode(int w, int h, int bpp) +void *pl_fbdev_set_mode(int w, int h, int bpp) { void *ret; if (w == pl_fbdev_w && h == pl_fbdev_h && bpp == pl_fbdev_bpp) - return 0; + return pl_fbdev_buf; pl_fbdev_w = w; pl_fbdev_h = h; @@ -86,59 +88,126 @@ int pl_fbdev_set_mode(int w, int h, int bpp) else pl_fbdev_buf = ret; - menu_notify_mode_change(w, h); + menu_notify_mode_change(w, h, bpp); - return (ret != NULL) ? 0 : -1; + return pl_fbdev_buf; } -void pl_fbdev_flip(void) +void *pl_fbdev_flip(void) +{ + flip_cnt++; + + if (pl_fbdev_buf != NULL) { + if (g_opts & OPT_SHOWFPS) + print_fps(); + if (g_opts & OPT_SHOWCPU) + print_cpu_usage(); + } + + // let's flip now + pl_fbdev_buf = vout_fbdev_flip(layer_fb); + return pl_fbdev_buf; +} + +int pl_fbdev_open(void) +{ + pl_fbdev_buf = vout_fbdev_flip(layer_fb); + omap_enable_layer(1); + return 0; +} + +void pl_fbdev_close(void) +{ + omap_enable_layer(0); +} + +static void update_input(void) { - /* doing input here because the pad is polled - * thousands of times for some reason */ int actions[IN_BINDTYPE_COUNT] = { 0, }; in_update(actions); + if (in_type == PSE_PAD_TYPE_ANALOGPAD) + in_update_analogs(); if (actions[IN_BINDTYPE_EMU] & PEV_MENU) stop = 1; - keystate = actions[IN_BINDTYPE_PLAYER12]; - - flip_cnt++; - print_fps(); - print_cpu_usage(); + in_keystate = actions[IN_BINDTYPE_PLAYER12]; - // let's flip now - pl_fbdev_buf = vout_fbdev_flip(layer_fb); +#ifdef X11 + extern int x11_update_keys(void); + in_keystate |= x11_update_keys(); +#endif } -void pl_fbdev_finish(void) -{ +#define MAX_LAG_FRAMES 3 + +#define tvdiff(tv, tv_old) \ + ((tv.tv_sec - tv_old.tv_sec) * 1000000 + tv.tv_usec - tv_old.tv_usec) +// assumes us < 1000000 +#define tvadd(tv, us) { \ + tv.tv_usec += us; \ + if (tv.tv_usec >= 1000000) { \ + tv.tv_usec -= 1000000; \ + tv.tv_sec++; \ + } \ } /* called on every vsync */ void pl_frame_limit(void) { - extern void CheckFrameRate(void); - static int oldsec; - struct timeval tv; + static struct timeval tv_old, tv_expect; + static int vsync_cnt_prev; + struct timeval now; + int diff; + + vsync_cnt++; + + /* doing input here because the pad is polled + * thousands of times per frame for some reason */ + update_input(); pcnt_end(PCNT_ALL); - gettimeofday(&tv, 0); + gettimeofday(&now, 0); - if (tv.tv_sec != oldsec) { + if (now.tv_sec != tv_old.tv_sec) { + diff = tvdiff(now, tv_old); + vsps_cur = 0.0f; + if (0 < diff && diff < 2000000) + vsps_cur = 1000000.0f * (vsync_cnt - vsync_cnt_prev) / diff; + vsync_cnt_prev = vsync_cnt; flips_per_sec = flip_cnt; flip_cnt = 0; - tick_per_sec = get_cpu_ticks(); - oldsec = tv.tv_sec; + tv_old = now; + if (g_opts & OPT_SHOWCPU) + tick_per_sec = get_cpu_ticks(); } #ifdef PCNT static int ya_vsync_count; if (++ya_vsync_count == PCNT_FRAMES) { - pcnt_print(fps_cur); + pcnt_print(vsps_cur); ya_vsync_count = 0; } #endif - CheckFrameRate(); + 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); } @@ -179,3 +248,74 @@ void pl_text_out16(int x, int y, const char *texto, ...) pl_text_out16_(x, y, buffer); } +static void pl_get_layer_pos(int *x, int *y, int *w, int *h) +{ + *x = g_layer_x; + *y = g_layer_y; + *w = g_layer_w; + *h = g_layer_h; +} + +const struct rearmed_cbs pl_rearmed_cbs = { + pl_get_layer_pos, + pl_fbdev_open, + pl_fbdev_set_mode, + pl_fbdev_flip, + pl_fbdev_close, + &plugin_skip_advice, +}; + +/* watchdog */ +static void *watchdog_thread(void *unused) +{ + int vsync_cnt_old = 0; + int seen_dead = 0; + int sleep_time = 5; + +#ifndef NDEBUG + // don't interfere with debug + return NULL; +#endif + 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); +} +