store: Fixed a conversion warning reported by GCC.

[sysdb.git] / src / core / store.c

diff --git a/src/core/store.c b/src/core/store.c
index 7e2602730d774cf83454775e79ff87f283b82677..0dec68db0ba9eea881c97bc00a6a178f4356c640 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "sysdb.h"
-#include "core/store.h"
+#include "core/store-private.h"
 #include "core/plugin.h"
 #include "utils/error.h"
 #include "utils/llist.h"
@@ -55,50 +59,6 @@ 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 sdb_store_base {
-       sdb_object_t super;
-
-       /* object type */
-       int type;
-
-       /* common meta information */
-       sdb_time_t last_update;
-       sdb_store_base_t *parent;
-};
-#define STORE_BASE(obj) ((sdb_store_base_t *)(obj))
-#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj))
-
-typedef struct {
-       sdb_store_base_t super;
-
-       sdb_data_t value;
-} sdb_attribute_t;
-#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
-#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
-
-typedef struct {
-       sdb_store_base_t super;
-
-       sdb_llist_t *children;
-       sdb_llist_t *attributes;
-} sdb_store_obj_t;
-#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
-#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
-
-enum {
-       SDB_HOST = 1,
-       SDB_SERVICE,
-       SDB_ATTRIBUTE,
-};
-#define TYPE_TO_NAME(t) \
-       (((t) == SDB_HOST) ? "host" \
-               : ((t) == SDB_SERVICE) ? "service" \
-               : ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
-
-/* shortcuts for accessing the sdb_store_obj_t attributes
- * of inheriting objects */
-#define _last_update super.last_update
-
 static int
 store_base_init(sdb_object_t *obj, va_list ap)
 {
@@ -107,6 +67,7 @@ store_base_init(sdb_object_t *obj, va_list ap)
        sobj->type = va_arg(ap, int);
 
        sobj->last_update = va_arg(ap, sdb_time_t);
+       sobj->interval = 0;
        sobj->parent = NULL;
        return 0;
 } /* store_base_init */
@@ -332,7 +293,13 @@ store_obj(int parent_type, const char *parent_name,
                        status = 1;
                }
                else {
+                       sdb_time_t interval = last_update - old->last_update;
                        old->last_update = last_update;
+                       if (old->interval)
+                               old->interval = (sdb_time_t)((0.9 * (double)old->interval)
+                                               + (0.1 * (double)interval));
+                       else
+                               old->interval = interval;
                }
 
                if (updated_obj)
@@ -412,11 +379,15 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
                time_str[sizeof(time_str) - 1] = '\0';
 
                sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
-               if (type == SDB_ATTRIBUTE)
-                       /* XXX: this needs to be type-dependent */
-                       sdb_strbuf_append(buf, "\"value\": \"%s\", ",
-                                       SDB_ATTR(sobj)->value.data.string);
-               sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
+               if (type == SDB_ATTRIBUTE) {
+                       char tmp[sdb_data_strlen(&SDB_ATTR(sobj)->value) + 1];
+                       sdb_data_format(&SDB_ATTR(sobj)->value, tmp, sizeof(tmp),
+                                       SDB_DOUBLE_QUOTED);
+                       sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\"}",
+                                       tmp, time_str);
+               }
+               else
+                       sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
 
                if (sdb_llist_iter_has_next(iter))
                        sdb_strbuf_append(buf, ",");
@@ -430,6 +401,13 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
  * public API
  */
 
+void
+sdb_store_clear(void)
+{
+       sdb_llist_destroy(obj_list);
+       obj_list = NULL;
+} /* sdb_store_clear */
+
 int
 sdb_store_host(const char *name, sdb_time_t last_update)
 {
@@ -554,7 +532,6 @@ sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf, int flags)
        return 0;
 } /* sdb_store_host_tojson */
 
-/* TODO: actually support hierarchical data */
 int
 sdb_store_tojson(sdb_strbuf_t *buf, int flags)
 {
@@ -591,5 +568,34 @@ sdb_store_tojson(sdb_strbuf_t *buf, int flags)
        return 0;
 } /* sdb_store_tojson */
 
+/* TODO: actually support hierarchical data */
+int
+sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
+{
+       sdb_llist_iter_t *host_iter;
+       int status = 0;
+
+       pthread_rwlock_rdlock(&obj_lock);
+
+       host_iter = sdb_llist_get_iter(obj_list);
+       if (! host_iter)
+               status = -1;
+
+       /* has_next returns false if the iterator is NULL */
+       while (sdb_llist_iter_has_next(host_iter)) {
+               sdb_store_base_t *host = STORE_BASE(sdb_llist_iter_get_next(host_iter));
+               assert(host);
+
+               if (cb(host, user_data)) {
+                       status = -1;
+                       break;
+               }
+       }
+
+       sdb_llist_iter_destroy(host_iter);
+       pthread_rwlock_unlock(&obj_lock);
+       return status;
+} /* sdb_store_iterate */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */