X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=58c67d27a850790001fbdbe0a8a329b90d78d10f;hp=9f9e958cd00322d911ef578a606aa7361958ad5d;hb=056d67598872b0bac092878972633d6c10aa0ad6;hpb=201c21e2ad6be25a4b843d1434eabb432ce72884 diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 9f9e958c..58c67d27 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -1,5 +1,5 @@ /* - * (C) notaz, 2010 + * (C) notaz, 2010-2011 * * This work is licensed under the terms of the GNU GPLv2 or later. * See the COPYING file in the top-level directory. @@ -9,11 +9,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include "plugin_lib.h" #include "linux/fbdev.h" @@ -21,14 +23,18 @@ #include "common/input.h" #include "omap.h" #include "menu.h" +#include "main.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] = { 127, 127 }, in_a2[2] = { 127, 127 }; 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 vsync_usec_time; static int get_cpu_ticks(void) { @@ -50,10 +56,16 @@ static int get_cpu_ticks(void) return ret; } +static void print_hud(void) +{ + if (pl_fbdev_bpp == 16) + pl_text_out16(2, pl_fbdev_h - 10, "%s", hud_msg); +} + 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,12 +74,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_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; @@ -82,25 +94,42 @@ int pl_fbdev_set_mode(int w, int h, int bpp) 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 (g_opts & OPT_SHOWFPS) - print_fps(); - if (g_opts & OPT_SHOWCPU) - print_cpu_usage(); + + if (pl_fbdev_buf != NULL) { + if (hud_msg[0] != 0) + print_hud(); + else 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) { + struct timeval now; + pl_fbdev_buf = vout_fbdev_flip(layer_fb); omap_enable_layer(1); + + // try to align redraws to vsync + vout_fbdev_wait_vsync(layer_fb); + gettimeofday(&now, 0); + vsync_usec_time = now.tv_usec; + while (vsync_usec_time >= pl_frame_interval) + vsync_usec_time -= pl_frame_interval; + return 0; } @@ -109,46 +138,122 @@ void pl_fbdev_close(void) omap_enable_layer(0); } +void *pl_prepare_screenshot(int *w, int *h, int *bpp) +{ + *w = pl_fbdev_w; + *h = pl_fbdev_h; + *bpp = pl_fbdev_bpp; + + return pl_fbdev_buf; +} + static void update_input(void) { int actions[IN_BINDTYPE_COUNT] = { 0, }; + unsigned int emu_act; in_update(actions); - if (actions[IN_BINDTYPE_EMU] & PEV_MENU) - stop = 1; - keystate = actions[IN_BINDTYPE_PLAYER12]; + if (in_type == PSE_PAD_TYPE_ANALOGPAD) + in_update_analogs(); + emu_act = actions[IN_BINDTYPE_EMU]; + if (emu_act) { + int which = 0; + for (; !(emu_act & 1); emu_act >>= 1, which++) + ; + emu_act = which; + } + emu_set_action(emu_act); + + in_keystate = actions[IN_BINDTYPE_PLAYER12]; + +#ifdef X11 + extern int x11_update_keys(unsigned int *action); + in_keystate |= x11_update_keys(&emu_act); + emu_set_action(emu_act); +#endif +} + +#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, usadj; + + 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); - - if (tv.tv_sec != oldsec) { + gettimeofday(&now, 0); + + 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; - oldsec = tv.tv_sec; + tv_old = now; if (g_opts & OPT_SHOWCPU) tick_per_sec = get_cpu_ticks(); + + if (hud_new_msg > 0) { + hud_new_msg--; + if (hud_new_msg == 0) + hud_msg[0] = 0; + } } #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; + // try to align with vsync + usadj = vsync_usec_time; + while (usadj < tv_expect.tv_usec - pl_frame_interval) + usadj += pl_frame_interval; + tv_expect.tv_usec = usadj; + } + + 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); + } + + if (pl_rearmed_cbs.frameskip) { + if (diff < -pl_frame_interval) + pl_rearmed_cbs.fskip_advice = 1; + else if (diff >= 0) + pl_rearmed_cbs.fskip_advice = 0; + } pcnt_start(PCNT_ALL); } @@ -197,7 +302,65 @@ static void pl_get_layer_pos(int *x, int *y, int *w, int *h) *h = g_layer_h; } -const struct rearmed_cbs pl_rearmed_cbs = { +struct rearmed_cbs pl_rearmed_cbs = { pl_get_layer_pos, + pl_fbdev_open, + pl_fbdev_set_mode, + pl_fbdev_flip, + pl_fbdev_close, }; +/* 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); +} +