version 1.13, 2014/01/29 23:48:34
|
version 1.14, 2014/01/30 08:30:47
|
Line 46 SUCH DAMAGE.
|
Line 46 SUCH DAMAGE.
|
#include "global.h" |
#include "global.h" |
|
|
|
|
static inline void |
|
_invertQueue(cfg_root_t * __restrict cfg) |
|
{ |
|
struct tagCfg *item, *next, *prev = NULL; |
|
|
|
SLIST_FOREACH_SAFE(item, cfg, cfg_next, next) { |
|
item->cfg_next.sle_next = prev; |
|
prev = item; |
|
} |
|
cfg->slh_first = prev; |
|
} |
|
|
|
|
|
/* |
/* |
* cfgReadConfig() - Read file and add new item at config root |
* cfgReadConfig() - Read file and add new item at config root |
* |
* |
Line 120 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
Line 107 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
|
} else { |
} else { |
memset(av, 0, sizeof(struct tagCfg)); |
memset(av, 0, sizeof(struct tagCfg)); |
CFG_RC_LOCK(cfg); |
CFG_RC_LOCK(cfg); |
SLIST_INSERT_HEAD(cfg, av, cfg_next); | TAILQ_INSERT_TAIL(cfg, av, cfg_next); |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
} |
} |
|
|
Line 203 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 190 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
return -1; |
return -1; |
} |
} |
|
|
|
if (whitespace) { |
|
time(&tim); |
|
memset(line, 0, sizeof line); |
|
strftime(line, sizeof line, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
|
cfg_Write(f, "## Config auto-generated at :: %s ##\n", line); |
|
} |
|
|
CFG_RC_LOCK(cfg); |
CFG_RC_LOCK(cfg); |
_invertQueue(cfg); | RB_FOREACH(av, tagRC, cfg) { |
SLIST_FOREACH(av, cfg, cfg_next) { | |
/* empty lines or comment */ |
/* empty lines or comment */ |
if (AIT_ISEMPTY(&av->cfg_attr)) { |
if (AIT_ISEMPTY(&av->cfg_attr)) { |
if (AIT_ISEMPTY(&av->cfg_val)) |
if (AIT_ISEMPTY(&av->cfg_val)) |
Line 216 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 209 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
|
|
/* section [] */ |
/* section [] */ |
if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && |
if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && |
strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) { | strcmp(AIT_GET_STRZ(&av->cfg_sec), szSection)) { |
strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
if (!cfg_Write(f, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) { | if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) { |
LOGERR; |
LOGERR; |
_invertQueue(cfg); |
|
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
memset(szSection, 0, sizeof szSection); |
memset(szSection, 0, sizeof szSection); |
if (!cfg_Write(f, "[]\n")) { | if (!cfg_Write(f, "\n[]\n")) { |
LOGERR; |
LOGERR; |
_invertQueue(cfg); |
|
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
Line 249 skip_sec:
|
Line 240 skip_sec:
|
/* write */ |
/* write */ |
if (!cfg_Write(f, "%s\n", line)) { |
if (!cfg_Write(f, "%s\n", line)) { |
LOGERR; |
LOGERR; |
_invertQueue(cfg); |
|
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
} |
} |
_invertQueue(cfg); |
|
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
|
|
if (whitespace) { |
if (whitespace) { |
Line 285 cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_
|
Line 274 cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_
|
CFG_RC_LOCK(add_cfg); |
CFG_RC_LOCK(add_cfg); |
CFG_RC_LOCK(cfg); |
CFG_RC_LOCK(cfg); |
|
|
/* concat lists */ | /* concat lists & red-black trees */ |
for (item = SLIST_FIRST(cfg); SLIST_NEXT(item, cfg_next); item = SLIST_NEXT(item, cfg_next)); | TAILQ_FOREACH(item, add_cfg, cfg_next) { |
SLIST_NEXT(item, cfg_next) = SLIST_FIRST(add_cfg); | TAILQ_INSERT_TAIL(cfg, item, cfg_next); |
| |
/* concat red-black trees */ | |
SLIST_FOREACH(item, add_cfg, cfg_next) | |
RB_INSERT(tagRC, cfg, item); |
RB_INSERT(tagRC, cfg, item); |
|
} |
|
|
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
|
|
add_cfg->slh_first = NULL; | TAILQ_INIT(add_cfg); |
add_cfg->rbh_root = NULL; | RB_INIT(add_cfg); |
CFG_RC_UNLOCK(add_cfg); |
CFG_RC_UNLOCK(add_cfg); |
pthread_mutex_destroy(&add_cfg->rc_mtx); |
pthread_mutex_destroy(&add_cfg->rc_mtx); |
return 0; |
return 0; |
Line 322 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
Line 309 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
CFG_RC_LOCK(cfg); |
CFG_RC_LOCK(cfg); |
|
|
/* merge lists */ |
/* merge lists */ |
SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { | TAILQ_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { |
flg = 0; |
flg = 0; |
SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { | TAILQ_FOREACH_SAFE(merge, cfg, cfg_next, next) { |
if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { |
if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { |
flg = 1; |
flg = 1; |
break; |
break; |
Line 338 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
Line 325 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
} |
} |
|
|
if (!flg) |
if (!flg) |
SLIST_INSERT_HEAD(cfg, item, cfg_next); | TAILQ_INSERT_TAIL(cfg, item, cfg_next); |
else |
else |
SLIST_INSERT_AFTER(merge, item, cfg_next); | TAILQ_INSERT_AFTER(cfg, merge, item, cfg_next); |
RB_INSERT(tagRC, cfg, item); |
RB_INSERT(tagRC, cfg, item); |
} |
} |
|
|
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
|
|
add_cfg->slh_first = NULL; | TAILQ_INIT(add_cfg); |
add_cfg->rbh_root = NULL; | RB_INIT(add_cfg); |
CFG_RC_UNLOCK(add_cfg); |
CFG_RC_UNLOCK(add_cfg); |
pthread_mutex_destroy(&add_cfg->rc_mtx); |
pthread_mutex_destroy(&add_cfg->rc_mtx); |
return 0; |
return 0; |
Line 424 cfgReadLines(FILE *f, const char *delim, const char *e
|
Line 411 cfgReadLines(FILE *f, const char *delim, const char *e
|
/* find & delete duplicates */ |
/* find & delete duplicates */ |
if ((d = RB_FIND(tagRC, cfg, av))) { |
if ((d = RB_FIND(tagRC, cfg, av))) { |
RB_REMOVE(tagRC, cfg, d); |
RB_REMOVE(tagRC, cfg, d); |
SLIST_REMOVE(cfg, d, tagCfg, cfg_next); | TAILQ_REMOVE(cfg, d, cfg_next); |
|
|
AIT_FREE_VAL(&d->cfg_val); |
AIT_FREE_VAL(&d->cfg_val); |
AIT_FREE_VAL(&d->cfg_attr); |
AIT_FREE_VAL(&d->cfg_attr); |
Line 432 cfgReadLines(FILE *f, const char *delim, const char *e
|
Line 419 cfgReadLines(FILE *f, const char *delim, const char *e
|
e_free(d); |
e_free(d); |
} |
} |
|
|
SLIST_INSERT_HEAD(cfg, av, cfg_next); | TAILQ_INSERT_TAIL(cfg, av, cfg_next); |
RB_INSERT(tagRC, cfg, av); |
RB_INSERT(tagRC, cfg, av); |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
} |
} |
Line 468 cfgWriteLines(FILE *f, const char *delim, const char *
|
Line 455 cfgWriteLines(FILE *f, const char *delim, const char *
|
} else |
} else |
AIT_INIT_VAL2(v, string); |
AIT_INIT_VAL2(v, string); |
|
|
SLIST_FOREACH(av, cfg, cfg_next) { | TAILQ_FOREACH(av, cfg, cfg_next) { |
if (AIT_ISEMPTY(&av->cfg_attr)) |
if (AIT_ISEMPTY(&av->cfg_attr)) |
continue; |
continue; |
if (section) { |
if (section) { |
if (!AIT_ISEMPTY(&av->cfg_sec) && *section) |
if (!AIT_ISEMPTY(&av->cfg_sec) && *section) |
continue; |
continue; |
if (strcmp(section, AIT_GET_STR(&av->cfg_sec))) | if (strcmp(section, AIT_GET_STRZ(&av->cfg_sec))) |
continue; |
continue; |
} |
} |
|
|