--- libaitio/inc/aitio.h 2013/10/21 21:12:41 1.36 +++ libaitio/inc/aitio.h 2013/11/21 12:54:21 1.36.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.36 2013/10/21 21:12:41 misho Exp $ +* $Id: aitio.h,v 1.36.2.1 2013/11/21 12:54:21 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -62,6 +62,7 @@ SUCH DAMAGE. #include #include #include +#include #ifndef STRSIZ @@ -100,11 +101,15 @@ typedef struct { int sock_type; int sock_proto; int sock_fd; + struct timespec sock_timeout; sockaddr_t sock_addr; sockaddr_t sock_peer; ait_val_t sock_buf; + volatile intptr_t sock_kill; + sched_root_task_t *sock_root; + pthread_mutex_t sock_mtx; TAILQ_HEAD(, tagCliSock) sock_cli; } sock_t; @@ -141,9 +146,17 @@ void ioCloseSocket(sock_t ** __restrict s); * * @s = Socket * @arg = Server role = listen backlog queue and Client role = peer address + * @timeout = Socket timeout in ms (default -1 infinit) * return: -1 error or 0 ok */ -int ioUpSocket(sock_t * __restrict s, void *arg); +int ioUpSocket(sock_t * __restrict s, void *arg, int timeout); +/* + * ioLoopSocket() - Start socket scheduler + * + * @s = Socket + * return: -1 error or return result from scheduler + */ +int ioLoopSocket(sock_t * __restrict s); /* * ioAcceptSocket() - Accept clients *