store: Split out common JSON code into a separate helper function.

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

diff --git a/src/core/store.c b/src/core/store.c
index 9fb05dfdf72c8ff20a8a783ad9069746b7651878..df5105794ad8f2827323dd81f239f0cdddd818a5 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -50,7 +50,7 @@
  */
 
 static sdb_llist_t *host_list = NULL;
-static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
+static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
 
 /*
  * private types
@@ -201,7 +201,7 @@ lookup_host(const char *name)
        return HOST(sdb_llist_search_by_name(host_list, name));
 } /* lookup_host */
 
-/* The obj_lock has to be acquired before calling this function. */
+/* The host_lock has to be acquired before calling this function. */
 static int
 store_obj(const char *hostname, int type, const char *name,
                sdb_time_t last_update, sdb_store_obj_t **updated_obj)
@@ -334,6 +334,32 @@ store_obj(const char *hostname, int type, const char *name,
        return status;
 } /* store_obj */
 
+/*
+ * store_common_tojson serializes common object attributes to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_common_tojson(sdb_store_obj_t *obj, sdb_strbuf_t *buf)
+{
+       char time_str[64];
+       char interval_str[64];
+
+       if (! sdb_strftime(time_str, sizeof(time_str),
+                               "%F %T %z", obj->last_update))
+               snprintf(time_str, sizeof(time_str), "<error>");
+       time_str[sizeof(time_str) - 1] = '\0';
+
+       if (! sdb_strfinterval(interval_str, sizeof(interval_str),
+                               obj->interval))
+               snprintf(interval_str, sizeof(interval_str), "<error>");
+       interval_str[sizeof(interval_str) - 1] = '\0';
+
+       sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+                       "\"update_interval\": \"%s\"", time_str, interval_str);
+} /* store_common_tojson */
+
 /*
  * store_obj_tojson serializes attribute / service objects to JSON.
  *
@@ -344,13 +370,10 @@ static void
 store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
 {
        sdb_llist_iter_t *iter;
-       char time_str[64];
-       char interval_str[64];
 
        assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
 
        sdb_strbuf_append(buf, "[");
-
        iter = sdb_llist_get_iter(list);
        if (! iter) {
                char errbuf[1024];
@@ -367,28 +390,16 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
                assert(sobj);
                assert(sobj->type == type);
 
-               if (! sdb_strftime(time_str, sizeof(time_str),
-                                       "%F %T %z", sobj->last_update))
-                       snprintf(time_str, sizeof(time_str), "<error>");
-               time_str[sizeof(time_str) - 1] = '\0';
-
-               if (! sdb_strfinterval(interval_str, sizeof(interval_str),
-                                       sobj->interval))
-                       snprintf(interval_str, sizeof(interval_str), "<error>");
-               interval_str[sizeof(interval_str) - 1] = '\0';
-
                sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
                if (sobj->type == SDB_ATTRIBUTE) {
                        char tmp[sdb_data_strlen(&ATTR(sobj)->value) + 1];
                        sdb_data_format(&ATTR(sobj)->value, tmp, sizeof(tmp),
                                        SDB_DOUBLE_QUOTED);
-                       sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\", "
-                                       "\"update_interval\": \"%s\"}", tmp, time_str,
-                                       interval_str);
+                       sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
                }
-               else
-                       sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
-                                       "\"update_interval\": \"%s\"}", time_str, interval_str);
+
+               store_common_tojson(sobj, buf);
+               sdb_strbuf_append(buf, "}");
 
                if (sdb_llist_iter_has_next(iter))
                        sdb_strbuf_append(buf, ",");
@@ -417,11 +428,11 @@ sdb_store_host(const char *name, sdb_time_t last_update)
        if (! name)
                return -1;
 
-       pthread_rwlock_wrlock(&obj_lock);
+       pthread_rwlock_wrlock(&host_lock);
        status = store_obj(/* hostname = */ NULL,
                        /* stored object = */ SDB_HOST, name, last_update,
                        /* updated_obj = */ NULL);
