--- libaitio/src/exec.c	2013/12/12 21:17:53	1.1.2.18
+++ libaitio/src/exec.c	2013/12/15 22:31:44	1.1.2.22
@@ -173,6 +173,63 @@ io_progCloseAt(prog_t * __restrict prg, u_int idx)
 }
 
 /*
+ * io_progCloseOf() - Close program at pool with certain handle
+ *
+ * @prg = program pool
+ * @h = handle of program
+ * return: 0 error, >0 closed programs
+ */
+int
+#ifdef POPEN_STREAM
+io_progCloseOf(prog_t * __restrict prg, FILE *h)
+#else
+io_progCloseOf(prog_t * __restrict prg, int h)
+#endif
+{
+	register int i;
+	int ret = 0;
+	struct tagPIOPID *p;
+#ifdef POPEN_STREAM
+	FILE *f;
+#else
+	int f;
+#endif
+
+	if (!prg)
+		return 0;
+
+	pthread_mutex_lock(&prg->prog_mtx);
+	for (i = 0; i < array_Size(prg->prog_fds); i++)
+		if (array_Get(prg->prog_fds, i)) {
+#ifdef POPEN_STREAM
+			f = array(prg->prog_fds, i, FILE*);
+			if (f == h && (p = pio_pgetpid(array(prg->prog_fds, i, FILE*)))) {
+#else
+			f = (int) array(prg->prog_fds, i, intptr_t);
+			if (f == h && (p = pio_pgetpid((int) array(prg->prog_fds, i, intptr_t)))) {
+#endif
+				kill(p->pid, SIGTERM);
+				usleep(1000);
+				if (waitpid(p->pid, &p->stat, WNOHANG) > 0)
+					kill(p->pid, SIGKILL);
+#ifdef POPEN_STREAM
+				e_pclose(array(prg->prog_fds, i, FILE*));
+#else
+				e_pclose((int) array(prg->prog_fds, i, intptr_t));
+#endif
+				array_Del(prg->prog_fds, i, 0);
+				clrbit(prg->prog_used, i);
+				prg->prog_cnum--;
+				ret++;
+				break;
+			}
+		}
+	pthread_mutex_unlock(&prg->prog_mtx);
+
+	return ret;
+}
+
+/*
  * io_progOpen2() - Start program from pool on first unused slot
  *
  * @prg = program pool
@@ -302,7 +359,7 @@ io_progGrow(prog_t * __restrict prg, u_int toNum)
 	if (toNum < prg->prog_inin)
 		toNum = prg->prog_inin;
 
-	if ((toNum - prg->prog_cnum) < 1)
+	if ((int) (toNum - prg->prog_cnum) < 1)
 		return 0;
 
 	return io_progOpen(prg, toNum - prg->prog_cnum);
@@ -379,11 +436,11 @@ io_progCheck(prog_t * __restrict prg, int re)
 	for (i = 0; i < array_Size(prg->prog_fds); i++)
 		if (array_Get(prg->prog_fds, i) && 
 #ifdef POPEN_STREAM
-				(p = pio_pgetpid(array(prg->prog_fds, i, FILE*))))
+				(p = pio_pgetpid(array(prg->prog_fds, i, FILE*)))) {
 #else
-				(p = pio_pgetpid((int) array(prg->prog_fds, i, intptr_t))))
+				(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*));
@@ -394,10 +451,11 @@ io_progCheck(prog_t * __restrict prg, int re)
 				prg->prog_cnum--;
 				ret++;
 			}
+		}
 	pthread_mutex_unlock(&prg->prog_mtx);
 
 	/* resurrect to init number */
-	if (re && prg->prog_inin - prg->prog_cnum)
+	if (re && ((int) (prg->prog_inin - prg->prog_cnum) > 0))
 		io_progOpen(prg, prg->prog_inin - prg->prog_cnum);
 
 	return ret;
@@ -443,19 +501,20 @@ io_progAttach(prog_t * __restrict prg, int newOne)
 			break;
 		}
 	pthread_mutex_unlock(&prg->prog_mtx);
+	printf("+ i=%d f=%d\n", i, f);
 
-	/* not found free prog */
-	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;
 }