From 4ab30ad46130234838c82fe6d8ac4e55721dd46b Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 3 Mar 2009 21:52:07 +0000 Subject: [PATCH] proper timeout handling for input subsys git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@640 be3aeb3a-fb24-0410-a615-afba39da0efa --- common/input.c | 88 ++++++++++++++++++-------------------------------- common/plat.h | 7 +++- linux/plat.c | 61 ++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 57 deletions(-) diff --git a/common/input.c b/common/input.c index 8474f36..0fe8dc1 100644 --- a/common/input.c +++ b/common/input.c @@ -4,6 +4,7 @@ #include "common.h" #include "input.h" +#include "plat.h" #include "../linux/in_evdev.h" #include "../gp2x/in_gp2x.h" @@ -214,17 +215,12 @@ void in_set_blocking(int is_blocking) } while (ret >= 0); } -/* TODO: move.. */ -#include -#include -#include - static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) { - struct timeval start, now; int i, is_down, result; + unsigned int ticks; - gettimeofday(&start, NULL); + ticks = plat_get_ticks_ms(); while (1) { @@ -244,14 +240,10 @@ static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) return result; } - if (timeout_ms >= 0) { - gettimeofday(&now, NULL); - if ((now.tv_sec - start.tv_sec) * 1000 + - (now.tv_usec - start.tv_usec) / 1000 > timeout_ms) - break; - } + if (timeout_ms >= 0 && (int)(plat_get_ticks_ms() - ticks) > timeout_ms) + break; - usleep(10000); + plat_sleep_ms(10); } return -1; @@ -262,9 +254,10 @@ static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) */ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) { - int result = 0, dev_id = 0, is_down, result_menu; + int result = -1, dev_id = 0, is_down, result_menu; int fds_hnds[IN_MAX_DEVS]; int i, ret, count = 0; + unsigned int ticks; in_drv_t *drv; if (in_have_async_devs) { @@ -275,6 +268,8 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) goto finish; } + ticks = plat_get_ticks_ms(); + for (i = 0; i < in_dev_count; i++) { if (in_devices[i].probed) fds_hnds[count++] = in_devices[i].drv_fd_hnd; @@ -286,57 +281,38 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) exit(1); } -again: - /* TODO: move this block to platform/linux */ + while (1) { - struct timeval tv, *timeout = NULL; - int fdmax = -1; - fd_set fdset; - - if (timeout_ms >= 0) { - tv.tv_sec = timeout_ms / 1000; - tv.tv_usec = (timeout_ms % 1000) * 1000; - timeout = &tv; - } - - FD_ZERO(&fdset); - for (i = 0; i < count; i++) { - if (fds_hnds[i] > fdmax) fdmax = fds_hnds[i]; - FD_SET(fds_hnds[i], &fdset); - } + ret = plat_wait_event(fds_hnds, count, timeout_ms); + if (ret < 0) + break; - ret = select(fdmax + 1, &fdset, NULL, NULL, timeout); - if (ret == -1) - { - perror("input: select failed"); - sleep(1); - return -1; + for (i = 0; i < in_dev_count; i++) { + if (in_devices[i].drv_fd_hnd == ret) { + dev_id = i; + break; + } } - if (ret == 0) - return -1; /* timeout */ - - for (i = 0; i < count; i++) - if (FD_ISSET(fds_hnds[i], &fdset)) - ret = fds_hnds[i]; - } + drv = &DRV(in_devices[dev_id].drv_id); + result = drv->update_keycode(in_devices[dev_id].drv_data, &is_down); - for (i = 0; i < in_dev_count; i++) { - if (in_devices[i].drv_fd_hnd == ret) { - dev_id = i; + /* update_keycode() might return -1 when some not interesting + * event happened, like sync event for evdev. */ + if (result >= 0) break; + + if (timeout_ms >= 0) { + unsigned int ticks2 = plat_get_ticks_ms(); + timeout_ms -= ticks2 - ticks; + ticks = ticks2; + if (timeout_ms <= 0) + break; } } - drv = &DRV(in_devices[dev_id].drv_id); - result = drv->update_keycode(in_devices[dev_id].drv_data, &is_down); - - /* update_keycode() might return -1 when some not interesting - * event happened, like sync event for evdev. - * XXX: timeout restarts.. */ if (result == -1) - goto again; - + return -1; finish: /* keep track of menu key state, to allow mixing * in_update_keycode() and in_menu_wait_any() calls */ diff --git a/common/plat.h b/common/plat.h index 27f331f..ca1b3f3 100644 --- a/common/plat.h +++ b/common/plat.h @@ -24,8 +24,13 @@ void plat_video_menu_begin(void); void plat_video_menu_end(void); int plat_is_dir(const char *path); +int plat_wait_event(int *fds_hnds, int count, int timeout_ms); +void plat_sleep_ms(int ms); -const char *plat_get_credits(void); +/* ms counter, to be used for time diff */ +unsigned int plat_get_ticks_ms(void); + +const char *plat_get_credits(void); #ifdef __cplusplus } // extern "C" diff --git a/linux/plat.c b/linux/plat.c index 102af6e..751d97a 100644 --- a/linux/plat.c +++ b/linux/plat.c @@ -1,4 +1,9 @@ +#include #include +#include +#include +#include + #include "../common/plat.h" @@ -12,3 +17,59 @@ int plat_is_dir(const char *path) return 0; } +unsigned int plat_get_ticks_ms(void) +{ + struct timeval tv; + unsigned int ret; + + gettimeofday(&tv, NULL); + + ret = (unsigned)tv.tv_sec * 1000; + /* approximate division */ + ret += ((unsigned)tv.tv_usec * 4195) >> 22; + + return ret; +} + +void plat_sleep_ms(int ms) +{ + usleep(ms * 1000); +} + +int plat_wait_event(int *fds_hnds, int count, int timeout_ms) +{ + struct timeval tv, *timeout = NULL; + int i, ret, fdmax = -1; + fd_set fdset; + + if (timeout_ms >= 0) { + tv.tv_sec = timeout_ms / 1000; + tv.tv_usec = (timeout_ms % 1000) * 1000; + timeout = &tv; + } + + FD_ZERO(&fdset); + for (i = 0; i < count; i++) { + if (fds_hnds[i] > fdmax) fdmax = fds_hnds[i]; + FD_SET(fds_hnds[i], &fdset); + } + + ret = select(fdmax + 1, &fdset, NULL, NULL, timeout); + if (ret == -1) + { + perror("plat_wait_event: select failed"); + sleep(1); + return -1; + } + + if (ret == 0) + return -1; /* timeout */ + + ret = -1; + for (i = 0; i < count; i++) + if (FD_ISSET(fds_hnds[i], &fdset)) + ret = fds_hnds[i]; + + return ret; +} + -- 2.39.2