--- libaitio/inc/aitio.h 2011/06/07 11:49:39 1.10 +++ libaitio/inc/aitio.h 2011/08/29 22:35:20 1.11.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.10 2011/06/07 11:49:39 misho Exp $ +* $Id: aitio.h,v 1.11.2.2 2011/08/29 22:35:20 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -54,6 +54,7 @@ SUCH DAMAGE. #define VACUUM_LEFT 1 #define VACUUM_BETWEEN 2 +/* AIT arrays */ typedef void ** sarr_seg_t; typedef struct _tagSplitArray { @@ -68,6 +69,8 @@ typedef struct _tagArray { void **arr_data; } array_t; +/* URL staff ... */ + typedef struct _tagURLItem { int vallen; char *value; @@ -100,7 +103,122 @@ struct tagReqXML { url_Item_t xml_value; }; +/* AIT RPC variables and managment */ +typedef enum { + empty, /* empty -> variable is not set */ + buffer, string, blob, array, /* buffer -> uint8_t*; string -> int8_t*; + blob -> void*(+socket); array -> array_t* */ + u8, u16, u32, u64, /* unsigned integers ... */ + i8, i16, i32, i64 /* integers ... */ +} ait_type_t; + +typedef struct { + uint8_t val_type; + uint32_t val_len; + union { + uint8_t *buffer, + *array; + int8_t *string; + uint32_t blob; + uint8_t u8; + uint16_t u16; + uint32_t u32; + uint64_t u64; + int8_t i8; + int16_t i16; + int32_t i32; + int64_t i64; + } val; +} __packed ait_val_t; + +#define AIT_TYPE(_vl) (assert((_vl)), ((ait_type_t) (_vl)->val_type)) +#define AIT_LEN(_vl) (assert((_vl)), (_vl)->val_len) +#define AIT_BLOB_CHUNKS(_vl, _n) (assert((_vl)), (_vl)->val_len / _n + ((_vl)->val_len % _n) ? 1 : 0) +#define AIT_ISEMPTY(_vl) (assert((_vl)), (_vl)->val_type == empty) + +#define AIT_GET_ARRAY(_vl) (assert((_vl)), assert((_vl)->val_type == array), \ + ((array_t*) (_vl)->val.array)) +#define AIT_GET_BUF(_vl) (assert((_vl)), assert((_vl)->val_type == buffer), (_vl)->val.buffer) +#define AIT_GET_STR(_vl) (assert((_vl)), assert((_vl)->val_type == string), (_vl)->val.string) +#define AIT_GET_BLOB(_vl) (assert((_vl)), assert((_vl)->val_type == blob), (_vl)->val.blob) +#define AIT_GET_U8(_vl) (assert((_vl)), assert((_vl)->val_type == u8), (_vl)->val.u8) +#define AIT_GET_U16(_vl) (assert((_vl)), assert((_vl)->val_type == u16), (_vl)->val.u16) +#define AIT_GET_U32(_vl) (assert((_vl)), assert((_vl)->val_type == u32), (_vl)->val.u32) +#define AIT_GET_U64(_vl) (assert((_vl)), assert((_vl)->val_type == u64), (_vl)->val.u64) +#define AIT_GET_I8(_vl) (assert((_vl)), assert((_vl)->val_type == i8), (_vl)->val.i8) +#define AIT_GET_I16(_vl) (assert((_vl)), assert((_vl)->val_type == i16), (_vl)->val.i16) +#define AIT_GET_I32(_vl) (assert((_vl)), assert((_vl)->val_type == i32), (_vl)->val.i32) +#define AIT_GET_I64(_vl) (assert((_vl)), assert((_vl)->val_type == i64), (_vl)->val.i64) + +#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \ + __val->val.buffer = malloc(_len); \ + if (__val->val.buffer) { \ + AIT_TYPE(__val) = buffer; AIT_LEN(__val) = _len; \ + memcpy(__val->val.buffer, (_v), _len); \ + } } while (0) +#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \ + __val->val.string = (int8_t*) strdup((_v)); \ + if (__val->val.string) { \ + AIT_TYPE(__val) = string; \ + AIT_LEN(__val) = strlen((_v)) + 1; \ + } } while (0) +#define AIT_SET_BLOB(_vl, _n, _len) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = blob; AIT_LEN(__val) = _len; \ + __val->val.blob = _n; } while (0) +#define AIT_SET_BLOB2(_vl, _bv) do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \ + AIT_TYPE(__val) = blob; AIT_LEN(__val) = (_bv)->blob_len; \ + __val->val.blob = (_bv)->blob_var; } while (0) +#define AIT_SET_ARRAY(_vl, _arr) do { ait_val_t *__val = (_vl); assert(__val); assert((_arr)); \ + AIT_TYPE(__val) = array; AIT_LEN(__val) = io_arraySize((_arr)); \ + __val->val.array = (uint8_t*) (_arr); \ + } while (0) + +#define AIT_SET_U8(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = u8; __val->val.u8 = _n; \ + AIT_LEN(__val) = sizeof(uint8_t); } while (0) +#define AIT_SET_U16(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = u16; __val->val.u16 = _n; \ + AIT_LEN(__val) = sizeof(uint16_t); } while (0) +#define AIT_SET_U32(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = u32; __val->val.u32 = _n; \ + AIT_LEN(__val) = sizeof(uint32_t); } while (0) +#define AIT_SET_U64(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = u64; __val->val.u64 = _n; \ + AIT_LEN(__val) = sizeof(uint64_t); } while (0) +#define AIT_SET_I8(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = i8; __val->val.i8 = _n; \ + AIT_LEN(__val) = sizeof(int8_t); } while (0) +#define AIT_SET_I16(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = i16; __val->val.i16 = _n; \ + AIT_LEN(__val) = sizeof(int16_t); } while (0) +#define AIT_SET_I32(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = i32; __val->val.i32 = _n; \ + AIT_LEN(__val) = sizeof(int32_t); } while (0) +#define AIT_SET_I64(_vl, _n) do { ait_val_t *__val = (_vl); assert(__val); \ + AIT_TYPE(__val) = i64; __val->val.i64 = _n; \ + AIT_LEN(__val) = sizeof(int64_t); } while (0) + +#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ + switch (AIT_TYPE(__val)) { \ + case buffer: \ + if (__val->val.buffer) { \ + free(__val->val.buffer); \ + __val->val.buffer = NULL; \ + } \ + break; \ + case string: \ + if (__val->val.string) { \ + free(__val->val.string); \ + __val->val.string = NULL; \ + } \ + break; \ + } \ + AIT_TYPE(__val) = empty; \ + AIT_LEN(__val) = 0; \ + } while (0) + + // io_GetErrno() Get error code of last operation inline int io_GetErrno(); // io_GetError() Get error text of last operation @@ -233,15 +351,15 @@ inline void io_arrayDestroy(array_t ** __restrict parr inline void io_arrayFree(array_t * __restrict arr); /* * io_arrayFrom() - Create and fill array from array with pointers - * @argv = Array with pointers + * @pargv = Array with pointers * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item - * return: NULL error, != NULL allocated memory for array + * return: NULL error, != NULL allocated new array */ -inline array_t *io_arrayFrom(const char **argv, int argc); +inline array_t *io_arrayFrom(const char *** __restrict pargv, int argc); /* * io_arrayTo() - Create and fill array with pointers from dynamic array * @arr = Array - * return: NULL error, != NULL allocated memory for array + * return: NULL error, != NULL allocated memory for array, NULL terminated */ inline char **io_arrayTo(array_t * __restrict arr); /* @@ -272,17 +390,20 @@ int io_arrayGrow(array_t * __restrict arr, int newNumI */ int io_arrayVacuum(array_t * __restrict arr, int fromWhere); -#define io_arraySize(_arr) ((assert(_arr)), _arr->arr_num) +#define io_arraySize(_arr) (assert((_arr)), (_arr)->arr_num) -#define io_arrayGet(_arr, _d, _type) ((assert(_arr && _arr->arr_num > _d)), \ - ((_type) *(_arr->arr_data + _d))) +#define io_arrayGet(_arr, _d) (assert((_arr) && (_arr)->arr_num > _d), *((_arr)->arr_data + _d)) +#define io_array(_arr, _d, _type) (assert((_arr) && (_arr)->arr_num > _d), \ + ((_type) *((_arr)->arr_data + _d))) #define io_arraySet(_arr, _d, _ptr) do { \ - assert(_arr && _arr->arr_num > _d); \ - *(_arr->arr_data + _d) = (void*) _ptr; \ + assert((_arr) && (_arr)->arr_num > _d); \ + *((_arr)->arr_data + _d) = (void*) (_ptr); \ } while (0) -#define io_arrayDel(_arr, _d) do { \ - assert(_arr && _arr->arr_num > _d); \ - *(_arr->arr_data + _d) = NULL; \ +#define io_arrayDel(_arr, _d, _fri) do { \ + assert((_arr) && (_arr)->arr_num > _d); \ + if (_fri) \ + free(*((_arr)->arr_data + _d)); \ + *((_arr)->arr_data + _d) = NULL; \ } while (0) /* @@ -295,7 +416,7 @@ inline int io_arrayPush(array_t * __restrict arr, void /* * io_arrayPop() - Pop element from dynamic array like stack manner, last used position * @arr = Array - * @data = Element, if set NULL return only first empty position + * @data = Element, if set NULL return only last used position * @delAfter = Delete after Pop element, !=0 delete element from array after return data * return: -1 not found used position, array is empty!, >-1 return element position */ @@ -360,7 +481,7 @@ int io_sarrGrow(sarr_t * __restrict arr, int newNumIte * return: -1 error, >-1 freed segments */ inline int io_sarrVacuum(sarr_t * __restrict arr); -#define io_sarrSize(_arr) ((assert(_arr)), _arr->sarr_num) +#define io_sarrSize(_arr) (assert((_arr)), (_arr)->sarr_num) /* * io_sarrGet() - Get element from dynamic split-order array * @arr = Array @@ -384,8 +505,23 @@ void *io_sarrGet2(sarr_t * __restrict arr, unsigned in * return: NULL error or empty, !=NULL old value in element */ inline void *io_sarrSet(sarr_t * __restrict arr, unsigned int idx, void *data); -#define io_sarrDel(_arr, _idx) io_sarrSet(_arr, _idx, NULL) -#define io_sarr(_arr, _idx, _type) (_type)io_sarrGet(_arr, _idx) +#define io_sarrDel(_arr, _idx) io_sarrSet((_arr), _idx, NULL) +#define io_sarr(_arr, _idx, _type) (_type)io_sarrGet((_arr), _idx) +/* + * io_sarr2array() - Convert from split-order array to dynamic array + * @sa = split array + * @sarrFree = after convert split array !=0 will be destroyed sarray + * return: NULL error or != NULL new array + */ +array_t *io_sarr2array(sarr_t ** __restrict sa, int sarrFree); +/* + * io_array2sarr() - Convert from dynamic array to split-order array + * @a = array + * @segLen = Length of segment + * @arrFree = after convert array !=0 will be destroyed + * return: NULL error or != NULL new sarr + */ +sarr_t *io_array2sarr(array_t ** __restrict a, int segLen, int arrFree); /* * io_CopyEnv() Copy environment to new environment array; @@ -494,7 +630,7 @@ extern int io_Debug; #define ioDEBUG(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ - snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \ + snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ if ((x) <= io_Debug) \ syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \ (x), __func__, __LINE__, str); \ @@ -503,7 +639,7 @@ extern int io_Debug; #define ioERROR(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ - snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \ + snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \ __func__, __LINE__, (x), str); \ } while (0)