--- libaitio/inc/aitio.h 2012/05/23 11:59:51 1.18.2.3 +++ 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.18.2.3 2012/05/23 11:59:51 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,25 +50,46 @@ SUCH DAMAGE. #define COMPAT_43TTY #include +#include #include #include #include #include #include #include +#include #include #include +#include +#include -#ifdef USE_MPOOL -#else -#define xmalloc(x) malloc(x) -#define xcalloc(x, y) calloc(x, y) -#define xrealloc(x, y) realloc(x, y) -#define xstrdup(x) strdup(x) -#define xfree(x) free(x) +#ifndef STRSIZ +#define STRSIZ 256 #endif +#ifndef be16toh +#define be16toh betoh16 +#endif +#ifndef be32toh +#define be32toh betoh32 +#endif +#ifndef be64toh +#define be64toh betoh64 +#endif +#ifndef le16toh +#define le16toh letoh16 +#endif +#ifndef le32toh +#define le32toh letoh32 +#endif +#ifndef le64toh +#define le64toh letoh64 +#endif + +#define IO_SYSM 0 +#define IO_MPOOL 1 + #define VACUUM_LEFT 1 #define VACUUM_BETWEEN 2 @@ -100,7 +121,15 @@ typedef enum { typedef struct { uint8_t val_type; - uint8_t val_pad; + union { + struct { + uint8_t val_in:1; + uint8_t val_be:1; + uint8_t val_le:1; + uint8_t val_pad:5; + }; + uint8_t val_opt; + }; uint16_t val_key; uint32_t val_len; union { @@ -122,13 +151,16 @@ typedef struct { int64_t i64; } val; uint8_t val_data[0]; -} __packed ait_val_t; +} __packed ait_val_t; /* sizeof 16 bytes */ #define AIT_TYPE(_vl) ((ait_type_t) (_vl)->val_type) #define AIT_LEN(_vl) (_vl)->val_len #define AIT_KEY(_vl) (_vl)->val_key #define AIT_RAW(_vl) (_vl)->val.net #define AIT_ADDR(_vl) (_vl)->val.ptr +#define AIT_IN(_vl) (_vl)->val_in +#define AIT_BE(_vl) (_vl)->val_be +#define AIT_LE(_vl) (_vl)->val_le #define AIT_BLOB_CHUNKS(_vl, _n) (AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0) #define AIT_ISEMPTY(_vl) (AIT_TYPE((_vl)) == empty) @@ -138,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) @@ -150,59 +184,104 @@ 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 = xrealloc(__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; AIT_LEN(__val) = _len; \ - __val->val.ptr = _p; } while (0) + __val->val_type = ptr; __val->val.ptr = _p; \ + AIT_LEN(__val) = _len; } while (0) #define AIT_RE_BUF(_vl, _len) do { ait_val_t *__val = (_vl); assert(__val); \ - void *__ptr = xrealloc(AIT_GET_BUF(__val), _len); \ + void *__ptr = io_realloc(AIT_GET_BUF(__val), _len); \ if (__ptr) { \ __val->val.buffer = __ptr; AIT_LEN(__val) = _len; \ } } while (0) #define AIT_SET_BUF2(_vl, _c, _len) do { ait_val_t *__val = (_vl); assert(__val); \ - __val->val.buffer = xmalloc(_len); \ + __val->val.buffer = io_malloc(_len); \ if (__val->val.buffer) { \ __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); \ - __val->val.buffer = xmalloc(_len); \ +#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*) xstrdup((_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) { \ + __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; \ + if (!__val->val.string) \ + memset(__p, 0, AIT_LEN(__val)); \ + __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 = xrealloc(__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; AIT_LEN(__val) = _len; \ - __val->val.blob = _n; } while (0) + __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) @@ -237,45 +316,74 @@ 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))) - /* if attribute zeroCopy is set not execute xfree() */ +#define AIT_INIT_VAL2(_vl, _t) do { \ + 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)) { \ case buffer: \ - if (__val->val.buffer) { \ - xfree(__val->val.buffer); \ - __val->val.buffer = NULL; \ - } \ + if (!__val->val_in && \ + __val->val.buffer) \ + io_free(__val->val.buffer); \ + __val->val.buffer = NULL; \ break; \ case string: \ - if (__val->val.string) { \ - xfree(__val->val.string); \ - __val->val.string = NULL; \ - } \ + if (!__val->val_in && \ + __val->val.string) \ + io_free(__val->val.string); \ + __val->val.string = NULL; \ break; \ default: \ break; \ } \ __val->val_type = empty; \ + __val->val_opt ^= __val->val_opt; \ AIT_LEN(__val) = 0; \ + AIT_KEY(__val) = 0; \ } while (0) +#define AIT_ZERO_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ + switch (AIT_TYPE(__val)) { \ + case buffer: \ + case string: \ + if (__val->val.buffer) \ + memset(__val->val.buffer, 0, \ + AIT_LEN(__val)); \ + break; \ + case data: \ + memset(__val->val_data, 0, AIT_LEN(__val)); \ + break; \ + default: \ + __val->val.net = 0LL; \ + break; \ + } \ + AIT_KEY(__val) = 0; \ + } while (0) struct io_ether_addr { u_int8_t ether_addr_octet[6]; @@ -290,9 +398,10 @@ typedef union { struct sockaddr_in6 sin6; struct sockaddr_dl sdl; } io_sockaddr_t; +#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 @@ -300,11 +409,41 @@ inline int io_GetErrno(); // io_GetError() Get error text of last operation inline const char *io_GetError(); -// mpool_inuse() Check for mpool usage -inline int mpool_inuse(); +// io_mm_inuse() Check for memory management model +inline int io_mm_inuse(); /* + * ioLibInit() - Init libaitio library memory management + * + * @mm = memory management (IO_SYSM or IO_MPOOL) + * @maxmem = memory limit + * return: -1 error or !=-1 used memory management model + */ +inline int ioLibInit(int mm, unsigned long maxmem); +/* + * ioLibFini() - Finish libaitio library memory management + * + * return: none + */ +inline void ioLibFini(); + +/* memory management hooks */ +extern void *(*io_malloc)(size_t); +extern void *(*io_calloc)(size_t, size_t); +extern void *(*io_realloc)(void*, size_t); +extern char *(*io_strdup)(const char*); +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 @@ -355,7 +494,8 @@ io_sockaddr_t *io_gethostbyname(const char *psHost, un * @vars = Variable array * return: -1 error, 0 nothing done or >0 size of marshaled data */ -int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars); +inline int io_vars2buffer(unsigned char * __restrict buf, int buflen, + array_t * __restrict vars); /* * io_buffer2vars() - De-marshaling data from buffer to array with variables * @@ -366,7 +506,7 @@ int io_vars2buffer(unsigned char *buf, int buflen, arr *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy() * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy() */ -array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy); +inline array_t *io_buffer2vars(unsigned char * __restrict buf, int buflen, int vnum, int zcpy); /* * io_vars2map() - Marshaling data from array with variables to memory map * @@ -375,7 +515,8 @@ array_t *io_buffer2vars(unsigned char *buf, int buflen * @vars = Variable array * return: -1 error, 0 nothing done or >0 size of marshaled data */ -int io_vars2map(unsigned char *buf, int buflen, array_t *vars); +inline int io_vars2map(unsigned char * __restrict buf, int buflen, + array_t * __restrict vars); /* * io_map2vars() - De-marshaling data from memory map to array with variables * @@ -386,7 +527,7 @@ int io_vars2map(unsigned char *buf, int buflen, array_ *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy() * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy() */ -array_t *io_map2vars(unsigned char *buf, int buflen, int vnum, int zcpy); +inline array_t *io_map2vars(unsigned char * __restrict buf, int buflen, int vnum, int zcpy); /* * io_allocVar() - Allocate memory for variable @@ -402,6 +543,50 @@ 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_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 @@ -431,14 +616,22 @@ inline void io_freeVars(array_t ** __restrict vars); */ inline ait_val_t *io_getVars(array_t ** __restrict vars, int n); /* - * io_sortVars() - Sorting array with variables + * io_sortVarsByKey() - Sorting array with variables by key * * @vars = Variable array - * @order = Sort order. If =0 ascend ot !=0 descend - * @cmp = Compare function for sorting. If =NULL compare by key + * @order = Sort order. If =0 ascend or !=0 descend * return: none */ -inline void io_sortVars(array_t * __restrict vars, int order, +inline void io_sortVarsByKey(array_t * __restrict vars, int order); +/* + * io_sortVarsByVal() - Sorting array with variables by value + * + * @vars = Variable array + * @order = Sort order. If =0 ascend or !=0 descend + * @cmp = Custom compare function for sorting. If =NULL compare by value + * return: none + */ +inline void io_sortVarsByVal(array_t * __restrict vars, int order, int (*cmp)(const void*, const void*)); /* * io_findKeyVars() - Find variable by key from array @@ -448,6 +641,21 @@ inline void io_sortVars(array_t * __restrict vars, int * 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); /* @@ -498,7 +706,7 @@ int ioRegexGet(const char *csRegex, const char *csData * @csRegex = Regulare expression pattern * @csData = Source data * @csNew = Data for replace - * return: NULL not match or error; !=NULL allocated new string, must be xfree after use! + * return: NULL not match or error; !=NULL allocated new string, must be io_free after use! */ char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew); @@ -506,7 +714,7 @@ char *ioRegexReplace(const char *csRegex, const char * * ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" * * @csString = Input string - * return: NULL error, !=NULL Allocated new string evaluated from input string, must be xfree() + * return: NULL error, !=NULL Allocated new string evaluated from input string, must be io_free() */ char *ioStrAst(const char *csString); @@ -543,7 +751,7 @@ inline int io_TrimStr(char * __restrict psLine); * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be xfree) + * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be io_free) */ inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen); /* @@ -551,7 +759,7 @@ inline unsigned char *io_Ch2Hex(unsigned char *psLine, * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted string(must be xfree) + * return: NULL nothing to do or error; !=0 Allocated new converted string(must be io_free) */ inline char *io_Hex2Ch(unsigned char *psLine, int lineLen); @@ -713,7 +921,7 @@ inline int io_argsNum(const char *csArgs, const char * * @psArgs = Input arguments line, after execute string is modified!!! * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs * @csDelim = Delimiter(s) for separate - * @parr = Output array of arguments ... (must be xfree with io_arrayDestroy() after use!) + * @parr = Output array of arguments ... (must be io_free with io_arrayDestroy() after use!) * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items */ int io_arrayMake(char * __restrict psArgs, int nargs, const char *csDelim, @@ -732,6 +940,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 @@ -823,7 +1042,7 @@ sarr_t *io_array2sarr(array_t ** __restrict a, int seg * io_CopyEnv() - Copy environment to new environment array; * * @oldenv = Environment array - * return: NULL error; !=NULL Allocated new environment array(must be xfree) + * return: NULL error; !=NULL Allocated new environment array(must be io_free) */ char **io_CopyEnv(const char **oldenv); /* @@ -831,7 +1050,7 @@ char **io_CopyEnv(const char **oldenv); * * @psProg = Program name for execute * @oldarg = Arguments array - * return: NULL error; !=NULL Allocated execution array(must be xfree) + * return: NULL error; !=NULL Allocated execution array(must be io_free) */ char **io_ExecArgs(const char *psProg, const char **oldarg); /* @@ -861,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 @@ -871,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 * @@ -880,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) @@ -948,7 +1206,7 @@ extern int io_Debug; * * @pInput = input buffer * @inLen = input buffer len - * @ppOutput = output allocated buffe, must be xfree after use + * @ppOutput = output allocated buffe, must be io_free after use * @Cipher = cipher engine, like EVP_bf_cbc() or etc... * @pKey = key * @pIV = IV, salt (8 bytes) @@ -963,7 +1221,7 @@ int ioCipher(unsigned char *pInput, int inLen, unsigne * * @pInput = input buffer * @inLen = input buffer len - * @ppOutput = output allocated buffe, must be xfree after use + * @ppOutput = output allocated buffe, must be io_free after use * @pKey = key * @pIV = IV, salt (8 bytes) * @nMode = Mode 0 - decrypting or 1 - encrypting @@ -976,7 +1234,7 @@ int io_Blowfish(unsigned char *pInput, int inLen, unsi * * @pInput = Input buffer with ASCII * @inLen = Input buffer data length - * @ppOutput = Output buffer with cipher data, must be xfree after use + * @ppOutput = Output buffer with cipher data, must be io_free after use * @pKey = Key * @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!! * return: -1 error or >-1 how many cipher blocks proceeded