libaitio/src/exec.c - diff

Return to exec.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / src

Diff for /libaitio/src/exec.c between versions 1.1.2.12 and 1.1.2.18

version 1.1.2.12, 2013/12/06 01:30:22	version 1.1.2.18, 2013/12/12 21:17:53
Line 71 io_progDestroy(prog_t ** __restrict pprg)	Line 71 io_progDestroy(prog_t ** __restrict pprg)
e_free((*pprg)->prog_used);	e_free((*pprg)->prog_used);
array_Destroy(&(*pprg)->prog_fds);	array_Destroy(&(*pprg)->prog_fds);
pthread_mutex_destroy(&(*pprg)->prog_mtx);	pthread_mutex_destroy(&(*pprg)->prog_mtx);
	signal(SIGPIPE, SIG_DFL);

e_free(*pprg);	e_free(*pprg);
*pprg = NULL;	*pprg = NULL;
Line 88 io_progClose(prog_t * __restrict prg, u_int closeNum)	Line 89 io_progClose(prog_t * __restrict prg, u_int closeNum)
{	{
register int i;	register int i;
int ret = 0;	int ret = 0;
	struct tagPIOPID *p;

if (!prg)	if (!prg)
return 0;	return 0;
Line 99 io_progClose(prog_t * __restrict prg, u_int closeNum)	Line 101 io_progClose(prog_t * __restrict prg, u_int closeNum)
pthread_mutex_lock(&prg->prog_mtx);	pthread_mutex_lock(&prg->prog_mtx);
for (i = array_Size(prg->prog_fds) - 1;	for (i = array_Size(prg->prog_fds) - 1;
(closeNum ? ret < closeNum : 42) && i > -1; i--)	(closeNum ? ret < closeNum : 42) && i > -1; i--)
if (array_Get(prg->prog_fds, i)) {	if (array_Get(prg->prog_fds, i) &&
#ifdef POPEN_STREAM	#ifdef POPEN_STREAM
	(p = pio_pgetpid(array(prg->prog_fds, i, FILE*)))) {
	#else
	(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*));	e_pclose(array(prg->prog_fds, i, FILE*));
#else	#else
e_pclose((int) array(prg->prog_fds, i, intptr_t));	e_pclose((int) array(prg->prog_fds, i, intptr_t));
Line 116 io_progClose(prog_t * __restrict prg, u_int closeNum)	Line 127 io_progClose(prog_t * __restrict prg, u_int closeNum)
}	}

/*	/*
	* io_progCloseAt() - Close program at pool of certain position
	*
	* @prg = program pool
	* @idx = index at pool
	* return: 0 error or !=0 closed program
	*/
	int
	io_progCloseAt(prog_t * __restrict prg, u_int idx)
	{
	int ret = 0;
	struct tagPIOPID *p;

	if (!prg)
	return 0;
	if (idx > prg->prog_maxn) {
	io_SetErr(EINVAL, "Requested number for close program is over pool's limit");
	return 0;
	}

	pthread_mutex_lock(&prg->prog_mtx);
	if (array_Get(prg->prog_fds, idx) &&
	#ifdef POPEN_STREAM
	(p = pio_pgetpid(array(prg->prog_fds, idx, FILE*)))) {
	#else
	(p = pio_pgetpid((int) array(prg->prog_fds, idx, 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, idx, FILE*));
	#else
	e_pclose((int) array(prg->prog_fds, idx, intptr_t));
	#endif
	array_Del(prg->prog_fds, idx, 0);
	clrbit(prg->prog_used, idx);
	prg->prog_cnum--;
	ret++;
	}
	pthread_mutex_unlock(&prg->prog_mtx);

	return ret;
	}

	/*
	* io_progOpen2() - Start program from pool on first unused slot
	*
	* @prg = program pool
	* return: -1 error, >-1 reside at slot
	*/
	int
	io_progOpen2(prog_t * __restrict prg)
	{
	#ifdef POPEN_STREAM
	FILE *f = NULL;
	#else
	int f = -1;
	#endif
	int stat, ret = -1;
	register int i;
	pid_t pid;

	if (!prg)
	return -1;
	if (prg->prog_cnum + 1 > prg->prog_maxn) {
	io_SetErr(EINVAL, "Requested number for program execution is over pool's limit");
	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)) {
	f = e_popen(prg->prog_name, "r+", &pid);
	#ifdef POPEN_STREAM
	if (!f) {
	#else
	if (f == -1) {
	#endif
	LOGERR;
	break;
	} else if (waitpid(pid, &stat, WNOHANG)) {
	io_SetErr(ECHILD, "Program with pid=%d exit with status %d",
	pid, WIFEXITED(stat) ? WEXITSTATUS(stat) : -1);
	e_pclose(f);
	break;
	} else
	array_Set(prg->prog_fds, i, f);
	clrbit(prg->prog_used, i);
	prg->prog_cnum++;
	ret = i;
	break;
	}
	pthread_mutex_unlock(&prg->prog_mtx);

	return ret;
	}

	/*
* io_progOpen() - Execute number of program(s)	* io_progOpen() - Execute number of program(s)
*	*
* @prg = program pool	* @prg = program pool
* @execNum = execute program(s) (0 max)	* @execNum = execute program(s) (0 max)
* return: 0 error, >0 executed programs and abs(<0) executed programs with logged error	* return: -1 error, >0 executed programs
*/	*/
int	int
io_progOpen(prog_t * __restrict prg, u_int execNum)	io_progOpen(prog_t * __restrict prg, u_int execNum)
Line 135 io_progOpen(prog_t * __restrict prg, u_int execNum)	Line 245 io_progOpen(prog_t * __restrict prg, u_int execNum)
pid_t pid;	pid_t pid;

if (!prg)	if (!prg)
return 0;	return -1;
if (prg->prog_cnum + execNum > prg->prog_maxn) {	if (prg->prog_cnum + execNum > prg->prog_maxn) {
io_SetErr(EINVAL, "Requested number for program execution is over pool's limit");	io_SetErr(EINVAL, "Requested number for program execution is over pool's limit");
return 0;	return -1;
}	}

pthread_mutex_lock(&prg->prog_mtx);	pthread_mutex_lock(&prg->prog_mtx);
Line 156 io_progOpen(prog_t * __restrict prg, u_int execNum)	Line 266 io_progOpen(prog_t * __restrict prg, u_int execNum)
} else if (waitpid(pid, &stat, WNOHANG)) {	} else if (waitpid(pid, &stat, WNOHANG)) {
io_SetErr(ECHILD, "Program with pid=%d exit with status %d",	io_SetErr(ECHILD, "Program with pid=%d exit with status %d",
pid, WIFEXITED(stat) ? WEXITSTATUS(stat) : -1);	pid, WIFEXITED(stat) ? WEXITSTATUS(stat) : -1);
	e_pclose(f);
ret = -1;	ret = -1;
break;	break;
} else	} else
array_Set(prg->prog_fds, i, f);	array_Set(prg->prog_fds, i, f);
	clrbit(prg->prog_used, i);
