Archives
/
notcurses
mirror of https://github.com/dankamongmen/notcurses
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[input] switch to pthread_cond_clockwait() #2291

Browse Source
pull/2294/head
nick black 3 years ago committed by nick black
parent 864e2710a3
commit a3575ebfd8
1 changed files with 38 additions and 60 deletions
Show Stats Download Patch File Download Diff File

98
src/lib/in.c
Unescape Escape View File

@ -1385,24 +1385,6 @@ getpipes(ipipe pipes[static 2]){
return 0; return 0;
} }
// attempt to set up a pthread_condattr_t such that pthread_cond_timedwait()
// uses CLOCK_MONOTONIC rather than CLOCK_REALTIME. unfortunately, this isn't
// available on all operating systems. return success so long as we can
// initialize the condattr_t; it does not imply successful clock selection =\.
static int
prep_condattr(pthread_condattr_t* cattr){
int e;
if( (e = pthread_condattr_init(cattr)) ){
logerror("couldn't initialize condattr (%s)\n", strerror(e));
return -1;
}
// remember, return success even if this doesn't fly
if( (e = pthread_condattr_setclock(cattr, CLOCK_MONOTONIC)) ){
logwarn("warning: couldn't set CLOCK_MONOTONIC for condvar (%s)\n", strerror(e));
}
return 0;
}
static inline inputctx* static inline inputctx*
create_inputctx(tinfo* ti, FILE* infp, int lmargin, int tmargin, int rmargin, create_inputctx(tinfo* ti, FILE* infp, int lmargin, int tmargin, int rmargin,
int bmargin, ncsharedstats* stats, unsigned drain, int bmargin, ncsharedstats* stats, unsigned drain,
@ -1414,56 +1396,52 @@ create_inputctx(tinfo* ti, FILE* infp, int lmargin, int tmargin, int rmargin,
i->isize = BUFSIZ; i->isize = BUFSIZ;
if( (i->inputs = malloc(sizeof(*i->inputs) * i->isize)) ){ if( (i->inputs = malloc(sizeof(*i->inputs) * i->isize)) ){
if(pthread_mutex_init(&i->ilock, NULL) == 0){ if(pthread_mutex_init(&i->ilock, NULL) == 0){
pthread_condattr_t condattr; if(pthread_cond_init(&i->icond, NULL) == 0){
if(prep_condattr(&condattr) == 0){ if(pthread_mutex_init(&i->clock, NULL) == 0){
if(pthread_cond_init(&i->icond, &condattr) == 0){ if(pthread_cond_init(&i->ccond, NULL) == 0){
if(pthread_mutex_init(&i->clock, NULL) == 0){ if((i->stdinfd = fileno(infp)) >= 0){
if(pthread_cond_init(&i->ccond, &condattr) == 0){ if( (i->initdata = malloc(sizeof(*i->initdata))) ){
if((i->stdinfd = fileno(infp)) >= 0){ if(getpipes(i->readypipes) == 0){
if( (i->initdata = malloc(sizeof(*i->initdata))) ){ memset(&i->amata, 0, sizeof(i->amata));
if(getpipes(i->readypipes) == 0){ if(prep_special_keys(i) == 0){
memset(&i->amata, 0, sizeof(i->amata)); if(set_fd_nonblocking(i->stdinfd, 1, &ti->stdio_blocking_save) == 0){
if(prep_special_keys(i) == 0){ i->termfd = tty_check(i->stdinfd) ? -1 : get_tty_fd(infp);
if(set_fd_nonblocking(i->stdinfd, 1, &ti->stdio_blocking_save) == 0){ memset(i->initdata, 0, sizeof(*i->initdata));
i->termfd = tty_check(i->stdinfd) ? -1 : get_tty_fd(infp); i->initdata->qterm = ti->qterm;
memset(i->initdata, 0, sizeof(*i->initdata)); i->iread = i->iwrite = i->ivalid = 0;
i->initdata->qterm = ti->qterm; i->cread = i->cwrite = i->cvalid = 0;
i->iread = i->iwrite = i->ivalid = 0; i->initdata_complete = NULL;
i->cread = i->cwrite = i->cvalid = 0; i->stats = stats;
i->initdata_complete = NULL; i->ti = ti;
i->stats = stats; i->stdineof = 0;
i->ti = ti;
i->stdineof = 0;
#ifdef __MINGW64__ #ifdef __MINGW64__
i->stdinhandle = ti->inhandle; i->stdinhandle = ti->inhandle;
#endif #endif
i->ibufvalid = 0; i->ibufvalid = 0;
i->linesigs = linesigs_enabled; i->linesigs = linesigs_enabled;
i->tbufvalid = 0; i->tbufvalid = 0;
i->midescape = 0; i->midescape = 0;
i->lmargin = lmargin; i->lmargin = lmargin;
i->tmargin = tmargin; i->tmargin = tmargin;
i->rmargin = rmargin; i->rmargin = rmargin;
i->bmargin = bmargin; i->bmargin = bmargin;
i->drain = drain; i->drain = drain;
i->failed = false; i->failed = false;
logdebug("input descriptors: %d/%d\n", i->stdinfd, i->termfd); logdebug("input descriptors: %d/%d\n", i->stdinfd, i->termfd);
return i; return i;
}
} }
input_free_esctrie(&i->amata);
} }
endpipes(i->readypipes); input_free_esctrie(&i->amata);
} }
free(i->initdata); endpipes(i->readypipes);
} }
pthread_cond_destroy(&i->ccond); free(i->initdata);
} }
pthread_mutex_destroy(&i->clock); pthread_cond_destroy(&i->ccond);
} }
pthread_cond_destroy(&i->icond); pthread_mutex_destroy(&i->clock);
} }
pthread_condattr_destroy(&condattr); pthread_cond_destroy(&i->icond);
} }
pthread_mutex_destroy(&i->ilock); pthread_mutex_destroy(&i->ilock);
} }
@ -2101,7 +2079,7 @@ internal_get(inputctx* ictx, const struct timespec* ts, ncinput* ni){
if(ts == NULL){ if(ts == NULL){
pthread_cond_wait(&ictx->icond, &ictx->ilock); pthread_cond_wait(&ictx->icond, &ictx->ilock);
}else{ }else{
int r = pthread_cond_timedwait(&ictx->icond, &ictx->ilock, ts); int r = pthread_cond_clockwait(&ictx->icond, &ictx->ilock, CLOCK_MONOTONIC, ts);
if(r == ETIMEDOUT){ if(r == ETIMEDOUT){
pthread_mutex_unlock(&ictx->ilock); pthread_mutex_unlock(&ictx->ilock);
return 0; return 0;

Write Preview
Loading…
Cancel
Save