--- libaitcfg/src/queue.c 2012/04/02 15:39:55 1.6.4.3 +++ libaitcfg/src/queue.c 2021/11/26 01:10:34 1.18.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.6.4.3 2012/04/02 15:39:55 misho Exp $ +* $Id: queue.c,v 1.18.2.1 2021/11/26 01:10:34 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 - 2021 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,7 +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 fav, *c, *n; if (!cfg) return NULL; @@ -58,37 +58,137 @@ _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); - /* - struct tagCfg *av; - - 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)); + if (!csAttr) { + c = RB_NFIND(tagRC, cfg, &fav); + if (!c) + return NULL; /* not found */ + if (csSec && !AIT_ISEMPTY(&c->cfg_sec) && + strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) + TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) { + if (!AIT_ISEMPTY(&c->cfg_sec) && + !strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) + break; + } + return c; + } else { + c = RB_FIND(tagRC, cfg, &fav); + if (!c) + return NULL; /* not found */ + /* if cannot find right section */ + if (csSec && !AIT_ISEMPTY(&c->cfg_sec) && + strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) { + TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) { + if (!AIT_ISEMPTY(&c->cfg_sec) && csAttr && + !strcmp(csSec, AIT_GET_STR(&c->cfg_sec)) && + !strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) + return c; /* FOUND! */ + } + 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)); + /* if cannot find right attribute */ + TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) { + if ((!csSec && AIT_ISEMPTY(&c->cfg_sec)) || + (csSec && !AIT_ISEMPTY(&c->cfg_sec) && + !strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))) + if (!AIT_ISEMPTY(&c->cfg_attr) && csAttr && + !strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) + return c; /* FOUND! */ + } + return NULL; /* not found */ } - - 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); } -static inline void -_destroyAttribute(struct tagCfg *av) +/* --------------------------------------------------------------- */ + +/* + * cfg_dumpCfg() - dump config data + * + * @cfg = Config root + * return: none + */ +void +cfg_dumpCfg(cfg_root_t * __restrict cfg) { - if (!av) - return; + struct tagCfg *r, *c, *ctmp, *q, *qtmp; + int syn; + r = RB_ROOT(cfg); + printf("ROOT:: KEY=%.8x [%s] %s=%s\n", ((AIT_KEY(&r->cfg_sec) << 15) | AIT_KEY(&r->cfg_attr)), + AIT_ADDR(&r->cfg_sec), AIT_ADDR(&r->cfg_attr), AIT_ADDR(&r->cfg_val)); + + RB_FOREACH_SAFE(c, tagRC, cfg, ctmp) { + syn ^= syn; + TAILQ_FOREACH_SAFE(q, cfg, cfg_next, qtmp) { + if (c == q) { + syn = 42; + break; + } + } + + printf("%s KEY=%.8x [%s] %s=%s sync=%d\n", c == r ? "*" : "", + ((AIT_KEY(&c->cfg_sec) << 15) | AIT_KEY(&c->cfg_attr)), + AIT_ADDR(&c->cfg_sec), AIT_ADDR(&c->cfg_attr), AIT_ADDR(&c->cfg_val), syn); + } } -// ---------------------------------------------- +/* + * 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) +{ + array_t *arr = NULL; + struct tagCfg *av, fav; + 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 * @@ -97,29 +197,26 @@ _destroyAttribute(struct tagCfg *av) * @csAttr = Config attribute //{csAttr} = ... * 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; + struct tagCfg *av, *n; register int cx = 0; - if (!cfg || !csAttr) { + if (!cfg) { cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; - } else - memset(&fav, 0, sizeof fav); + } - if (csSec && *csSec) - AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, - io_align(strlen(csSec), 1) / 2); - if (csAttr) - AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, - io_align(strlen(csAttr), 1) / 2); - - SLIST_FOREACH(av, cfg, cfg_next) { + TAILQ_FOREACH_SAFE(av, cfg, cfg_next, n) { ++cx; - if (!cfg_tree_cmp(&fav, av)) - return cx; + + if ((!csSec && AIT_ISEMPTY(&av->cfg_sec)) || + (csSec && !AIT_ISEMPTY(&av->cfg_sec) && + !strcmp(csSec, AIT_GET_STR(&av->cfg_sec)))) + if (!AIT_ISEMPTY(&av->cfg_attr) && csAttr && + !strcmp(csAttr, AIT_GET_STR(&av->cfg_attr))) + return cx; } return 0; @@ -138,7 +235,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const { struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return -1; av = _selectAttribute(cfg, csSec, csAttr); @@ -147,13 +244,13 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const CFG_RC_LOCK(cfg); RB_REMOVE(tagRC, cfg, av); - SLIST_REMOVE(cfg, av, tagCfg, cfg_next); + TAILQ_REMOVE(cfg, av, cfg_next); CFG_RC_UNLOCK(cfg); AIT_FREE_VAL(&av->cfg_val); AIT_FREE_VAL(&av->cfg_attr); AIT_FREE_VAL(&av->cfg_sec); - free(av); + e_free(av); return 1; } @@ -171,7 +268,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch { struct tagCfg *av, *section; - if (!cfg || !csAttr || !csVal) + if (!cfg || !csAttr) return -1; av = _selectAttribute(cfg, csSec, csAttr); @@ -179,7 +276,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch /* adding new element */ section = _selectAttribute(cfg, csSec, NULL); - av = malloc(sizeof(struct tagCfg)); + av = e_malloc(sizeof(struct tagCfg)); if (!av) { LOGERR; return -1; @@ -188,21 +285,21 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch CFG_RC_LOCK(cfg); if (!section) - SLIST_INSERT_HEAD(cfg, av, cfg_next); + TAILQ_INSERT_TAIL(cfg, av, cfg_next); else - SLIST_INSERT_AFTER(section, av, cfg_next); + TAILQ_INSERT_BEFORE(section, av, cfg_next); CFG_RC_UNLOCK(cfg); } if (csSec && *csSec) { AIT_SET_STR(&av->cfg_sec, csSec); AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), - io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); + E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); } - AIT_SET_STR(&av->cfg_val, csVal); + 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*), - io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2); + E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); CFG_RC_LOCK(cfg); RB_INSERT(tagRC, cfg, av); @@ -210,7 +307,8 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch return 2; } - if (strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) { + 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); @@ -226,15 +324,15 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * 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); @@ -243,48 +341,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} = ... + * 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} = ... + * 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} = ... + * 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} = ... + * 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} = ... + * @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