X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=19faee43994bdde816a6a84f4c09061bfb25bb4f;hb=05f4df73b1421202882e7dcac5ccd4aaa131ec6d;hp=77dae0e18e7488f4c95ab578ec9748bbd6978565;hpb=8aad76aecaf3159469b75ce8ab4fd3aeb27e57f3;p=sysdb.git diff --git a/src/core/store.c b/src/core/store.c index 77dae0e..19faee4 100644 --- a/src/core/store.c +++ b/src/core/store.c @@ -118,30 +118,6 @@ store_obj_destroy(sdb_object_t *obj) sdb_object_deref(SDB_OBJ(sobj->parent)); } /* store_obj_destroy */ -/* this may not be used as a type on its own but only as helper functions for - * the derived types; the function accepts a variadic list of arguments to - * pass to the sub-type's init function */ -static sdb_object_t * -store_obj_clone(const sdb_object_t *obj, ...) -{ - const store_obj_t *sobj = STORE_CONST_OBJ(obj); - store_obj_t *new; - - va_list ap; - - va_start(ap, obj); - - new = STORE_OBJ(sdb_object_vcreate(obj->name, obj->type, ap)); - va_end(ap); - if (! new) - return NULL; - - new->last_update = sobj->last_update; - sdb_object_ref(SDB_OBJ(sobj->parent)); - new->parent = sobj->parent; - return SDB_OBJ(new); -} /* store_obj_clone */ - static int sdb_store_obj_init(sdb_object_t *obj, va_list ap) { @@ -178,36 +154,6 @@ sdb_store_obj_destroy(sdb_object_t *obj) sdb_llist_destroy(sobj->attributes); } /* sdb_store_obj_destroy */ -static sdb_object_t * -sdb_store_obj_clone(const sdb_object_t *obj) -{ - const sdb_store_obj_t *sobj = SDB_CONST_STORE_OBJ(obj); - sdb_store_obj_t *new; - - new = SDB_STORE_OBJ(store_obj_clone(obj, sobj->_last_update, sobj->type)); - if (! new) - return NULL; - - if (sobj->children) { - sdb_llist_destroy(new->children); - new->children = sdb_llist_clone(sobj->children); - if (! new->children) { - sdb_object_deref(SDB_OBJ(new)); - return NULL; - } - } - if (sobj->attributes) { - sdb_llist_destroy(new->attributes); - new->attributes = sdb_llist_clone(sobj->attributes); - if (! new->attributes) { - sdb_object_deref(SDB_OBJ(new)); - return NULL; - } - } - - return SDB_OBJ(new); -} /* sdb_store_obj_clone */ - static int sdb_attr_init(sdb_object_t *obj, va_list ap) { @@ -219,9 +165,11 @@ sdb_attr_init(sdb_object_t *obj, va_list ap) return ret; value = va_arg(ap, const char *); - SDB_ATTR(obj)->value = strdup(value); - if (! SDB_ATTR(obj)->value) - return -1; + if (value) { + SDB_ATTR(obj)->value = strdup(value); + if (! SDB_ATTR(obj)->value) + return -1; + } return 0; } /* sdb_attr_init */ @@ -236,32 +184,18 @@ sdb_attr_destroy(sdb_object_t *obj) free(SDB_ATTR(obj)->value); } /* sdb_attr_destroy */ -static sdb_object_t * -sdb_attr_clone(const sdb_object_t *obj) -{ - const sdb_attribute_t *attr = (const sdb_attribute_t *)obj; - sdb_attribute_t *new; - - new = SDB_ATTR(store_obj_clone(obj, attr->_last_update, attr->value)); - if (! new) - return NULL; - return SDB_OBJ(new); -} /* sdb_attr_clone */ - static sdb_type_t sdb_store_obj_type = { sizeof(sdb_store_obj_t), sdb_store_obj_init, - sdb_store_obj_destroy, - sdb_store_obj_clone + sdb_store_obj_destroy }; static sdb_type_t sdb_attribute_type = { sizeof(sdb_attribute_t), sdb_attr_init, - sdb_attr_destroy, - sdb_attr_clone + sdb_attr_destroy }; /* @@ -312,13 +246,12 @@ store_obj(int parent_type, const char *parent_name, int type, const char *name, sdb_time_t last_update, store_obj_t **updated_obj) { + char *parent_cname = NULL, *cname = NULL; + sdb_llist_t *parent_list; store_obj_t *old; int status = 0; - if (! name) - return -1; - if (last_update <= 0) last_update = sdb_gettime(); @@ -330,10 +263,29 @@ store_obj(int parent_type, const char *parent_name, || (type == SDB_SERVICE) || (type == SDB_ATTRIBUTE)); + if (parent_type == SDB_HOST) { + parent_cname = sdb_plugin_cname(strdup(parent_name)); + if (! parent_cname) { + sdb_log(SDB_LOG_ERR, "store: strdup failed"); + return -1; + } + parent_name = parent_cname; + } + if (type == SDB_HOST) { + cname = sdb_plugin_cname(strdup(name)); + if (! cname) { + sdb_log(SDB_LOG_ERR, "store: strdup failed"); + return -1; + } + name = cname; + } if (! obj_list) { - if (! (obj_list = sdb_llist_create())) + if (! (obj_list = sdb_llist_create())) { + free(parent_cname); + free(cname); return -1; + } } parent_list = obj_list; @@ -345,6 +297,8 @@ store_obj(int parent_type, const char *parent_name, sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - " "parent %s '%s' not found", TYPE_TO_NAME(type), name, TYPE_TO_NAME(parent_type), parent_name); + free(parent_cname); + free(cname); return -1; } @@ -355,7 +309,10 @@ store_obj(int parent_type, const char *parent_name, } /* TODO: only look into direct children? */ - if (type == SDB_ATTRIBUTE) + if (type == SDB_HOST) + /* make sure that each host is unique */ + old = STORE_OBJ(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)); else old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, name)); @@ -392,6 +349,8 @@ store_obj(int parent_type, const char *parent_name, sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s", TYPE_TO_NAME(type), name, sdb_strerror(errno, errbuf, sizeof(errbuf))); + free(parent_cname); + free(cname); return -1; } @@ -406,6 +365,8 @@ store_obj(int parent_type, const char *parent_name, if (updated_obj) *updated_obj = new; } + free(parent_cname); + free(cname); return status; } /* sdb_store_obj */ @@ -416,24 +377,16 @@ store_obj(int parent_type, const char *parent_name, int sdb_store_host(const char *name, sdb_time_t last_update) { - char *cname; int status; if (! name) return -1; - cname = sdb_plugin_cname(strdup(name)); - if (! cname) { - sdb_log(SDB_LOG_ERR, "store: strdup failed"); - return -1; - } - pthread_rwlock_wrlock(&obj_lock); status = store_obj(/* parent = */ 0, NULL, - /* stored object = */ SDB_HOST, cname, last_update, + /* stored object = */ SDB_HOST, name, last_update, /* updated_obj = */ NULL); pthread_rwlock_unlock(&obj_lock); - free(cname); return status; } /* sdb_store_host */ @@ -453,7 +406,6 @@ int sdb_store_attribute(const char *hostname, const char *key, const char *value, sdb_time_t last_update) { - char *cname; int status; store_obj_t *updated_attr = NULL; @@ -461,14 +413,8 @@ sdb_store_attribute(const char *hostname, const char *key, const char *value, if ((! hostname) || (! key)) return -1; - cname = sdb_plugin_cname(strdup(hostname)); - if (! cname) { - sdb_log(SDB_LOG_ERR, "store: strdup failed"); - return -1; - } - pthread_rwlock_wrlock(&obj_lock); - status = store_obj(/* parent = */ SDB_HOST, cname, + status = store_obj(/* parent = */ SDB_HOST, hostname, /* stored object = */ SDB_ATTRIBUTE, key, last_update, &updated_attr); @@ -478,7 +424,6 @@ sdb_store_attribute(const char *hostname, const char *key, const char *value, status = -1; } pthread_rwlock_unlock(&obj_lock); - free(cname); return status; } /* sdb_store_attribute */ @@ -486,24 +431,16 @@ int sdb_store_service(const char *hostname, const char *name, sdb_time_t last_update) { - char *cname; int status; if ((! hostname) || (! name)) return -1; - cname = sdb_plugin_cname(strdup(hostname)); - if (! cname) { - sdb_log(SDB_LOG_ERR, "store: strdup failed"); - return -1; - } - pthread_rwlock_wrlock(&obj_lock); - status = store_obj(/* parent = */ SDB_HOST, cname, + status = store_obj(/* parent = */ SDB_HOST, hostname, /* stored object = */ SDB_SERVICE, name, last_update, /* updated obj = */ NULL); pthread_rwlock_unlock(&obj_lock); - free(cname); return status; } /* sdb_store_service */