object system: Introduced a 'clone' callback for types.

This is currently registered for all 'store' types.

diff --git a/src/core/object.c b/src/core/object.c
index 8389c5194f89a1fb006007f234f6587c0143ddda..e9825b1d84cc122499600521a432e4bb162f24c8 100644 (file)
--- a/src/core/object.c
+++ b/src/core/object.c
@@ -66,7 +66,8 @@ static sdb_type_t sdb_object_wrapper_type = {
        sizeof(sdb_object_wrapper_t),
 
        sdb_object_wrapper_init,
-       sdb_object_wrapper_destroy
+       sdb_object_wrapper_destroy,
+       /* clone = */ NULL
 };
 
 /*

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 431264266ea66df7b10eadbe5c1d425487b1dac8..205c74f148d3f41cb97a1c5b9c891228d1fcc490 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -231,14 +231,16 @@ static sdb_type_t sdb_plugin_cb_type = {
        sizeof(sdb_plugin_cb_t),
 
        sdb_plugin_cb_init,
-       sdb_plugin_cb_destroy
+       sdb_plugin_cb_destroy,
+       /* clone = */ NULL
 };
 
 static sdb_type_t sdb_plugin_collector_cb_type = {
        sizeof(sdb_plugin_collector_cb_t),
 
        sdb_plugin_cb_init,
-       sdb_plugin_cb_destroy
+       sdb_plugin_cb_destroy,
+       /* clone = */ NULL
 };
 
 static int

diff --git a/src/core/store.c b/src/core/store.c
index db57d2e5ba9506bc7adafba2a48a58263a1edca0..7af662f8aa66a7ac4e6c7fd8489157c000915b8c 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -121,6 +121,39 @@ sdb_host_destroy(sdb_object_t *obj)
                sdb_llist_destroy(SDB_HOST(obj)->services);
 } /* sdb_host_destroy */
 
+static sdb_object_t *
+sdb_host_do_clone(const sdb_object_t *obj)
+{
+       const sdb_host_t *host = (const sdb_host_t *)obj;
+       sdb_host_t *new;
+
+       new = sdb_host_create(host->_name);
+       if (! new)
+               return NULL;
+
+       /* make sure these are initialized; else sdb_object_deref() might access
+        * arbitrary memory in case of an error */
+       new->services = new->attributes = NULL;
+
+       if (host->attributes) {
+               new->attributes = sdb_llist_clone(host->attributes);
+               if (! new->attributes) {
+                       sdb_object_deref(SDB_OBJ(new));
+                       return NULL;
+               }
+       }
+
+       new->_last_update = host->_last_update;
+       if (host->services) {
+               new->services = sdb_llist_clone(host->services);
+               if (! new->services) {
+                       sdb_object_deref(SDB_OBJ(new));
+                       return NULL;
+               }
+       }
+       return SDB_OBJ(new);
+} /* sdb_host_do_clone */
+
 static int
 sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
@@ -152,6 +185,21 @@ sdb_attr_destroy(sdb_object_t *obj)
                free(SDB_ATTR(obj)->attr_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_attribute_create(attr->hostname,
+                       attr->_name, attr->attr_value);
+       if (! new)
+               return NULL;
+
+       new->_last_update = attr->_last_update;
+       return SDB_OBJ(new);
+} /* sdb_attr_clone */
+
 static int
 sdb_svc_init(sdb_object_t *obj, va_list ap)
 {
@@ -179,25 +227,42 @@ sdb_svc_destroy(sdb_object_t *obj)
                free(SDB_SVC(obj)->_name);
 } /* sdb_svc_destroy */
 
+static sdb_object_t *
+sdb_svc_clone(const sdb_object_t *obj)
+{
+       const sdb_service_t *svc = (const sdb_service_t *)obj;
+       sdb_service_t *new;
+
+       new = sdb_service_create(svc->hostname, svc->_name);
+       if (! new)
+               return NULL;
+
+       new->_last_update = svc->_last_update;
+       return SDB_OBJ(new);
+} /* sdb_svc_clone */
+
 static sdb_type_t sdb_host_type = {
        sizeof(sdb_host_t),
 
        sdb_host_init,
-       sdb_host_destroy
+       sdb_host_destroy,
+       sdb_host_do_clone
 };
 
 static sdb_type_t sdb_attr_type = {
        sizeof(sdb_attribute_t),
 
        sdb_attr_init,
-       sdb_attr_destroy
+       sdb_attr_destroy,
+       sdb_attr_clone
 };
 
 static sdb_type_t sdb_svc_type = {
        sizeof(sdb_service_t),
 
        sdb_svc_init,
-       sdb_svc_destroy
+       sdb_svc_destroy,
+       sdb_svc_clone
 };
 
 /*
@@ -221,33 +286,7 @@ sdb_host_create(const char *name)
 sdb_host_t *
 sdb_host_clone(const sdb_host_t *host)
 {
-       sdb_host_t *new;
-
-       new = sdb_host_create(host->_name);
-       if (! new)
-               return NULL;
-
-       /* make sure these are initialized; else sdb_object_deref() might access
-        * arbitrary memory in case of an error */
-       new->services = new->attributes = NULL;
-
-       if (host->attributes) {
-               new->attributes = sdb_llist_clone(host->attributes);
-               if (! new->attributes) {
-                       sdb_object_deref(SDB_OBJ(new));
-                       return NULL;
-               }
-       }
-
-       new->_last_update = host->_last_update;
-       if (host->services) {
-               new->services = sdb_llist_clone(host->services);
-               if (! new->services) {
-                       sdb_object_deref(SDB_OBJ(new));
-                       return NULL;
-               }
-       }
-       return new;
+       return SDB_HOST(sdb_host_do_clone((const sdb_object_t *)host));
 } /* sdb_host_clone */
 
 int
@@ -373,15 +412,7 @@ sdb_attribute_create(const char *hostname,
 sdb_attribute_t *
 sdb_attribute_clone(const sdb_attribute_t *attr)
 {
-       sdb_attribute_t *new;
-
-       new = sdb_attribute_create(attr->hostname,
-                       attr->_name, attr->attr_value);
-       if (! new)
-               return NULL;
-
-       new->_last_update = attr->_last_update;
-       return new;
+       return SDB_ATTR(sdb_attr_clone((const sdb_object_t *)attr));
 } /* sdb_attribute_clone */
 
 int
@@ -472,14 +503,7 @@ sdb_service_create(const char *hostname, const char *name)
 sdb_service_t *
 sdb_service_clone(const sdb_service_t *svc)
 {
-       sdb_service_t *new;
-
-       new = sdb_service_create(svc->hostname, svc->_name);
-       if (! new)
-               return NULL;
-
-       new->_last_update = svc->_last_update;
-       return new;
+       return SDB_SVC(sdb_svc_clone((const sdb_object_t *)svc));
 } /* sdb_service_clone */
 
 int

diff --git a/src/include/core/object.h b/src/include/core/object.h
index cab77d0816973ca242620c8320c22c8eca07682c..dab220b2df41e6bd2d5361b2e9a5f12a0002c2a9 100644 (file)
--- a/src/include/core/object.h
+++ b/src/include/core/object.h
@@ -46,8 +46,9 @@ struct sdb_type {
 
        int (*init)(sdb_object_t *, va_list);
        void (*destroy)(sdb_object_t *);
+       sdb_object_t *(*clone)(const sdb_object_t *);
 };
-#define SDB_TYPE_INIT { 0, NULL, NULL }
+#define SDB_TYPE_INIT { 0, NULL, NULL, NULL }
 
 struct sdb_object {
        sdb_type_t type;