--- libaitio/src/exec.c 2013/12/05 16:57:08 1.1.2.8 +++ libaitio/src/exec.c 2013/12/05 23:09:00 1.1.2.9 @@ -28,9 +28,18 @@ io_progInit(const char *progName, u_int initNum, u_int prg->prog_maxn = maxNum; strlcpy(prg->prog_name, progName, sizeof prg->prog_name); + prg->prog_used = e_malloc(E_ALIGN(prg->prog_maxn, sizeof *prg->prog_used) / + sizeof *prg->prog_used); + if (!prg->prog_used) { + io_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); + e_free(prg); + return NULL; + } + prg->prog_fds = array_Init(prg->prog_maxn); if (!prg->prog_fds) { io_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); + e_free(prg->prog_used); e_free(prg); return NULL; } @@ -58,6 +67,7 @@ io_progDestroy(prog_t ** __restrict pprg) io_progClose(*pprg, 0); + e_free((*pprg)->prog_used); array_Destroy(&(*pprg)->prog_fds); pthread_mutex_destroy(&(*pprg)->prog_mtx); @@ -91,6 +101,7 @@ io_progClose(prog_t * __restrict prg, u_int closeNum) if (array_Get(prg->prog_fds, i)) { e_pclose(array(prg->prog_fds, i, FILE*)); array_Del(prg->prog_fds, i, 0); + clrbit(prg->prog_used, i); prg->prog_cnum--; ret++; } @@ -190,9 +201,10 @@ io_progVacuum(prog_t * __restrict prg, u_int toNum) pthread_mutex_lock(&prg->prog_mtx); for (i = array_Size(prg->prog_fds) - 1; prg->prog_cnum > toNum && i > -1; i--) - if (array_Get(prg->prog_fds, i)) { + if (array_Get(prg->prog_fds, i) && isset(prg->prog_used, i)) { e_pclose(array(prg->prog_fds, i, FILE*)); array_Del(prg->prog_fds, i, 0); + clrbit(prg->prog_used, i); prg->prog_cnum--; ret++; } @@ -217,11 +229,66 @@ io_progCheck(prog_t * __restrict prg) if (!prg) return -1; + pthread_mutex_lock(&prg->prog_mtx); for (i = 0; i < array_Size(prg->prog_fds); i++) if (array_Get(prg->prog_fds, i) && (p = pio_pgetpid(array(prg->prog_fds, i, FILE*)))) - if (waitpid(p->pid, &p->stat, WNOHANG) > 0) + if (waitpid(p->pid, &p->stat, WNOHANG) > 0) { + clrbit(prg->prog_used, i); ret++; + } + pthread_mutex_unlock(&prg->prog_mtx); return ret; +} + +/* + * io_progAttach() - Attach to open program + * + * @prg = program pool + * return: NULL error or !=NULL attached program handle + */ +FILE * +io_progAttach(prog_t * __restrict prg) +{ + FILE *f = NULL; + register int i; + + if (!prg) + return NULL; + + pthread_mutex_lock(&prg->prog_mtx); + for (i = 0; i < array_Size(prg->prog_fds); i++) + if (array_Get(prg->prog_fds, i) && isclr(prg->prog_used, i)) { + setbit(prg->prog_used, i); + f = array(prg->prog_fds, i, FILE*); + break; + } + pthread_mutex_unlock(&prg->prog_mtx); + + return f; +} + +/* + * io_progDetach() - Detch from open program + * + * @prg= program pool + * @pfd = attached program handle + * return: none + */ +void +io_progDetach(prog_t * __restrict prg, FILE *pfd) +{ + register int i; + + if (!prg || !pfd) + return; + + pthread_mutex_lock(&prg->prog_mtx); + for (i = 0; i < array_Size(prg->prog_fds); i++) + if (array(prg->prog_fds, i, FILE*) == pfd) { + clrbit(prg->prog_used, i); + break; + } + pthread_mutex_unlock(&prg->prog_mtx); }