--- libaitio/inc/aitio.h 2013/12/05 16:57:08 1.38.10.6 +++ libaitio/inc/aitio.h 2013/12/12 14:56:38 1.38.10.13 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.38.10.6 2013/12/05 16:57:08 misho Exp $ +* $Id: aitio.h,v 1.38.10.13 2013/12/12 14:56:38 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -78,6 +78,17 @@ SUCH DAMAGE. #define IO_ETHER_FILTER_WRITE 2 +typedef struct { + unsigned int prog_inin; /* init progs */ + unsigned int prog_maxn; /* max progs */ + unsigned int prog_cnum; /* current progs */ + char prog_name[PATH_MAX]; + + pthread_mutex_t prog_mtx; + array_t *prog_fds; + unsigned int *prog_used; +} prog_t; + typedef struct tagCliSock sock_cli_t; typedef void *(*sock_cb_t)(sock_cli_t*); struct tagCliSock { @@ -107,6 +118,7 @@ typedef struct { sockaddr_t sock_peer; ait_val_t sock_buf; + prog_t *sock_prog; volatile intptr_t sock_kill; sched_root_task_t *sock_root; @@ -115,17 +127,7 @@ typedef struct { TAILQ_HEAD(, tagCliSock) sock_cli; } sock_t; -typedef struct { - unsigned int prog_inin; /* init progs */ - unsigned int prog_maxn; /* max progs */ - unsigned int prog_cnum; /* current progs */ - char prog_name[PATH_MAX]; - pthread_mutex_t prog_mtx; - array_t *prog_fds; -} prog_t; - - // io_GetErrno() Get error code of last operation int io_GetErrno(); // io_GetError() Get error text of last operation @@ -155,7 +157,8 @@ int io_progOpen(prog_t * __restrict prg, unsigned int * * @prg = program pool * @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 io_progGrow(prog_t * __restrict prg, unsigned int toNum); /* @@ -167,6 +170,14 @@ int io_progGrow(prog_t * __restrict prg, unsigned int */ int io_progVacuum(prog_t * __restrict prg, unsigned int toNum); /* + * 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, unsigned int idx); +/* * io_progClose() - Close all programs in pool * * @prg = program pool @@ -186,9 +197,35 @@ void io_progDestroy(prog_t ** __restrict pprg); * io_progCheck() - Check exit status of program pool * * @prg = program pool + * @re = resurrect program * return: -1 error or >-1 exited programs */ -int io_progCheck(prog_t * __restrict prg); +int io_progCheck(prog_t * __restrict prg, int re); + +/* + * io_progAttach() - Attach to open program + * + * @prg = program pool + * @newOne = Execute new one program after attach + * return: NULL error or !=NULL attached program handle + */ +#ifdef POPEN_STREAM +FILE *io_progAttach(prog_t * __restrict prg, int newOne); +#else +int io_progAttach(prog_t * __restrict prg, int newOne); +#endif +/* + * io_progDetach() - Detch from open program + * + * @prg= program pool + * @pfd = attached program handle + * return: none + */ +#ifdef POPEN_STREAM +void io_progDetach(prog_t * __restrict prg, FILE *pfd); +#else +void io_progDetach(prog_t * __restrict prg, int pfd); +#endif /*