Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-04 06:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[input] pthread_cond_wait when no timeout

Browse Source
This commit is contained in:
nick black 2021-09-16 02:06:41 -04:00
parent 1d4c62d446
commit 686aac4689
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/in.c
View File

@ -1818,12 +1818,16 @@ internal_get(inputctx* ictx, const struct timespec* ts, ncinput* ni){
}
pthread_mutex_lock(&ictx->ilock);
while(!ictx->ivalid){
if(pthread_cond_timedwait(&ictx->icond, &ictx->ilock, ts)){
if(errno == ETIMEDOUT){
return 0;
if(ts == NULL){
pthread_cond_wait(&ictx->icond, &ictx->ilock);
}else{
if(pthread_cond_timedwait(&ictx->icond, &ictx->ilock, ts)){
if(errno == ETIMEDOUT){
return 0;
}
inc_input_errors(ictx);
return (uint32_t)-1;
}
inc_input_errors(ictx);
return (uint32_t)-1;
}
}
memcpy(ni, &ictx->inputs[ictx->iread], sizeof(*ni));
@ -1849,7 +1853,6 @@ uint32_t notcurses_get(notcurses* nc, const struct timespec* ts, ncinput* ni){
int notcurses_getvec(notcurses* n, const struct timespec* ts,
ncinput* ni, int vcount){
for(int v = 0 ; v < vcount ; ++v){
// FIXME need to manage ts; right now, we could delay up to ts * vcount!
uint32_t u = notcurses_get(n, ts, &ni[v]);
if(u == (uint32_t)-1){
if(v == 0){