--- libaitcfg/src/queue.c 2012/04/02 14:39:03 1.6.4.1 +++ libaitcfg/src/queue.c 2019/11/21 14:27:25 1.16.8.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.6.4.1 2012/04/02 14:39:03 misho Exp $ +* $Id: queue.c,v 1.16.8.1 2019/11/21 14:27:25 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004 - 2019 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,8 +49,7 @@ SUCH DAMAGE. static inline struct tagCfg * _selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagCfg fav; - struct tagCfg *av; + struct tagCfg fav, *c; if (!cfg) return NULL; @@ -59,54 +58,91 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch if (csSec && *csSec) AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, - io_align(strlen(csSec), 1) / 2); + E_ALIGN(strlen(csSec), 2) / 2); if (csAttr) AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, - io_align(strlen(csAttr), 1) / 2); + E_ALIGN(strlen(csAttr), 2) / 2); - /* - RB_FOREACH(av, tagRC, cfg) { - printf("sec=%s(%d) attr=%s(%d) val=%s\n", AIT_GET_LIKE(&av->cfg_sec, char*), AIT_KEY(&av->cfg_sec), - AIT_GET_LIKE(&av->cfg_attr, char*), AIT_KEY(&av->cfg_attr), AIT_GET_STR(&av->cfg_val)); - } - - printf("ssss=%d aaaa=%d\n", AIT_KEY(&fav.cfg_sec), AIT_KEY(&fav.cfg_attr)); - */ if (!csAttr) return RB_NFIND(tagRC, cfg, &fav); - else - return RB_FIND(tagRC, cfg, &fav); + else { + c = RB_FIND(tagRC, cfg, &fav); + if (!c) + return NULL; /* not found */ + do { + if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr)) + return c; /* FOUND! */ + } while ((c = RB_NEXT(tagRC, cfg, c)) && c && !cfg_tree_cmp(c, &fav)); + return NULL; /* not found */ + } } -static inline void -_destroyAttribute(struct tagCfg *av) +/* --------------------------------------------------------------- */ + +/* + * cfg_getSection() - Get entire section attributes into array + * + * @cfg = Config root + * @csSec = Config section //[{csSec}] + * return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use! + */ +array_t * +cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec) { - if (!av) - return; + array_t *arr = NULL; + struct tagCfg *av, fav; - AIT_FREE_VAL(&av->cfg_val); - AIT_FREE_VAL(&av->cfg_attr); - AIT_FREE_VAL(&av->cfg_sec); - free(av); -} + if (!cfg) { + cfg_SetErr(EINVAL, "Invalid argument(s)"); + return NULL; + } else + memset(&fav, 0, sizeof fav); + if (csSec && !*csSec) + csSec = NULL; -// ---------------------------------------------- + if (csSec && *csSec) + AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, + E_ALIGN(strlen(csSec), 2) / 2); + arr = array_Init(0); + if (!arr) { + cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); + return NULL; + } + + TAILQ_FOREACH(av, cfg, cfg_next) + if (AIT_KEY(&av->cfg_sec) == AIT_KEY(&fav.cfg_sec)) { + if (!csSec) { + if (AIT_ISEMPTY(&av->cfg_sec)) + array_Push(arr, av, 0); + } else { + if (!AIT_ISEMPTY(&av->cfg_sec) && + !strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) + array_Push(arr, av, 0); + } + } + + if (!array_Size(arr)) + array_Destroy(&arr); + + return arr; +} + /* * cfg_findAttribute() - Find attribute position in config file * * @cfg = Config root * @csSec = Config section //[{csSec}] - * @csAttr = Config attribute //{csAttr} = ... - * return: 0 not found item; -1 error: null parameters; >0 position in list + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * return: 0 not found item, -1 error or >0 position in list */ -inline int +int cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { struct tagCfg *av, fav; register int cx = 0; - if (!cfg || !csAttr) { + if (!cfg) { cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; } else @@ -114,12 +150,12 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c if (csSec && *csSec) AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, - io_align(strlen(csSec), 1) / 2); + E_ALIGN(strlen(csSec), 2) / 2); if (csAttr) AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, - io_align(strlen(csAttr), 1) / 2); + E_ALIGN(strlen(csAttr), 2) / 2); - SLIST_FOREACH(av, cfg, cfg_next) { + TAILQ_FOREACH(av, cfg, cfg_next) { ++cx; if (!cfg_tree_cmp(&fav, av)) return cx; @@ -127,159 +163,118 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c return 0; } -#if 0 + /* - * cfg_UnsetAttribute() Unset item from config list and free resources - * @cfg = Head list element + * cfg_unsetAttribute() - Unset item from config and free resources + * + * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute - * return: 0 item not found, -1 error: null parameters; >0 position in list -*/ -int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * return: 0 item not found, -1 error or 1 removed item + */ +int +cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagPair *av, *curr; - register int cx = 0; + struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return -1; - av = SelectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr); if (!av) return 0; - // remove element - // remove element when is first! - if (cfg->slh_first == av) { - cfg->slh_first = cfg->slh_first->sle_next; + CFG_RC_LOCK(cfg); + RB_REMOVE(tagRC, cfg, av); + TAILQ_REMOVE(cfg, av, cfg_next); + CFG_RC_UNLOCK(cfg); - DestroyAttribute(av); - return 1; - } - // remove element in other cases... - curr = cfg->slh_first; - while (curr->sle_next != av) { - ++cx; - curr = curr->sle_next; - } - curr->sle_next = curr->sle_next->sle_next; - - DestroyAttribute(av); - return cx; + AIT_FREE_VAL(&av->cfg_val); + AIT_FREE_VAL(&av->cfg_attr); + AIT_FREE_VAL(&av->cfg_sec); + e_free(av); + return 1; } /* - * cfg_SetAttribute() Set item in config list or add new item if not exists - * @cfg = Head list element + * cfg_setAttribute() - Set item in config or adding new item if not exists + * + * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL set in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL set as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * @csVal = Config value //... = {csVal} to setup - * return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item -*/ -int cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal) + * return: 0 nothing changed, -1 error, 1 found and updated item or 2 added new item + */ +int +cfg_setAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, const char *csVal) { - struct tagPair *av, *section; - int len; + struct tagCfg *av, *section; if (!cfg || !csAttr) return -1; - av = SelectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr); if (!av) { - section = SelectAttribute(cfg, csSec, NULL); + /* adding new element */ + section = _selectAttribute(cfg, csSec, NULL); - av = malloc(sizeof(struct tagPair)); + av = e_malloc(sizeof(struct tagCfg)); if (!av) { LOGERR; return -1; } else { - memset(av, 0, sizeof(struct tagPair)); + memset(av, 0, sizeof(struct tagCfg)); - if (!section) { - // add new element - av->sle_next = cfg->slh_first; - cfg->slh_first = av; - } else { - // add new element in existing section - av->sle_next = section->sle_next; - section->sle_next = av; - } + CFG_RC_LOCK(cfg); + if (!section) + TAILQ_INSERT_TAIL(cfg, av, cfg_next); + else + TAILQ_INSERT_BEFORE(section, av, cfg_next); + CFG_RC_UNLOCK(cfg); } - // added section name to element - if (csSec && *csSec) { - len = strlen((char*) csSec) + 1; - av->psSection = malloc(len); - if (!av->psSection) { - LOGERR; - free(av); - return -1; - } else { - strlcpy((char*) av->psSection, (char*) csSec, len); - } - } else - av->psSection = NULL; - // added attribute to element - len = strlen((char*) csAttr) + 1; - av->psAttribute = malloc(len); - if (!av->psAttribute) { - LOGERR; - free(av->psSection); - free(av); - return -1; - } else { - strlcpy((char*) av->psAttribute, (char*) csAttr, len); + if (csSec && *csSec) { + AIT_SET_STR(&av->cfg_sec, csSec); + AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), + E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); } - // added value to element - if (csVal && *csVal) { - len = strlen((char*) csVal) + 1; - av->psValue = malloc(len); - if (!av->psValue) { - LOGERR; - free(av->psAttribute); - free(av->psSection); - free(av); - return -1; - } else { - strlcpy((char*) av->psValue, (char*) csVal, len); - } - } else { - av->psValue = malloc(1); - *av->psValue = 0; - } + AIT_SET_STR(&av->cfg_val, csVal ? csVal : ""); + AIT_SET_STR(&av->cfg_attr, csAttr); + AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), + E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); - // Added new element + CFG_RC_LOCK(cfg); + RB_INSERT(tagRC, cfg, av); + CFG_RC_UNLOCK(cfg); return 2; } - if (strcmp((char*) csVal, (char*) av->psValue)) { - len = strlen((char*) csVal) + 1; - av->psValue = realloc(av->psValue, len); - strlcpy((char*) av->psValue, (char*) csVal, len); - - // Update element + if (csVal && AIT_ADDR(&av->cfg_val) && + strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) { + /* Update element */ + AIT_FREE_VAL(&av->cfg_val); + AIT_SET_STR(&av->cfg_val, csVal); return 1; } - // Nothing happens ... finded & values is equal! + /* Nothing happens ... found & values is equal! */ return 0; } -#endif - /* * cfg_getAttribute() - Get item from config and return value from it * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute - * return: NULL item not found or null parameters; !=NULL value const string + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * return: NULL item not found or null parameters, !=NULL value const string */ -inline const char * +const char * cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return NULL; av = _selectAttribute(cfg, csSec, csAttr); @@ -288,48 +283,122 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch return AIT_GET_STR(&av->cfg_val); } -#if 0 -// -------------------------------------------------------------- /* - * cfg_LoadAttribute() Extended get attribute, if not found item return *default value* - * @cfg = Head list element + * cfg_getAttributeLong() - Get item as long from config and return value from it + * + * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute - * @psVal = Return buffer for item Value //... = {psVal} - * @ValLen = Length of buffer //{psVal} for return - * @csDefValue = *Default Value* for return in //{psVal}, if not found item in config list - * return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal} -*/ -int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, - u_char * __restrict psVal, int ValLen, const char *csDefValue) + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * return: value + */ +long +cfg_getAttributeLong(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagPair *av; + const char *str = NULL; + + str = cfg_getAttribute(cfg, csSec, csAttr); + return strtol(str ? str : "", NULL, 0); +} + +/* + * cfg_getAttributeLLong() - Get item as long long from config and return value from it + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * return: value + */ +long long +cfg_getAttributeLLong(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) +{ + const char *str = NULL; + + str = cfg_getAttribute(cfg, csSec, csAttr); + return strtoll(str ? str : "", NULL, 0); +} + +/* + * cfg_getAttributeDouble() - Get item as double from config and return value from it + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * return: value + */ +double +cfg_getAttributeDouble(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) +{ + const char *str = NULL; + + str = cfg_getAttribute(cfg, csSec, csAttr); + return strtod(str ? str : "", NULL); +} + +/* + * cfg_getAttributeLDouble() - Get item as long double from config and return value from it + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * return: value + */ +long double +cfg_getAttributeLDouble(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) +{ + const char *str = NULL; + + str = cfg_getAttribute(cfg, csSec, csAttr); + return strtold(str ? str : "", NULL); +} + +/* + * cfg_loadAttribute() - Get guarded attribute, if not found item return *default value* + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @val = Return buffer for item Value //... = {val} + * @csDefValue = *Default Value* for return in //{val}, if not found item in config + * return: 0 item not found, -1 error or >0 number of copied bytes in //{val} + */ +int +cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, + ait_val_t * __restrict val, const char *csDefValue) +{ + struct tagCfg *av; int ret = 0; - if (!cfg || !csAttr || !ValLen || !psVal) + if (!cfg || !val) { + cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; + } - av = SelectAttribute(cfg, csSec, csAttr); + AIT_INIT_VAL(val); + av = _selectAttribute(cfg, csSec, csAttr); if (!av) { + /* not found item */ if (csDefValue) { - strlcpy((char*) psVal, csDefValue, ValLen); - ret = strlen((char*) psVal); - } - + AIT_SET_STR(val, csDefValue); + ret = AIT_LEN(val); + } else + AIT_INIT_VAL(val); return ret; } - if (!av->psValue || !*av->psValue) { + if (AIT_ISEMPTY(&av->cfg_val) || !AIT_ADDR(&av->cfg_val) || + !*AIT_GET_LIKE(&av->cfg_val, char*)) { + /* empty value */ if (csDefValue) { - strlcpy((char*) psVal, csDefValue, ValLen); - ret = strlen((char*) psVal); - } + AIT_SET_STR(val, csDefValue); + ret = AIT_LEN(val); + } else + AIT_INIT_VAL(val); } else { - strlcpy((char*) psVal, (char*) av->psValue, ValLen); - ret = strlen((char*) psVal); + /* copy value */ + AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val)); + ret = AIT_LEN(val); } return ret; } -#endif