--- libaitio/inc/aitio.h 2012/08/01 00:37:07 1.23 +++ libaitio/inc/aitio.h 2012/09/19 15:19:53 1.26 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.23 2012/08/01 00:37:07 misho Exp $ +* $Id: aitio.h,v 1.26 2012/09/19 15:19:53 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -50,12 +50,14 @@ SUCH DAMAGE. #define COMPAT_43TTY #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -168,6 +170,8 @@ typedef struct { #define AIT_GET_DATA(_vl) (assert(AIT_TYPE((_vl)) == data), (_vl)->val_data) #define AIT_GET_BUF(_vl) (assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer) #define AIT_GET_STR(_vl) (assert(AIT_TYPE((_vl)) == string), (char*) (_vl)->val.string) +#define AIT_GET_STRZ(_vl) (assert(AIT_TYPE((_vl)) == string), (_vl)->val.string ? \ + (char*) (_vl)->val.string : "") #define AIT_GET_BLOB(_vl) (assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob) #define AIT_GET_U8(_vl) (assert(AIT_TYPE((_vl)) == u8), (_vl)->val.u8) #define AIT_GET_U16(_vl) (assert(AIT_TYPE((_vl)) == u16), (_vl)->val.u16) @@ -214,7 +218,7 @@ typedef struct { } } while (0) #define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); const char *__s = (_v); assert(__val); \ __val->val_type = string; \ - if (__s && *__s) { \ + if (__s) { \ __val->val.string = (int8_t*) io_strdup(__s); \ AIT_LEN(__val) = strlen((const char*) \ __val->val.string) + 1; \ @@ -241,6 +245,8 @@ typedef struct { void *__p = io_realloc(__val->val.string, AIT_LEN(__val) + __l); \ if (__p) { \ AIT_LEN(__val) += __l; \ + if (!__val->val.string) \ + memset(__p, 0, AIT_LEN(__val)); \ __val->val.string = __p; \ strlcat((char*) __val->val.string, __s, \ AIT_LEN(__val)); \ @@ -310,16 +316,16 @@ typedef struct { __val->val_type = f64; __val->val.f64 = _n; \ AIT_LEN(__val) = sizeof(double); } while (0) -#define AIT_COPY_VAL(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \ - memcpy(__val, (_v), sizeof(ait_val_t)); \ - switch (AIT_TYPE(__val)) { \ +#define AIT_COPY_VAL(_vl, _v) do { assert((_vl)); assert((_v)); \ + memcpy((_vl), (_v), sizeof(ait_val_t)); \ + switch (AIT_TYPE((_vl))) { \ case buffer: \ - AIT_SET_BUF(__val, \ + AIT_SET_BUF((_vl), \ AIT_GET_BUF((_v)), \ AIT_LEN((_v))); \ break; \ case string: \ - AIT_SET_STR(__val, \ + AIT_SET_STR((_vl), \ AIT_GET_STR((_v))); \ break; \ default: \ @@ -337,6 +343,7 @@ typedef struct { AIT_INIT_VAL((_vl)); \ (_vl)->val_type = _t; \ } while (0) +#define AIT_SET_LIKE(_vl, _t, _l, _v) (assert((_vl)), io_setlikeVar((_vl), _t, _l, _v)) /* if attribute zeroCopy is set not execute io_free() */ #define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ switch (AIT_TYPE(__val)) { \ @@ -394,7 +401,7 @@ typedef union { #define IO_SOCKADDR_INIT { .ss = { 0 } } -#define io_align(x, a) (((x) + (a)) & ~(a)) +#define io_align(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) // io_GetErrno() Get error code of last operation @@ -430,6 +437,13 @@ extern void (*io_free)(void*); /* + * io_usleep() - usleep() replacement for ELWIX + * + * @usec = microseconds for sleep + * return: -1 interrupted by signal or 0 ok + */ +inline int io_usleep(unsigned int usec); +/* * io_ether_ntoa() - Convert ethernet address to string * * @n = ethernet address structure, like struct ether_addr @@ -538,6 +552,41 @@ inline void io_freeVar(ait_val_t ** __restrict val); */ ait_val_t *io_makeVar(ait_type_t type, ...); /* + * io_setlikeVar() - Set variable like ... + * + * @v = variable + * @t = type of data + * @l = length of data + * @... = data + * return: -1 error or 0 ok + */ +inline int io_setlikeVar(ait_val_t * __restrict v, ait_type_t t, u_int l, ...); +/* + * io_sprintfVar() - Builtin string variable from formatted input + * + * @v = variable + * @fmt = format string + * @... = argument(s) + * return: -1 error or >0 copied bytes to variable + */ +int io_sprintfVar(ait_val_t * __restrict v, const char *fmt, ...); +/* + * io_cmpVar() - Compare two variables + * + * @a = 1st variable + * @b = 2nd variable + * return: 0 is equal or !=0 is different + */ +inline int io_cmpVar(ait_val_t * __restrict a, ait_val_t * __restrict b); +/* + * io_hashVar() - Generate hash key for variable from string or value + * + * @v = variable + * @key = key string for hash, if =NULL hash will built from variable + * return: hash key + */ +unsigned short io_hashVar(ait_val_t * __restrict v, const char * __restrict key); +/* * io_allocVars() - Allocate ait_val_t array * * @varnum = Number of variables @@ -592,6 +641,21 @@ inline void io_sortVarsByVal(array_t * __restrict vars * return: NULL error or not found, !=NULL valid element */ ait_val_t *io_findKeyVars(array_t * __restrict vars, u_short key); +/* + * io_findKeyHash() - Find variable by hash string from array + * + * @vars = Variables + * @key = Search string + * return: NULL error or not found, !=NULL valid element + */ +inline ait_val_t *io_findKeyHash(array_t * __restrict vars, const char * __restrict key); +/* + * io_hashKeyVars() - Generate hash keys for variables + * + * @vars = Variables + * return -1 error or 0 ok + */ +inline int io_hashKeyVars(array_t * __restrict vars); /* @@ -1016,7 +1080,44 @@ int ioMkDir(const char *csDir, int mode); int ioWatchDirLoop(const char *csDir, int (*callback)(const char *csName, int nOp)); +#ifdef AIO_OPS /* + * io_aiobulk() - AIO bulk R/W function + * + * @mode = Bulk wait mode + * @acbs = List of aiocb structures + * @nacb = Number of aiocb in list + * @sig = Event for completed operations, may be =NULL + * return: -1 error or 0 ok + */ +inline int io_aiobulk(int mode, struct aiocb ** __restrict acbs, int nacb, + struct sigevent *sig); +#endif +/* + * io_rreadv() - Raw VFS bulk read function + * + * @fd = File handle + * @bufs = Read buffers + * @nbufs = Number of read buffers + * @offset = Read from position, if -1 read nbytes from current position + * @update = Update file handle position !0 + * return: -1 error or !=-1 readed bytes + */ +int io_rreadv(int fd, struct iovec * __restrict bufs, int nbufs, off_t offset, + int update); +/* + * io_rwritev() - Raw VFS bulk write function + * + * @fd = File handle + * @bufs = Write buffers + * @nbufs = Number of write buffers + * @offset = Write to position, if -1 write nbytes to current position + * @update = Update file handle position !0 + * return: -1 error or !=-1 written bytes + */ +int io_rwritev(int fd, struct iovec * __restrict bufs, int nbufs, off_t offset, + int update); +/* * io_rread() - Raw VFS read function * * @fd = File handle @@ -1026,7 +1127,8 @@ int ioWatchDirLoop(const char *csDir, int (*callback)( * @update = Update file handle position !0 * return: -1 error or !=-1 readed bytes */ -inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update); +inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, + int update); /* * io_rwrite() - Raw VFS write function * @@ -1035,9 +1137,10 @@ inline int io_rread(int fd, void * __restrict buf, siz * @nbytes = Write bytes from buffer * @offset = Write at position, if -1 write nbytes from current position * @update = Update file handle position !0 - * return: -1 error or !=-1 writed bytes + * return: -1 error or !=-1 written bytes */ -inline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update); +inline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, + int update); /* Disk I/O helper macros */ #define io_read(f, b, n) io_rread(f, b, n, -1, 1)