prg->prog_cnum++;	prg->prog_cnum++;
ret++;	ret++;
}	}
Line 173 io_progOpen(prog_t * __restrict prg, u_int execNum)	Line 285 io_progOpen(prog_t * __restrict prg, u_int execNum)
*	*
* @prg = program pool	* @prg = program pool
* @toNum = execute to number of programs (0 max)	* @toNum = execute to number of programs (0 max)
* return: 0 error, >0 executed programs and abs(<0) executed programs with logged error	* return: 0 error or nothing to do,
	* >0 executed programs and abs(<0) executed programs with logged error
*/	*/
int	int
io_progGrow(prog_t * __restrict prg, u_int toNum)	io_progGrow(prog_t * __restrict prg, u_int toNum)
Line 186 io_progGrow(prog_t * __restrict prg, u_int toNum)	Line 299 io_progGrow(prog_t * __restrict prg, u_int toNum)
}	}
if (!toNum)	if (!toNum)
toNum = prg->prog_maxn;	toNum = prg->prog_maxn;
	if (toNum < prg->prog_inin)
	toNum = prg->prog_inin;

	if ((toNum - prg->prog_cnum) < 1)
	return 0;

return io_progOpen(prg, toNum - prg->prog_cnum);	return io_progOpen(prg, toNum - prg->prog_cnum);
}	}

