--- libaitio/src/exec.c 2013/12/12 21:59:01 1.1.2.19 +++ libaitio/src/exec.c 2013/12/12 23:36:31 1.1.2.21 @@ -254,7 +254,6 @@ io_progOpen(prog_t * __restrict prg, u_int execNum) pthread_mutex_lock(&prg->prog_mtx); for (i = 0; (execNum ? ret < execNum : 42) && i < array_Size(prg->prog_fds); i++) if (!array_Get(prg->prog_fds, i)) { - printf("%d) %s!!! %d ret=%d\n", i, __func__, execNum, ret); f = e_popen(prg->prog_name, "r+", &pid); #ifdef POPEN_STREAM if (!f) { @@ -384,7 +383,7 @@ io_progCheck(prog_t * __restrict prg, int re) #else (p = pio_pgetpid((int) array(prg->prog_fds, i, intptr_t)))) #endif - if (waitpid(p->pid, &p->stat, WNOHANG) > 0) { + if (waitpid(p->pid, &p->stat, WNOHANG)) { clrbit(prg->prog_used, i); #ifdef POPEN_STREAM e_pclose(array(prg->prog_fds, i, FILE*)); @@ -445,18 +444,18 @@ io_progAttach(prog_t * __restrict prg, int newOne) } pthread_mutex_unlock(&prg->prog_mtx); - /* not found free program */ - if (!f && (i = io_progOpen2(prg)) > 0) { + /* execute new one program */ + if (newOne) { + if (f) + io_progOpen(prg, 1); + else if ((i = io_progOpen2(prg)) > -1) + /* not found free program */ #ifdef POPEN_STREAM - f = array(prg->prog_fds, i, FILE*); + f = array(prg->prog_fds, i, FILE*); #else - f = array(prg->prog_fds, i, intptr_t); + f = array(prg->prog_fds, i, intptr_t); #endif } - - /* execute new one program */ - if (newOne && f) - io_progOpen(prg, 1); return f; }