X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=e0c1ac6e6ede64893cac4d63e52b7892a6434ed6;hb=ad77b3eb0e2991430bad39db23bf694660c7b8a4;hp=cf4d4a40a9a700d3d50b2ccd38edb6e5bbe6fb47;hpb=bf37a5afbf7364f853140c6859822ae52d2b61d8;p=sysdb.git diff --git a/src/core/store.c b/src/core/store.c index cf4d4a4..e0c1ac6 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -1,6 +1,6 @@ /* * SysDB - src/core/store.c - * Copyright (C) 2012 Sebastian 'tokkee' Harl + * Copyright (C) 2012-2013 Sebastian 'tokkee' Harl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,8 +27,8 @@ #include "sysdb.h" #include "core/store.h" -#include "core/error.h" #include "core/plugin.h" +#include "utils/error.h" #include "utils/llist.h" #include @@ -55,19 +55,21 @@ static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER; static sdb_type_t sdb_store_obj_type; static sdb_type_t sdb_attribute_type; -struct store_obj; -typedef struct store_obj store_obj_t; - -struct store_obj { +struct sdb_store_base { sdb_object_t super; + + /* object type */ + int type; + + /* common meta information */ sdb_time_t last_update; - store_obj_t *parent; + sdb_store_base_t *parent; }; -#define STORE_OBJ(obj) ((store_obj_t *)(obj)) -#define STORE_CONST_OBJ(obj) ((const store_obj_t *)(obj)) +#define STORE_BASE(obj) ((sdb_store_base_t *)(obj)) +#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj)) typedef struct { - store_obj_t super; + sdb_store_base_t super; char *value; } sdb_attribute_t; @@ -75,11 +77,9 @@ typedef struct { #define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj)) typedef struct { - store_obj_t super; + sdb_store_base_t super; - int type; sdb_llist_t *children; - sdb_llist_t *attributes; } sdb_store_obj_t; #define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj)) @@ -100,23 +100,25 @@ enum { #define _last_update super.last_update static int -store_obj_init(sdb_object_t *obj, va_list ap) +store_base_init(sdb_object_t *obj, va_list ap) { - store_obj_t *sobj = STORE_OBJ(obj); - sobj->last_update = va_arg(ap, sdb_time_t); + sdb_store_base_t *sobj = STORE_BASE(obj); + sobj->type = va_arg(ap, int); + + sobj->last_update = va_arg(ap, sdb_time_t); sobj->parent = NULL; return 0; -} /* store_obj_init */ +} /* store_base_init */ static void -store_obj_destroy(sdb_object_t *obj) +store_base_destroy(sdb_object_t *obj) { - const store_obj_t *sobj = STORE_OBJ(obj); + const sdb_store_base_t *sobj = STORE_CONST_BASE(obj); if (sobj->parent) sdb_object_deref(SDB_OBJ(sobj->parent)); -} /* store_obj_destroy */ +} /* store_base_destroy */ static int sdb_store_obj_init(sdb_object_t *obj, va_list ap) @@ -124,12 +126,11 @@ sdb_store_obj_init(sdb_object_t *obj, va_list ap) sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj); int ret; - ret = store_obj_init(obj, ap); + /* this will consume the first argument (type) of ap */ + ret = store_base_init(obj, ap); if (ret) return ret; - sobj->type = va_arg(ap, int); - sobj->children = sdb_llist_create(); if (! sobj->children) return -1; @@ -146,7 +147,7 @@ sdb_store_obj_destroy(sdb_object_t *obj) assert(obj); - store_obj_destroy(obj); + store_base_destroy(obj); if (sobj->children) sdb_llist_destroy(sobj->children); @@ -160,7 +161,8 @@ sdb_attr_init(sdb_object_t *obj, va_list ap) const char *value; int ret; - ret = store_obj_init(obj, ap); + /* this will consume the first argument (type) of ap */ + ret = store_base_init(obj, ap); if (ret) return ret; value = va_arg(ap, const char *); @@ -178,7 +180,7 @@ sdb_attr_destroy(sdb_object_t *obj) { assert(obj); - store_obj_destroy(obj); + store_base_destroy(obj); if (SDB_ATTR(obj)->value) free(SDB_ATTR(obj)->value); @@ -218,12 +220,16 @@ sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name) sdb_store_obj_t *sobj = SDB_STORE_OBJ(sdb_llist_iter_get_next(iter)); assert(sobj); - if ((sobj->type == type) + if ((STORE_BASE(sobj)->type == type) && (! strcasecmp(SDB_OBJ(sobj)->name, name))) { sdb_llist_iter_destroy(iter); return sobj; } + /* don't lookups non-host types from hierarchical hosts */ + if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST)) + continue; + sobj = sdb_store_lookup_in_list(sobj->children, type, name); if (sobj) { sdb_llist_iter_destroy(iter); @@ -244,12 +250,12 @@ sdb_store_lookup(int type, const char *name) static int store_obj(int parent_type, const char *parent_name, int type, const char *name, sdb_time_t last_update, - store_obj_t **updated_obj) + sdb_store_base_t **updated_obj) { char *parent_cname = NULL, *cname = NULL; sdb_llist_t *parent_list; - store_obj_t *old; + sdb_store_base_t *old; int status = 0; if (last_update <= 0) @@ -308,14 +314,16 @@ store_obj(int parent_type, const char *parent_name, parent_list = parent->children; } - /* TODO: only look into direct children? */ if (type == SDB_HOST) /* make sure that each host is unique */ - old = STORE_OBJ(sdb_store_lookup_in_list(obj_list, type, name)); + old = STORE_BASE(sdb_store_lookup_in_list(obj_list, type, name)); else if (type == SDB_ATTRIBUTE) - old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name)); + /* look into attributes of this host */ + old = STORE_BASE(sdb_llist_search_by_name(parent_list, name)); else - old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, name)); + /* look into services assigned to this host (sdb_store_lookup_in_list + * does not look up services from hierarchical hosts) */ + old = STORE_BASE(sdb_store_lookup_in_list(parent_list, type, name)); if (old) { if (old->last_update > last_update) { @@ -334,15 +342,15 @@ store_obj(int parent_type, const char *parent_name, *updated_obj = old; } else { - store_obj_t *new; + sdb_store_base_t *new; if (type == SDB_ATTRIBUTE) /* the value will be updated by the caller */ - new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type, - last_update, NULL)); + new = STORE_BASE(sdb_object_create(name, sdb_attribute_type, + type, last_update, NULL)); else - new = STORE_OBJ(sdb_object_create(name, sdb_store_obj_type, - last_update, type)); + new = STORE_BASE(sdb_object_create(name, sdb_store_obj_type, + type, last_update)); if (! new) { char errbuf[1024]; @@ -408,7 +416,7 @@ sdb_store_attribute(const char *hostname, const char *key, const char *value, { int status; - store_obj_t *updated_attr = NULL; + sdb_store_base_t *updated_attr = NULL; if ((! hostname) || (! key)) return -1;