--- libaitio/inc/aitio.h 2012/05/23 11:59:51 1.18.2.3 +++ libaitio/inc/aitio.h 2012/07/22 12:23:04 1.20.2.3 @@ -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.20.2.3 2012/07/22 12:23:04 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -58,17 +58,27 @@ SUCH DAMAGE. #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 + +#define IO_SYSM 0 +#define IO_MPOOL 1 + #define VACUUM_LEFT 1 #define VACUUM_BETWEEN 2 @@ -100,7 +110,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 +140,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) @@ -151,7 +172,7 @@ typedef struct { #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); \ + __val = io_realloc(__val, sizeof(ait_val_t) + _len); \ if (__val) { \ __val->val_type = data; AIT_LEN(__val) = _len; \ if ((_p)) \ @@ -160,21 +181,21 @@ typedef struct { (_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); \ + __val->val.buffer = io_malloc(_len); \ if (__val->val.buffer) { \ __val->val_type = buffer; AIT_LEN(__val) = _len; \ if ((_v)) \ @@ -183,14 +204,14 @@ typedef struct { 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)); \ + __val->val.string = (int8_t*) io_strdup((_v)); \ if (__val->val.string) { \ __val->val_type = string; \ AIT_LEN(__val) = strlen((_v)) + 1; \ } } 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, \ + void *__p = io_realloc(__val->val.string, \ AIT_LEN(__val) + strlen((_v))); \ if (__p) { \ __val->val.string = __p; \ @@ -199,8 +220,8 @@ typedef struct { 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.blob = (_bv)->blob_var; } while (0) @@ -255,26 +276,28 @@ typedef struct { } while (0) #define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t))) - /* if attribute zeroCopy is set not execute xfree() */ + /* 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) struct io_ether_addr { @@ -300,11 +323,34 @@ 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_ether_ntoa() - Convert ethernet address to string * * @n = ethernet address structure, like struct ether_addr @@ -355,7 +401,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 +413,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 +422,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 +434,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 @@ -431,14 +479,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 @@ -498,7 +554,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 +562,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 +599,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 +607,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 +769,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, @@ -823,7 +879,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 +887,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); /* @@ -948,7 +1004,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 +1019,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 +1032,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