--- libaitio/inc/aitio.h 2012/07/25 15:11:27 1.21.2.1 +++ libaitio/inc/aitio.h 2012/08/02 00:47:46 1.24 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.21.2.1 2012/07/25 15:11:27 misho Exp $ +* $Id: aitio.h,v 1.24 2012/08/02 00:47:46 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 @@ -180,14 +182,14 @@ typedef struct { #define AIT_GET_F32(_vl) (assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32) #define AIT_GET_F64(_vl) (assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64) -#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = (_vl); \ - __val = io_realloc(__val, sizeof(ait_val_t) + _len); \ +#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = io_realloc((_vl), (sizeof(ait_val_t) + _len)); \ if (__val) { \ + void *__p = (_p); \ + if (__p) \ + memcpy(__val->val_data, __p, _len); \ __val->val_type = data; AIT_LEN(__val) = _len; \ - if ((_p)) \ - memcpy(__val->val_data, (_p), _len); \ + (_vl) = __val; \ } \ - (_vl) = __val; \ } while (0); #define AIT_SET_PTR(_vl, _p, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val_type = ptr; __val->val.ptr = _p; \ @@ -203,36 +205,79 @@ typedef struct { __val->val_type = buffer; AIT_LEN(__val) = _len; \ memset(__val->val.buffer, _c, _len); \ } } while (0) -#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \ +#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); void *__p = (_v); assert(__val); \ __val->val.buffer = io_malloc(_len); \ if (__val->val.buffer) { \ __val->val_type = buffer; AIT_LEN(__val) = _len; \ - if ((_v)) \ - memcpy(__val->val.buffer, (_v), _len); \ + if (__p) \ + memcpy(__val->val.buffer, __p, _len); \ else \ memset(__val->val.buffer, 0, _len); \ } } while (0) -#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ - __val->val.string = (int8_t*) io_strdup((_v)); \ +#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) { \ + __val->val.string = (int8_t*) io_strdup(__s); \ + AIT_LEN(__val) = strlen((const char*) \ + __val->val.string) + 1; \ + } else { \ + __val->val.string = NULL; \ + AIT_LEN(__val) = 0; \ + } \ + } while (0) +#define AIT_SET_STRSIZ(_vl, _len) do { ait_val_t *__val = (_vl); assert(__val); \ + __val->val.string = (int8_t*) io_malloc(_len); \ if (__val->val.string) { \ - __val->val_type = string; \ - AIT_LEN(__val) = strlen((_v)) + 1; \ + __val->val_type = string; AIT_LEN(__val) = _len; \ + memset(__val->val.string, 0, _len); \ + } \ + } while (0) +#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); const char *__s = (_v); int __l; \ + assert(__val); assert(AIT_TYPE(__val) == string); \ + if (!__s || !*__s) \ + break; \ + else \ + __l = strlen(__s); \ + if (!__val->val.string) \ + __l++; \ + void *__p = io_realloc(__val->val.string, AIT_LEN(__val) + __l); \ + if (__p) { \ + AIT_LEN(__val) += __l; \ + __val->val.string = __p; \ + strlcat((char*) __val->val.string, __s, \ + AIT_LEN(__val)); \ + } \ + } while (0) +#define AIT_SET_STRCPY(_vl, _v) do { ait_val_t *__val = (_vl); const char *__s = (_v); int __l; \ + assert(__val); assert(AIT_TYPE(__val) == string); \ + if (!__s || !*__s) \ + break; \ + else \ + __l = strlen(__s) + 1; \ + void *__p = io_realloc(__val->val.string, __l); \ + if (__p) { \ + AIT_LEN(__val) = __l; \ + __val->val.string = __p; \ + strlcpy((char*) __val->val.string, __s, \ + AIT_LEN(__val)); \ } } while (0) -#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ - assert(AIT_TYPE(__val) == string); \ - void *__p = io_realloc(__val->val.string, \ - AIT_LEN(__val) + strlen((_v))); \ +#define AIT_SET_STRLCPY(_vl, _v, _len) do { ait_val_t *__val = (_vl); const char *__s = (_v); \ + assert(__val); assert(AIT_TYPE(__val) == string); \ + if (!__s || !*__s) \ + break; \ + void *__p = io_realloc(__val->val.string, _len); \ if (__p) { \ + AIT_LEN(__val) = _len; \ __val->val.string = __p; \ - AIT_LEN(__val) += strlen((_v)); \ - strlcat((char*) __val->val.string, (_v), \ + strlcpy((char*) __val->val.string, __s, \ AIT_LEN(__val)); \ } } while (0) #define AIT_SET_BLOB(_vl, _n, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val_type = blob; __val->val.blob = _n; \ AIT_LEN(__val) = _len; } while (0) #define AIT_SET_BLOB2(_vl, _bv) do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \ - __val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \ + __val->val_type = blob; AIT_LEN(__val) = \ + (_bv)->blob_len; \ __val->val.blob = (_bv)->blob_var; } while (0) #define AIT_NEW_BLOB(_vl, _len) AIT_SET_BLOB((_vl), 0, _len) @@ -267,24 +312,33 @@ typedef struct { __val->val_type = f64; __val->val.f64 = _n; \ AIT_LEN(__val) = sizeof(double); } while (0) -#define AIT_COPY_VAL(_vl, _v) do { memcpy((_vl), (_v), sizeof(ait_val_t)); \ +#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((_vl), AIT_GET_BUF((_v)), AIT_LEN((_v))); \ + AIT_SET_BUF((_vl), \ + AIT_GET_BUF((_v)), \ + AIT_LEN((_v))); \ break; \ case string: \ - AIT_SET_STR((_vl), AIT_GET_STR((_v))); \ + AIT_SET_STR((_vl), \ + AIT_GET_STR((_v))); \ break; \ default: \ break; \ } \ } while (0) -#define AIT_COPY_VAL2(_vl, _v) do { AIT_COPY_VAL((_vl), (_v)); \ +#define AIT_COPY_DATA(_vl, _v) do { AIT_COPY_VAL((_vl), (_v)); \ if (AIT_TYPE((_vl)) == data) \ - AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), AIT_LEN((_v))); \ + AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), \ + AIT_LEN((_v))); \ } while (0) #define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t))) +#define AIT_INIT_VAL2(_vl, _t) do { \ + AIT_INIT_VAL((_vl)); \ + (_vl)->val_type = _t; \ + } while (0) /* 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)) { \ @@ -312,12 +366,12 @@ typedef struct { switch (AIT_TYPE(__val)) { \ case buffer: \ case string: \ - memset(__val->val.buffer, 0, \ + if (__val->val.buffer) \ + memset(__val->val.buffer, 0, \ AIT_LEN(__val)); \ break; \ case data: \ - memset(__val->val_data, 0, \ - AIT_LEN(__val)); \ + memset(__val->val_data, 0, AIT_LEN(__val)); \ break; \ default: \ __val->val.net = 0LL; \ @@ -477,6 +531,15 @@ inline ait_val_t *io_allocVar(void); */ inline void io_freeVar(ait_val_t ** __restrict val); /* + * io_makeVar() - Allocate memory and fill variable + * + * @type = type of variable + * @... = arg1 is value of variable + * @... = arg2 is length of variabla. Not required for numbers and strings! + * return: NULL error or new variable, after use free variable with io_freeVar() + */ +ait_val_t *io_makeVar(ait_type_t type, ...); +/* * io_allocVars() - Allocate ait_val_t array * * @varnum = Number of variables @@ -815,6 +878,17 @@ int io_arrayMake(char * __restrict psArgs, int nargs, */ int io_MakeAV(const char * __restrict csArgs, const char *csDelim, char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen); +/* + * io_MakeAV2() Parse and make attribute/value pair over input string + * + * @csArgs = Input argument line, will be modified! + * @csDelim = Delimiter for separate + * @psAttr = Output Attribute + * @psValue = Output Value, if ==NULL this element not present value or not wanted for return + * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items +*/ +int io_MakeAV2(char * __restrict psArgs, const char *csDelim, + char ** __restrict psAttr, char ** __restrict psValue); /* * io_sarrInit() - Create and initialize dynamic split-order array @@ -944,7 +1018,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 @@ -954,7 +1065,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 * @@ -963,9 +1075,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)