Line 202 io_progVacuum(prog_t * __restrict prg, u_int toNum)	Line 320 io_progVacuum(prog_t * __restrict prg, u_int toNum)
{	{
register int i;	register int i;
int ret = 0;	int ret = 0;
	struct tagPIOPID *p;

if (!prg)	if (!prg)
return 0;	return 0;
Line 214 io_progVacuum(prog_t * __restrict prg, u_int toNum)	Line 333 io_progVacuum(prog_t * __restrict prg, u_int toNum)

pthread_mutex_lock(&prg->prog_mtx);	pthread_mutex_lock(&prg->prog_mtx);
for (i = array_Size(prg->prog_fds) - 1; prg->prog_cnum > toNum && i > -1; i--)	for (i = array_Size(prg->prog_fds) - 1; prg->prog_cnum > toNum && i > -1; i--)
if (array_Get(prg->prog_fds, i) && isclr(prg->prog_used, i)) {	if (array_Get(prg->prog_fds, i) && isclr(prg->prog_used, i) &&
#ifdef POPEN_STREAM	#ifdef POPEN_STREAM
	(p = pio_pgetpid(array(prg->prog_fds, i, FILE*)))) {
	kill(p->pid, SIGTERM);
	usleep(1000);
	if (waitpid(p->pid, &p->stat, WNOHANG) > 0)
	kill(p->pid, SIGKILL);
e_pclose(array(prg->prog_fds, i, FILE*));	e_pclose(array(prg->prog_fds, i, FILE*));
#else	#else
	(p = pio_pgetpid((int) array(prg->prog_fds, i, intptr_t)))) {
	kill(p->pid, SIGTERM);
	usleep(1000);
	if (waitpid(p->pid, &p->stat, WNOHANG) > 0)
	kill(p->pid, SIGKILL);
e_pclose((int) array(prg->prog_fds, i, intptr_t));	e_pclose((int) array(prg->prog_fds, i, intptr_t));
#endif	#endif
array_Del(prg->prog_fds, i, 0);	array_Del(prg->prog_fds, i, 0);
Line 233 io_progVacuum(prog_t * __restrict prg, u_int toNum)	Line 362 io_progVacuum(prog_t * __restrict prg, u_int toNum)
* io_progCheck() - Check exit status of program pool	* io_progCheck() - Check exit status of program pool
*	*
* @prg = program pool	* @prg = program pool
	* @re = resurrect program to init number
* return: -1 error or >-1 exited programs	* return: -1 error or >-1 exited programs
*/	*/
int	int
io_progCheck(prog_t * __restrict prg)	io_progCheck(prog_t * __restrict prg, int re)
{	{
int ret = 0;	int ret = 0;
struct tagPIOPID *p;	struct tagPIOPID *p;
Line 255 io_progCheck(prog_t * __restrict prg)	Line 385 io_progCheck(prog_t * __restrict prg)
#endif	#endif
if (waitpid(p->pid, &p->stat, WNOHANG) > 0) {	if (waitpid(p->pid, &p->stat, WNOHANG) > 0) {
clrbit(prg->prog_used, i);	clrbit(prg->prog_used, i);
	#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);
	prg->prog_cnum--;
ret++;	ret++;
}	}
pthread_mutex_unlock(&prg->prog_mtx);	pthread_mutex_unlock(&prg->prog_mtx);

	/* resurrect to init number */
	if (re && prg->prog_inin - prg->prog_cnum)
	io_progOpen(prg, prg->prog_inin - prg->prog_cnum);

return ret;	return ret;
}	}

Line 266 io_progCheck(prog_t * __restrict prg)	Line 407 io_progCheck(prog_t * __restrict prg)
* io_progAttach() - Attach to open program	* io_progAttach() - Attach to open program
*	*
* @prg = program pool	* @prg = program pool
	* @newOne = Execute new one program after attach
* return: NULL error or !=NULL attached program handle	* return: NULL error or !=NULL attached program handle
*/	*/
#ifdef POPEN_STREAM	#ifdef POPEN_STREAM
Line 273 FILE *	Line 415 FILE *
#else	#else
int	int
#endif	#endif
io_progAttach(prog_t * __restrict prg)	io_progAttach(prog_t * __restrict prg, int newOne)
{	{
#ifdef POPEN_STREAM	#ifdef POPEN_STREAM
FILE *f = NULL;	FILE *f = NULL;
Line 301 io_progAttach(prog_t * __restrict prg)	Line 443 io_progAttach(prog_t * __restrict prg)
break;	break;
}	}
pthread_mutex_unlock(&prg->prog_mtx);	pthread_mutex_unlock(&prg->prog_mtx);

	/* not found free prog */
	if (!f && (i = io_progOpen2(prg)) > 0) {
	#ifdef POPEN_STREAM
	f = array(prg->prog_fds, i, FILE*);
	#else
	f = array(prg->prog_fds, i, intptr_t);
	#endif
	}

	/* execute new one program */
	if (newOne && f)
	io_progOpen(prg, 1);

return f;	return f;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.12
changed lines
	Added in v.1.1.2.18