* UCW Library -- Configuration files: interpreter
*
* (c) 2001--2006 Robert Spalek <robert@ucw.cz>
- * (c) 2003--2012 Martin Mares <mj@ucw.cz>
+ * (c) 2003--2014 Martin Mares <mj@ucw.cz>
*
* This software may be freely distributed and used according to the terms
* of the GNU Lesser General Public License.
#include <ucw/getopt.h>
#include <ucw/conf-internal.h>
#include <ucw/clists.h>
+#include <ucw/gary.h>
+#include <ucw/mempool.h>
#include <string.h>
#include <stdio.h>
typedef char *cf_basic_parser(char *str, void *ptr);
static struct {
- uns size;
+ uint size;
void *parser;
} parsers[] = {
{ sizeof(int), cf_parse_int },
{ 0, NULL }, // user-defined types are parsed extra
};
-inline uns
+inline uint
cf_type_size(enum cf_type type, struct cf_user_type *utype)
{
if (type < CT_USER)
cf_parse_lookup(char *str, int *ptr, const char * const *t)
{
const char * const *n = t;
- uns total_len = 0;
+ uint total_len = 0;
while (*n && strcasecmp(*n, str)) {
total_len += strlen(*n) + 2;
n++;
}
static char *
-cf_parse_ary(uns number, char **pars, void *ptr, enum cf_type type, union cf_union *u)
+cf_parse_ary(uint number, char **pars, void *ptr, enum cf_type type, union cf_union *u)
{
- for (uns i=0; i<number; i++)
+ for (uint i=0; i<number; i++)
{
char *msg;
- uns size = cf_type_size(type, u->utype);
+ uint size = cf_type_size(type, u->utype);
if (type < CT_LOOKUP)
msg = ((cf_basic_parser*) parsers[type].parser) (pars[i], ptr + i * size);
else if (type == CT_LOOKUP)
#undef T
char *cf_type_names[] = { "int", "u64", "double", "ip", "string", "lookup", "user" };
-#define DARY_HDR_SIZE ALIGN_TO(sizeof(uns), CPU_STRUCT_ALIGN)
-
static char *
interpret_set_dynamic(struct cf_item *item, int number, char **pars, void **ptr)
{
enum cf_type type = item->type;
+ uint size = cf_type_size(type, item->u.utype);
cf_journal_block(ptr, sizeof(void*));
// boundary checks done by the caller
- uns size = cf_type_size(item->type, item->u.utype);
- *ptr = cf_malloc(DARY_HDR_SIZE + number * size) + DARY_HDR_SIZE;
- DARY_LEN(*ptr) = number;
+ *ptr = gary_init(size, number, mp_get_allocator(cf_get_pool()));
return cf_parse_ary(number, pars, *ptr, type, &item->u);
}
{
enum cf_type type = item->type;
void *old_p = *ptr;
- uns size = cf_type_size(item->type, item->u.utype);
- ASSERT(size >= sizeof(uns));
- int old_nr = old_p ? DARY_LEN(old_p) : 0;
+ uint size = cf_type_size(item->type, item->u.utype);
+ ASSERT(size >= sizeof(uint));
+ int old_nr = old_p ? GARY_SIZE(old_p) : 0;
int taken = MIN(number, ABS(item->number)-old_nr);
*processed = taken;
// stretch the dynamic array
- void *new_p = cf_malloc(DARY_HDR_SIZE + (old_nr + taken) * size) + DARY_HDR_SIZE;
- DARY_LEN(new_p) = old_nr + taken;
+ void *new_p = gary_init(size, old_nr + taken, mp_get_allocator(cf_get_pool()));
cf_journal_block(ptr, sizeof(void*));
*ptr = new_p;
if (op == OP_APPEND) {
return cf_printf("Dynamic arrays do not support operation %s", cf_op_names[op]);
}
-static char *interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uns allow_dynamic);
+static char *interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uint allow_dynamic);
static char *
-interpret_section(struct cf_section *sec, int number, char **pars, int *processed, void *ptr, uns allow_dynamic)
+interpret_section(struct cf_section *sec, int number, char **pars, int *processed, void *ptr, uint allow_dynamic)
{
cf_add_dirty(sec, ptr);
*processed = 0;
return "Nothing to add to the list";
struct cf_section *sec = item->u.sec;
*processed = 0;
- uns index = 0;
+ uint index = 0;
while (number > 0)
{
void *node = cf_malloc(sec->size);
return cf_printf("Type %s cannot be used with bitmaps", cf_type_names[item->type]);
cf_journal_block(ptr, sizeof(u32));
for (int i=0; i<number; i++) {
- uns idx;
+ uint idx;
if (item->type == CT_INT)
TRY( cf_parse_int(pars[i], &idx) );
else
}
static char *
-interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uns allow_dynamic)
+interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uint allow_dynamic)
{
int taken;
switch (item->cls)
return "Missing value";
taken = MIN(number, item->number);
*processed = taken;
- uns size = cf_type_size(item->type, item->u.utype);
+ uint size = cf_type_size(item->type, item->u.utype);
cf_journal_block(ptr, taken * size);
return cf_parse_ary(taken, pars, ptr, item->type, &item->u);
case CC_DYNAMIC:
if (item->type == CT_INT)
* (u32*) ptr = ~0u;
else {
- uns nr = -1;
+ uint nr = -1;
while (item->u.lookup[++nr]);
* (u32*) ptr = ~0u >> (32-nr);
}
clist_init(ptr);
} else if (item->cls == CC_DYNAMIC) {
cf_journal_block(ptr, sizeof(void *));
- static uns zero = 0;
- * (void**) ptr = (&zero) + 1;
+ * (void**) ptr = GARY_FOREVER_EMPTY;
} else if (item->cls == CC_STATIC && item->type == CT_STRING) {
cf_journal_block(ptr, item->number * sizeof(char*));
bzero(ptr, item->number * sizeof(char*));
{
CLIST_FOR_EACH(cnode *, n, *list)
{
- uns found = 1;
- for (uns i=0; i<32; i++)
+ uint found = 1;
+ for (uint i=0; i<32; i++)
if (mask & (1<<i))
if (cmp_items(n, query, sec->cfg+i))
{
static char *
record_selector(struct cf_item *item, struct cf_section *sec, u32 *mask)
{
- uns nr = sec->flags & SEC_FLAG_NUMBER;
+ uint nr = sec->flags & SEC_FLAG_NUMBER;
if (item >= sec->cfg && item < sec->cfg + nr) // setting an attribute relative to this section
{
- uns i = item - sec->cfg;
+ uint i = item - sec->cfg;
if (i >= 32)
return "Cannot select list nodes by this attribute";
if (sec->cfg[i].cls != CC_STATIC)
int
cf_done_stack(struct cf_context *cc)
{
- if (cc->stack_level > 0) {
- msg(L_ERROR, "Unterminated block");
- return 1;
- }
- if (cf_commit_all(cc->postpone_commit ? CF_NO_COMMIT : cc->everything_committed ? CF_COMMIT : CF_COMMIT_ALL))
- return 1;
- if (!cc->postpone_commit)
- cc->everything_committed = 1;
- return 0;
+ return (cc->stack_level > 0);
}