--- libaitcfg/src/queue.c 2012/04/04 13:11:49 1.7 +++ libaitcfg/src/queue.c 2019/12/05 14:33:35 1.18 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.7 2012/04/04 13:11:49 misho Exp $ +* $Id: queue.c,v 1.18 2019/12/05 14:33:35 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,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; if (!cfg) return NULL; @@ -58,34 +58,122 @@ _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); 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 */ + } } /* --------------------------------------------------------------- */ /* + * cfg_dumpCfg() - dump config data + * + * @cfg = Config root + * return: none + */ +void +cfg_dumpCfg(cfg_root_t * __restrict cfg) +{ + 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 * * @cfg = Config root * @csSec = Config section //[{csSec}] - * @csAttr = Config attribute //{csAttr} = ... + * @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 @@ -93,12 +181,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; @@ -112,7 +200,7 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ... + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * return: 0 item not found, -1 error or 1 removed item */ int @@ -120,7 +208,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const { struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return -1; av = _selectAttribute(cfg, csSec, csAttr); @@ -129,13 +217,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; } @@ -161,7 +249,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; @@ -170,21 +258,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 ? 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); @@ -192,7 +280,8 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch return 2; } - if (csVal && 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); @@ -208,15 +297,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} = ..., 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); @@ -227,11 +316,79 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch } /* + * 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 as *any* attribute + * return: value + */ +long +cfg_getAttributeLong(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) +{ + 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} = ... + * @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} @@ -243,27 +400,31 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c struct tagCfg *av; int ret = 0; - if (!cfg || !csAttr || !val) { + if (!cfg || !val) { cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; } + AIT_INIT_VAL(val); av = _selectAttribute(cfg, csSec, csAttr); if (!av) { /* not found item */ if (csDefValue) { AIT_SET_STR(val, csDefValue); ret = AIT_LEN(val); - } + } else + AIT_INIT_VAL(val); return ret; } - if (AIT_ISEMPTY(&av->cfg_val) || !*AIT_GET_LIKE(&av->cfg_val, char*)) { + if (AIT_ISEMPTY(&av->cfg_val) || !AIT_ADDR(&av->cfg_val) || + !*AIT_GET_LIKE(&av->cfg_val, char*)) { /* empty value */ if (csDefValue) { AIT_SET_STR(val, csDefValue); ret = AIT_LEN(val); - } + } else + AIT_INIT_VAL(val); } else { /* copy value */ AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val));