-       pthread_rwlock_unlock(&obj_lock);
+       pthread_rwlock_unlock(&host_lock);
        return status;
 } /* sdb_store_host */
 
@@ -465,7 +476,7 @@ sdb_store_attribute(const char *hostname,
        if ((! hostname) || (! key))
                return -1;
 
-       pthread_rwlock_wrlock(&obj_lock);
+       pthread_rwlock_wrlock(&host_lock);
        status = store_obj(hostname,
                        /* stored object = */ SDB_ATTRIBUTE, key, last_update,
                        &updated_attr);
@@ -479,7 +490,7 @@ sdb_store_attribute(const char *hostname,
                }
        }
 
-       pthread_rwlock_unlock(&obj_lock);
+       pthread_rwlock_unlock(&host_lock);
        return status;
 } /* sdb_store_attribute */
 
@@ -492,11 +503,11 @@ sdb_store_service(const char *hostname, const char *name,
        if ((! hostname) || (! name))
                return -1;
 
-       pthread_rwlock_wrlock(&obj_lock);
+       pthread_rwlock_wrlock(&host_lock);
        status = store_obj(hostname,
                        /* stored object = */ SDB_SERVICE, name, last_update,
                        /* updated obj = */ NULL);
-       pthread_rwlock_unlock(&obj_lock);
+       pthread_rwlock_unlock(&host_lock);
        return status;
 } /* sdb_store_service */
 
@@ -504,27 +515,14 @@ int
 sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, int flags)
 {
        sdb_host_t *host;
-       char time_str[64];
-       char interval_str[64];
 
        if ((! h) || (h->type != SDB_HOST) || (! buf))
                return -1;
 
        host = HOST(h);
 
-       if (! sdb_strftime(time_str, sizeof(time_str),
-                               "%F %T %z", host->_last_update))
-               snprintf(time_str, sizeof(time_str), "<error>");
-       time_str[sizeof(time_str) - 1] = '\0';
-
-       if (! sdb_strfinterval(interval_str, sizeof(interval_str),
-                               host->_interval))
-               snprintf(interval_str, sizeof(interval_str), "<error>");
-       interval_str[sizeof(interval_str) - 1] = '\0';
-
-       sdb_strbuf_append(buf, "{\"name\": \"%s\", "
-                       "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
-                       SDB_OBJ(host)->name, time_str, interval_str);
+       sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
+       store_common_tojson(h, buf);
 
        if (! (flags & SDB_SKIP_ATTRIBUTES)) {
                sdb_strbuf_append(buf, ", \"attributes\": ");
@@ -548,11 +546,11 @@ sdb_store_tojson(sdb_strbuf_t *buf, int flags)
        if (! buf)
                return -1;
 
-       pthread_rwlock_rdlock(&obj_lock);
+       pthread_rwlock_rdlock(&host_lock);
 
        host_iter = sdb_llist_get_iter(host_list);
        if (! host_iter) {
-               pthread_rwlock_unlock(&obj_lock);
+               pthread_rwlock_unlock(&host_lock);
                return -1;
        }
 
@@ -572,7 +570,7 @@ sdb_store_tojson(sdb_strbuf_t *buf, int flags)
        sdb_strbuf_append(buf, "]}");
 
        sdb_llist_iter_destroy(host_iter);
-       pthread_rwlock_unlock(&obj_lock);
+       pthread_rwlock_unlock(&host_lock);
        return 0;
 } /* sdb_store_tojson */
 
@@ -583,7 +581,7 @@ 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);
+       pthread_rwlock_rdlock(&host_lock);
 
        host_iter = sdb_llist_get_iter(host_list);
        if (! host_iter)
@@ -601,7 +599,7 @@ sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
        }
 
        sdb_llist_iter_destroy(host_iter);
-       pthread_rwlock_unlock(&obj_lock);
+       pthread_rwlock_unlock(&host_lock);
        return status;
 } /* sdb_store_iterate */