ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-07 11:08:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add log format config options for file and stderr

Browse Source 
Upgrade configuration schema macros to allow optional "default label"
argument to SUB_STRUCT and VALUE_SUB_STRUCT elements.

New STRUCT_DEFAULT section declares alternative STRUCT default values
with a label.
This commit is contained in:
Andrew Bettison 2013-03-25 17:46:56 +10:30
parent a88234ce9d
commit d3d6fa4547
7 changed files with 315 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.c
View File

@ -82,14 +82,12 @@ static int reload(const char *path, int *resultp)
INFOF("config file %s -- detected new version", conffile_path());
char *buf = NULL;
if (meta.mtime == -1) {
if (serverMode)
INFOF("config file %s does not exist", path);
WARNF("config file %s does not exist -- using all defaults", path);
} else if (meta.size > CONFIG_FILE_MAX_SIZE) {
WHYF("config file %s is too big (%ld bytes exceeds limit %ld)", path, meta.size, CONFIG_FILE_MAX_SIZE);
return -1;
} else if (meta.size <= 0) {
if (serverMode)
INFOF("config file %s is zero size", path);
WARNF("config file %s is zero size -- using all defaults", path);
} else {
FILE *f = fopen(path, "r");
if (f == NULL) {

82
conf.h
View File

@ -314,12 +314,18 @@ struct pattern_list {
__type __element;
#define STRING(__size, __element, __default, __repr, __flags, __comment) \
char __element[__size + 1];
#define SUB_STRUCT(__name, __element, __flags) \
#define SUB_STRUCT(__name, __element, __flags, __dfllabel...) \
struct config_##__name __element;
#define NODE_STRUCT(__name, __element, __repr, __flags) \
#define NODE_STRUCT(__name, __element, __repr, __flags, __dfllabel...) \
struct config_##__name __element;
#define END_STRUCT \
};
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
struct config_##__name { \
unsigned ac; \
@ -334,7 +340,7 @@ struct pattern_list {
char value[(__strsize) + 1];
#define VALUE_NODE(__type, __eltrepr) \
__type value;
#define VALUE_SUB_STRUCT(__structname) \
#define VALUE_SUB_STRUCT(__structname, __dfllabel...) \
struct config_##__structname value;
#define VALUE_NODE_STRUCT(__structname, __eltrepr) \
struct config_##__structname value;
@ -349,6 +355,12 @@ struct pattern_list {
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -362,13 +374,23 @@ struct pattern_list {
// Generate config function prototypes, cf_dfl_config_NAME(), cf_sch_config_NAME().
#define STRUCT(__name, __validator...) \
int cf_dfl_config_##__name(struct config_##__name *s); \
int cf_dfl_config_##__name##_cf_(struct config_##__name *s); \
int cf_sch_config_##__name(struct cf_om_node **parentp);
#define NODE(__type, __element, __default, __repr, __flags, __comment)
#define ATOM(__type, __element, __default, __repr, __flags, __comment)
#define STRING(__size, __element, __default, __repr, __flags, __comment)
#define SUB_STRUCT(__name, __element, __flags)
#define NODE_STRUCT(__name, __element, __repr, __flags)
#define SUB_STRUCT(__name, __element, __flags, __dfllabel...) \
int cf_dfl_config_##__name##_cf_##__dfllabel(struct config_##__name *s);
#define NODE_STRUCT(__name, __element, __repr, __flags, __dfllabel...) \
int cf_dfl_config_##__name##_cf_##__dfllabel(struct config_##__name *s);
#define END_STRUCT
#define STRUCT_DEFAULT(__name, __dfllabel) \
int cf_dfl_config_##__name##_cf_##__dfllabel(struct config_##__name *s);
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int cf_dfl_config_##__name(struct config_##__name *a); \
int cf_sch_config_##__name(struct cf_om_node **parentp);
@ -377,7 +399,7 @@ struct pattern_list {
#define VALUE_ATOM(__type, __eltrepr)
#define VALUE_STRING(__strsize, __eltrepr)
#define VALUE_NODE(__type, __eltrepr)
#define VALUE_SUB_STRUCT(__structname)
#define VALUE_SUB_STRUCT(__structname, __dfllabel...)
#define VALUE_NODE_STRUCT(__structname, __eltrepr)
#define END_ARRAY(__size)
#include "conf_schema.h"
@ -388,6 +410,12 @@ struct pattern_list {
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -405,6 +433,7 @@ struct pattern_list {
#define STRUCT(__name, __validator...) \
int cf_opt_config_##__name(struct config_##__name *, const struct cf_om_node *); \
int cf_fmt_config_##__name(struct cf_om_node **, const struct config_##__name *); \
int cf_xfmt_config_##__name(struct cf_om_node **, const struct config_##__name *, const struct config_##__name *); \
int cf_cmp_config_##__name(const struct config_##__name *, const struct config_##__name *); \
__VALIDATOR(__name, ##__validator)
#define NODE(__type, __element, __default, __repr, __flags, __comment) \
@ -419,19 +448,27 @@ struct pattern_list {
int cf_opt_##__repr(char *, size_t, const char *); \
int cf_fmt_##__repr(const char **, const char *); \
int cf_cmp_##__repr(const char *, const char *);
#define SUB_STRUCT(__structname, __element, __flags) \
#define SUB_STRUCT(__structname, __element, __flags, __dfllabel...) \
int cf_opt_config_##__structname(struct config_##__structname *, const struct cf_om_node *); \
int cf_fmt_config_##__structname(struct cf_om_node **, const struct config_##__structname *); \
int cf_xfmt_config_##__structname(struct cf_om_node **, const struct config_##__structname *, const struct config_##__structname *); \
int cf_cmp_config_##__structname(const struct config_##__structname *, const struct config_##__structname *);
#define NODE_STRUCT(__structname, __element, __repr, __flags) \
SUB_STRUCT(__structname, __element, __flags) \
#define NODE_STRUCT(__structname, __element, __repr, __flags, __dfllabel...) \
SUB_STRUCT(__structname, __element, __flags, ##__dfllabel) \
int cf_opt_##__repr(struct config_##__structname *, const struct cf_om_node *); \
int cf_fmt_##__repr(struct cf_om_node **, const struct config_##__structname *); \
int cf_cmp_##__repr(const struct config_##__structname *, const struct config_##__structname *);
#define END_STRUCT
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int cf_opt_config_##__name(struct config_##__name *, const struct cf_om_node *); \
int cf_fmt_config_##__name(struct cf_om_node **, const struct config_##__name *); \
int cf_xfmt_config_##__name(struct cf_om_node **, const struct config_##__name *, const struct config_##__name *); \
int cf_cmp_config_##__name(const struct config_##__name *, const struct config_##__name *); \
__VALIDATOR(__name, ##__validator)
#define KEY_ATOM(__type, __keyrepr) \
@ -454,9 +491,10 @@ struct pattern_list {
int cf_opt_##__eltrepr(__type *, const struct cf_om_node *); \
int cf_fmt_##__eltrepr(struct cf_om_node **, const __type *); \
int cf_cmp_##__eltrepr(const __type *, const __type *);
#define VALUE_SUB_STRUCT(__structname) \
#define VALUE_SUB_STRUCT(__structname, __dfllabel...) \
int cf_opt_config_##__structname(struct config_##__structname *, const struct cf_om_node *); \
int cf_fmt_config_##__structname(struct cf_om_node **, const struct config_##__structname *); \
int cf_xfmt_config_##__structname(struct cf_om_node **, const struct config_##__structname *, const struct config_##__structname *); \
int cf_cmp_config_##__structname(const struct config_##__structname *, const struct config_##__structname *);
#define VALUE_NODE_STRUCT(__structname, __repr) \
VALUE_SUB_STRUCT(__structname) \
@ -473,6 +511,12 @@ struct pattern_list {
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -488,9 +532,15 @@ struct pattern_list {
#define NODE(__type, __element, __default, __repr, __flags, __comment)
#define ATOM(__type, __element, __default, __repr, __flags, __comment)
#define STRING(__size, __element, __default, __repr, __flags, __comment)
#define SUB_STRUCT(__name, __element, __flags)
#define NODE_STRUCT(__name, __element, __repr, __flags)
#define SUB_STRUCT(__name, __element, __flags, __dfllabel...)
#define NODE_STRUCT(__name, __element, __repr, __flags, __dfllabel...)
#define END_STRUCT
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int config_##__name##__get(const struct config_##__name *,
#define KEY_ATOM(__type, __keyrepr) \
@ -500,7 +550,7 @@ struct pattern_list {
#define VALUE_ATOM(__type, __eltrepr)
#define VALUE_STRING(__strsize, __eltrepr)
#define VALUE_NODE(__type, __eltrepr)
#define VALUE_SUB_STRUCT(__structname)
#define VALUE_SUB_STRUCT(__structname, __dfllabel...)
#define VALUE_NODE_STRUCT(__structname, __eltrepr)
#define END_ARRAY(__size)
#include "conf_schema.h"
@ -511,6 +561,12 @@ struct pattern_list {
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING

212
conf_parse.c
View File

@ -23,22 +23,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Generate config set-default function definitions, cf_dfl_config_NAME().
#define STRUCT(__name, __validator...) \
int cf_dfl_config_##__name(struct config_##__name *s) {
int cf_dfl_config_##__name(struct config_##__name *s) { \
return cf_dfl_config_##__name##_cf_(s); \
} \
int cf_dfl_config_##__name##_cf_(struct config_##__name *s) {
#define NODE(__type, __element, __default, __repr, __flags, __comment) \
s->__element = (__default);
#define ATOM(__type, __element, __default, __repr, __flags, __comment) \
s->__element = (__default);
#define STRING(__size, __element, __default, __repr, __flags, __comment) \
strncpy(s->__element, (__default), (__size))[(__size)] = '\0';
#define SUB_STRUCT(__name, __element, __flags) \
cf_dfl_config_##__name(&s->__element);
#define NODE_STRUCT(__name, __element, __repr, __flags) \
cf_dfl_config_##__name(&s->__element);
#define SUB_STRUCT(__name, __element, __flags, __dlflabel...) \
cf_dfl_config_##__name##_cf_##__dlflabel(&s->__element);
#define NODE_STRUCT(__name, __element, __repr, __flags, __dfllabel...) \
SUB_STRUCT(__name, __element, __flags, ##__dfllabel)
#define END_STRUCT \
return CFOK; \
}
#define STRUCT_DEFAULT(__name, __dfllabel) \
int cf_dfl_config_##__name##_cf_##__dfllabel(struct config_##__name *s) {
#define ATOM_DEFAULT(__element, __default) \
s->__element = (__default);
#define STRING_DEFAULT(__element, __default) \
s->__element = (__default);
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel...) \
cf_dfl_config_##__name##_cf_##__dlflabel(&s->__element);
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel...) \
SUB_STRUCT_DEFAULT(__name, __element, ##__dfllabel)
#define END_STRUCT_DEFAULT \
return CFOK; \
}
#define ARRAY(__name, __flags, __validator...) \
int cf_dfl_config_##__name(struct config_##__name *a) { \
int cf_dfl_config_##__name(struct config_##__name *s) { \
return cf_dfl_config_##__name##_cf_(s); \
} \
int cf_dfl_config_##__name##_cf_(struct config_##__name *a) { \
a->ac = 0; \
return CFOK; \
}
@ -47,7 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define VALUE_ATOM(__type, __eltrepr)
#define VALUE_STRING(__strsize, __eltrepr)
#define VALUE_NODE(__type, __eltrepr)
#define VALUE_SUB_STRUCT(__structname)
#define VALUE_SUB_STRUCT(__structname, __dfllabel...)
#define VALUE_NODE_STRUCT(__structname, __eltrepr)
#define END_ARRAY(__size)
#include "conf_schema.h"
@ -58,6 +77,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -119,9 +144,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
__ITEM(__element, ((0 __flags)|__TEXT)&~__CHILDREN, child->text ? cf_opt_##__repr(&strct->__element, child->text) : CFEMPTY)
#define STRING(__size, __element, __default, __repr, __flags, __comment) \
__ITEM(__element, ((0 __flags)|__TEXT)&~__CHILDREN, child->text ? cf_opt_##__repr(strct->__element, (__size) + 1, child->text) : CFEMPTY)
#define SUB_STRUCT(__name, __element, __flags) \
#define SUB_STRUCT(__name, __element, __flags, __dfllabel...) \
__ITEM(__element, (0 __flags)|__CHILDREN, cf_opt_config_##__name(&strct->__element, child))
#define NODE_STRUCT(__name, __element, __repr, __flags) \
#define NODE_STRUCT(__name, __element, __repr, __flags, __dfllabel...) \
__ITEM(__element, (0 __flags)|__TEXT|__CHILDREN, cf_opt_##__repr(&strct->__element, child))
#define END_STRUCT \
{ \
@ -141,6 +166,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
result = (*validator)(node, strct, result); \
return result; \
}
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int cf_opt_config_##__name(struct config_##__name *array, const struct cf_om_node *node) { \
int flags = (0 __flags); \
@ -215,8 +246,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
__ARRAY_VALUE(CFOK, child->text ? cf_opt_##__eltrepr(array->av[n].value, sizeof array->av[n].value, child->text) : CFEMPTY)
#define VALUE_NODE(__type, __eltrepr) \
__ARRAY_VALUE(CFOK, cf_opt_##__eltrepr(&array->av[n].value, child))
#define VALUE_SUB_STRUCT(__structname) \
__ARRAY_VALUE(cf_dfl_config_##__structname(&array->av[n].value), cf_opt_config_##__structname(&array->av[n].value, child))
#define VALUE_SUB_STRUCT(__structname, __dfllabel...) \
__ARRAY_VALUE(cf_dfl_config_##__structname##_cf_##__dfllabel(&array->av[n].value), cf_opt_config_##__structname(&array->av[n].value, child))
#define VALUE_NODE_STRUCT(__structname, __eltrepr) \
__ARRAY_VALUE(cf_dfl_config_##__structname(&array->av[n].value), cf_opt_##__eltrepr(&array->av[n].value, child))
#include "conf_schema.h"
@ -227,6 +258,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -244,9 +281,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define NODE(__type, __element, __default, __repr, __flags, __comment)
#define ATOM(__type, __element, __default, __repr, __flags, __comment)
#define STRING(__size, __element, __default, __repr, __flags, __comment)
#define SUB_STRUCT(__name, __element, __flags)
#define NODE_STRUCT(__name, __element, __repr, __flags)
#define SUB_STRUCT(__name, __element, __flags, __dfllabel...)
#define NODE_STRUCT(__name, __element, __repr, __flags, __dfllabel...)
#define END_STRUCT
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int config_##__name##__get(const struct config_##__name *array,
#define KEY_ATOM(__type, __keyrepr) \
@ -268,7 +311,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define VALUE_ATOM(__type, __eltrepr)
#define VALUE_STRING(__strsize, __eltrepr)
#define VALUE_NODE(__type, __eltrepr)
#define VALUE_SUB_STRUCT(__structname)
#define VALUE_SUB_STRUCT(__structname, __dfllabel...)
#define VALUE_NODE_STRUCT(__structname, __eltrepr)
#define END_ARRAY(__size)
#include "conf_schema.h"
@ -279,6 +322,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -315,16 +364,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define STRING(__size, __element, __default, __repr, __flags, __comment) \
__ADD_CHILD(rootp, #__element) \
__ATOM(childp, "(" #__repr ")")
#define SUB_STRUCT(__structname, __element, __flags) \
#define SUB_STRUCT(__structname, __element, __flags, __dfllabel...) \
__ADD_CHILD(rootp, #__element) \
__STRUCT(childp, __structname)
#define NODE_STRUCT(__structname, __element, __repr, __flags) \
#define NODE_STRUCT(__structname, __element, __repr, __flags, __dfllabel...) \
__ADD_CHILD(rootp, #__element) \
__ATOM(childp, "(" #__repr ")") \
__STRUCT(childp, __structname)
#define END_STRUCT \
return 0; \
}
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int cf_sch_config_##__name(struct cf_om_node **rootp) { \
int i; \
@ -341,7 +396,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
__ATOM(childp, "(" #__eltrepr ")") \
__ADD_CHILD(childp, "(" #__eltrepr ")") \
__ATOM(childp, "(" #__eltrepr ")")
#define VALUE_SUB_STRUCT(__structname) \
#define VALUE_SUB_STRUCT(__structname, __dfllabel...) \
__STRUCT(childp, __structname)
#define VALUE_NODE_STRUCT(__structname, __eltrepr) \
__ATOM(childp, "(" #__eltrepr ")") \
@ -361,6 +416,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -374,6 +435,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Generate formatting functions, cf_fmt_config_SECTION()
#define STRUCT(__name, __validator...) \
int cf_fmt_config_##__name(struct cf_om_node **parentp, const struct config_##__name *strct) { \
return cf_xfmt_config_##__name(parentp, strct, NULL); \
} \
int cf_xfmt_config_##__name(struct cf_om_node **parentp, const struct config_##__name *strct, const struct config_##__name *dflt) { \
int result = CFOK; \
int ret;
#define __FMT_TEXT(__repr, __eltname, __eltexpr, __defaultvar) \
@ -401,49 +465,79 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
return CFERROR; \
else if (ret != CFOK && !is_default) \
result |= (ret & CF__SUBFLAGS) | CFSUB(ret & CF__FLAGS);
#define __FMT_NODE(__fmtfunc, __element) \
#define ATOM(__type, __element, __default, __repr, __flags, __comment) \
{ \
__type dfl = dflt ? dflt->__element : __default; \
int is_default = cf_cmp_##__repr(&strct->__element, &dfl) == 0; \
__FMT_TEXT(__repr, #__element, &strct->__element, __default) \
}
#define STRING(__size, __element, __default, __repr, __flags, __comment) \
{ \
int is_default = cf_cmp_##__repr(strct->__element, dflt ? dflt->__element : __default) == 0; \
__FMT_TEXT(__repr, #__element, strct->__element, __default) \
}
#define __FMT_NODE_START(__element) \
int n = cf_om_add_child(parentp, #__element); \
if (n == -1) \
ret = CFERROR; \
else { \
ret = __fmtfunc(&(*parentp)->nodv[n], &strct->__element); \
const char *funcname = NULL;
#define __FMT_NODE_END \
cf_om_remove_null_child(parentp, n); \
if (ret != CFOK) \
WARNF(#__fmtfunc "() returned %s", strbuf_str(strbuf_cf_flags(strbuf_alloca(300), ret))); \
WARNF("%s() returned %s", funcname, strbuf_str(strbuf_cf_flags(strbuf_alloca(300), ret))); \
if (n < (*parentp)->nodc && cf_om_remove_empty_child(parentp, n)) { \
WHYF(#__fmtfunc "() returned empty node at n=%d", n); \
WHYF("%s() returned empty node at n=%d", funcname, n); \
ret = CFERROR; \
} \
} \
if (ret == CFERROR) \
return CFERROR; \
else if (ret != CFOK) \
result |= (ret & CF__SUBFLAGS) | CFSUB(ret & CF__FLAGS); \
}
result |= (ret & CF__SUBFLAGS) | CFSUB(ret & CF__FLAGS);
#define NODE(__type, __element, __default, __repr, __flags, __comment) \
__FMT_NODE(cf_fmt_##__repr, __element)
#define ATOM(__type, __element, __default, __repr, __flags, __comment) \
{ \
__type dfl = __default; \
int is_default = cf_cmp_##__repr(&strct->__element, &dfl) == 0; \
__FMT_TEXT(__repr, #__element, &strct->__element, __default) \
__FMT_NODE_START(__element) \
ret = cf_fmt_##__repr(&(*parentp)->nodv[n], &strct->__element); \
funcname = "cf_fmt_" #__repr; \
__FMT_NODE_END \
}
#define STRING(__size, __element, __default, __repr, __flags, __comment) \
#define SUB_STRUCT(__structname, __element, __flags, __dfllabel...) \
{ \
int is_default = cf_cmp_##__repr(&strct->__element[0], __default) == 0; \
__FMT_TEXT(__repr, #__element, &strct->__element[0], __default) \
__FMT_NODE_START(__element) \
if (#__dfllabel[0]) { \
struct config_##__structname dfl; \
cf_dfl_config_##__structname##_cf_##__dfllabel(&dfl); \
ret = cf_xfmt_config_##__structname(&(*parentp)->nodv[n], &strct->__element, &dfl); \
funcname = "cf_xfmt_config_" #__structname; \
} else { \
ret = cf_fmt_config_##__structname(&(*parentp)->nodv[n], &strct->__element); \
funcname = "cf_fmt_config_" #__structname; \
} \
__FMT_NODE_END \
}
#define NODE_STRUCT(__structname, __element, __repr, __flags, __dfllabel...) \
{ \
__FMT_NODE_START(__element) \
ret = cf_fmt_##__repr(&(*parentp)->nodv[n], &strct->__element); \
funcname = "cf_fmt_" #__repr; \
__FMT_NODE_END \
}
#define SUB_STRUCT(__structname, __element, __flags) \
__FMT_NODE(cf_fmt_config_##__structname, __element)
#define NODE_STRUCT(__structname, __element, __repr, __flags) \
__FMT_NODE(cf_fmt_##__repr, __element)
#define END_STRUCT \
if ((*parentp)->nodc == 0) \
cf_om_free_node(parentp); \
return result; \
}
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int cf_xfmt_config_##__name(struct cf_om_node **parentp, const struct config_##__name *array, const struct config_##__name *dflt) { \
return cf_fmt_config_##__name(parentp, array); \
} \
int cf_fmt_config_##__name(struct cf_om_node **parentp, const struct config_##__name *array) { \
int result = CFOK; \
int i; \
@ -478,9 +572,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __ARRAY_TEXT(__valuefunc, __eltexpr) \
ret = __valuefunc(&(*parentp)->nodv[n]->text, __eltexpr); \
__ARRAY_VALUE(__valuefunc)
#define __ARRAY_NODE(__valuefunc, __eltexpr) \
ret = __valuefunc(&(*parentp)->nodv[n], __eltexpr); \
__ARRAY_VALUE(__valuefunc)
#define END_ARRAY(__size) \
} \
if (ret == CFERROR) \
@ -501,11 +592,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define VALUE_STRING(__strsize, __eltrepr) \
__ARRAY_TEXT(cf_fmt_##__eltrepr, &array->av[i].value[0])
#define VALUE_NODE(__type, __eltrepr) \
__ARRAY_NODE(cf_fmt_##__eltrepr, &array->av[i].value)
#define VALUE_SUB_STRUCT(__structname) \
__ARRAY_NODE(cf_fmt_config_##__structname, &array->av[i].value)
ret = cf_fmt_##__eltrepr(&(*parentp)->nodv[n], &array->av[i].value); \
__ARRAY_VALUE(cf_fmt_##__eltrepr)
#define VALUE_SUB_STRUCT(__structname, __dfllabel...) \
if (#__dfllabel[0]) { \
struct config_##__structname dfl; \
cf_dfl_config_##__structname##_cf_##__dfllabel(&dfl); \
ret = cf_xfmt_config_##__structname(&(*parentp)->nodv[n], &array->av[i].value, &dfl); \
} else { \
ret = cf_fmt_config_##__structname(&(*parentp)->nodv[n], &array->av[i].value); \
} \
__ARRAY_VALUE(cf_fmt_config_##__structname)
#define VALUE_NODE_STRUCT(__structname, __eltrepr) \
__ARRAY_NODE(cf_fmt_##__eltrepr, &array->av[i].value)
ret = cf_fmt_##__eltrepr(&(*parentp)->nodv[n], &array->av[i].value); \
__ARRAY_VALUE(cf_fmt_##__eltrepr)
#include "conf_schema.h"
#undef STRUCT
#undef NODE
@ -515,7 +615,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#undef NODE_STRUCT
#undef END_STRUCT
#undef __FMT_TEXT
#undef __FMT_NODE
#undef __FMT_NODE_START
#undef __FMT_NODE_END
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING
@ -526,7 +633,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#undef VALUE_NODE_STRUCT
#undef __ARRAY_KEY
#undef __ARRAY_TEXT
#undef __ARRAY_NODE
#undef __ARRAY_VALUE
#undef END_ARRAY
@ -543,15 +649,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define STRING(__size, __element, __default, __repr, __flags, __comment) \
if ((c = cf_cmp_##__repr(&a->__element[0], &b->__element[0]))) \
return c;
#define SUB_STRUCT(__structname, __element, __flags) \
#define SUB_STRUCT(__structname, __element, __flags, __dfllabel...) \
if ((c = cf_cmp_config_##__structname(&a->__element, &b->__element))) \
return c;
#define NODE_STRUCT(__structname, __element, __repr, __flags) \
#define NODE_STRUCT(__structname, __element, __repr, __flags, __dfllabel...) \
if ((c = cf_cmp_##__repr(&a->__element, &b->__element))) \
return c;
#define END_STRUCT \
return 0; \
}
#define STRUCT_DEFAULT(__name, __dfllabel)
#define ATOM_DEFAULT(__element, __default)
#define STRING_DEFAULT(__element, __default)
#define SUB_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define NODE_STRUCT_DEFAULT(__name, __element, __dfllabel)
#define END_STRUCT_DEFAULT
#define ARRAY(__name, __flags, __validator...) \
int cf_cmp_config_##__name(const struct config_##__name *a, const struct config_##__name *b) { \
int c; \
@ -572,7 +684,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define VALUE_NODE(__type, __eltrepr) \
if ((c = cf_cmp_##__eltrepr(&a->av[i].value, &b->av[i].value))) \
return c;
#define VALUE_SUB_STRUCT(__structname) \
#define VALUE_SUB_STRUCT(__structname, __dfllabel...) \
if ((c = cf_cmp_config_##__structname(&a->av[i].value, &b->av[i].value))) \
return c;
#define VALUE_NODE_STRUCT(__structname, __eltrepr) \
@ -590,6 +702,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#undef SUB_STRUCT
#undef NODE_STRUCT
#undef END_STRUCT
#undef STRUCT_DEFAULT
#undef ATOM_DEFAULT
#undef STRING_DEFAULT
#undef SUB_STRUCT_DEFAULT
#undef NODE_STRUCT_DEFAULT
#undef END_STRUCT_DEFAULT
#undef ARRAY
#undef KEY_ATOM
#undef KEY_STRING

51
conf_schema.c
View File

@ -932,3 +932,54 @@ int cf_cmp_interface_list(const struct config_interface_list *a, const struct co
{
return cf_cmp_config_interface_list(a, b);
}
int cf_opt_log_level(int *levelp, const char *text)
{
if (strcmp(text, "none") == 0) {
*levelp = LOG_LEVEL_NONE;
return CFOK;
}
if (strcmp(text, "fatal") == 0) {
*levelp = LOG_LEVEL_FATAL;
return CFOK;
}
if (strcmp(text, "error") == 0) {
*levelp = LOG_LEVEL_ERROR;
return CFOK;
}
if (strcmp(text, "warn") == 0) {
*levelp = LOG_LEVEL_WARN;
return CFOK;
}
if (strcmp(text, "info") == 0) {
*levelp = LOG_LEVEL_INFO;
return CFOK;
}
if (strcmp(text, "debug") == 0) {
*levelp = LOG_LEVEL_DEBUG;
return CFOK;
}
return CFINVALID;
}
int cf_fmt_log_level(const char **textp, const int *levelp)
{
const char *t = NULL;
switch (*levelp) {
case LOG_LEVEL_NONE: t = "none"; break;
case LOG_LEVEL_FATAL: t = "fatal"; break;
case LOG_LEVEL_ERROR: t = "error"; break;
case LOG_LEVEL_WARN: t = "warn"; break;
case LOG_LEVEL_INFO: t = "info"; break;
case LOG_LEVEL_DEBUG: t = "debug"; break;
}
if (!t)
return CFINVALID;
*textp = str_edup(t);
return CFOK;
}
int cf_cmp_log_level(const int *a, const int *b)
{
return cf_cmp_int(a, b);
}

22
conf_schema.h
View File

@ -226,12 +226,30 @@ ATOM(bool_t, profiling, 0, boolean,, "")
ATOM(bool_t, externalblobs, 0, boolean,, "")
END_STRUCT
STRUCT(log)
STRING(256, file, "", str_nonempty,, "Path of log file, either absolute or relative to instance directory")
STRUCT(log_format)
ATOM(bool_t, show_pid, 1, boolean,, "If true, all log lines contain PID of logging process")
ATOM(bool_t, show_time, 1, boolean,, "If true, all log lines contain time stamp")
ATOM(int, level, LOG_LEVEL_DEBUG, log_level,, "Only log messages at and above this level of severity")
END_STRUCT
STRUCT(log)
STRING(256, file_path, "", str_nonempty,, "Path of log file, either absolute or relative to instance directory")
SUB_STRUCT(log_format, file_format,, full)
SUB_STRUCT(log_format, stderr_format,, helpful)
END_STRUCT
STRUCT_DEFAULT(log_format, helpful)
ATOM_DEFAULT(show_pid, 0)
ATOM_DEFAULT(show_time, 0)
ATOM_DEFAULT(level, LOG_LEVEL_WARN)
END_STRUCT_DEFAULT
STRUCT_DEFAULT(log_format, full)
ATOM_DEFAULT(show_pid, 1)
ATOM_DEFAULT(show_time, 1)
ATOM_DEFAULT(level, LOG_LEVEL_DEBUG)
END_STRUCT_DEFAULT
STRUCT(server)
STRING(256, chdir, "/", absolute_path,, "Absolute path of chdir(2) for server process")
STRING(256, interface_path, "", str_nonempty,, "Path of directory containing interface files, either absolute or relative to instance directory")

13
log.c
View File

@ -88,7 +88,7 @@ static FILE *_open_logging()
if (!logpath) {
if (cf_limbo)
return NULL;
logpath = config.log.file;
logpath = config.log.file_path;
}
if (!logpath || !logpath[0]) {
logfile = stderr;
@ -142,11 +142,12 @@ static const char *_trimbuildpath(const char *path)
static int _log_prepare(int level, struct __sourceloc whence)
{
if (level == LOG_LEVEL_SILENT)
assert(level <= LOG_LEVEL_FATAL);
if (level < config.log.file_format.level)
return 0;
struct timeval tv;
tv.tv_sec = 0;
if (config.log.show_time)
if (config.log.file_format.show_time)
gettimeofday(&tv, NULL);
if (!version_logged)
logVersion();
@ -162,15 +163,15 @@ static int _log_prepare(int level, struct __sourceloc whence)
switch (level) {
case LOG_LEVEL_FATAL: levelstr = "FATAL:"; break;
case LOG_LEVEL_ERROR: levelstr = "ERROR:"; break;
case LOG_LEVEL_INFO: levelstr = "INFO:"; break;
case LOG_LEVEL_WARN: levelstr = "WARN:"; break;
case LOG_LEVEL_INFO: levelstr = "INFO:"; break;
case LOG_LEVEL_DEBUG: levelstr = "DEBUG:"; break;
}
strbuf_sprintf(&logbuf, "%-6.6s", levelstr);
#endif
if (config.log.show_pid)
if (config.log.file_format.show_pid)
strbuf_sprintf(&logbuf, " [%5u]", getpid());
if (config.log.show_time) {
if (config.log.file_format.show_time) {
if (tv.tv_sec == 0) {
strbuf_puts(&logbuf, " NOTIME______");
} else {

1
log.h
View File

@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define LOG_LEVEL_WARN (2)
#define LOG_LEVEL_ERROR (3)
#define LOG_LEVEL_FATAL (4)
#define LOG_LEVEL_NONE (127)
/*
* Every log message identifies the location in the source code at which the