Implement conversion between faultd_object and bson

Change-Id: I341da653910f1458b4bb3557b97a2560591b4c28
Signed-off-by: Konrad Kuchciak <k.kuchciak@samsung.com>

diff --git a/src/database/ejdb.c b/src/database/ejdb.c
index d8b6c890bf6c57d3afb7a6e655b3548b466783ee..ae4bfd8e599c3a28ebbb701b8288bcdf407bed05 100644 (file)
--- a/src/database/ejdb.c
+++ b/src/database/ejdb.c
@@ -92,6 +92,7 @@ static int faultd_object_to_bson(struct faultd_object *obj, bson *out)
                return -EINVAL;
 
        bson_init(out);
+
        list_for_each_entry(child, &obj->val.children, node) {
                switch (child->type) {
                case TYPE_OID:
@@ -104,8 +105,13 @@ static int faultd_object_to_bson(struct faultd_object *obj, bson *out)
                        bson_append_int(out, child->key, child->val.i);
                        break;
                case TYPE_TIMESPEC:
-                       /* TODO */
-                       break;
+                       {
+                               bson_append_start_object(out, child->key);
+                               bson_append_int(out, "tv_sec", child->val.ts.tv_sec);
+                               bson_append_long(out, "tv_nsec", child->val.ts.tv_nsec);
+                               bson_append_finish_object(out);
+                               break;
+                       }
                case TYPE_TIME_T:
                        bson_append_time_t(out, child->key, child->val.time);
                        break;
@@ -128,6 +134,32 @@ static int faultd_object_to_bson(struct faultd_object *obj, bson *out)
        return 0;
 }
 
+static int bson_to_timespec(bson *in, struct timespec *ts)
+{
+       bson_iterator it;
+
+       BSON_ITERATOR_INIT(&it, in);
+
+       if ((bson_iterator_next(&it) == BSON_INT) &&
+               (strcmp(bson_iterator_key(&it), "tv_sec") == 0))
+
+               ts->tv_sec = bson_iterator_int(&it);
+       else
+               return -ENOENT;
+
+       if ((bson_iterator_next(&it) == BSON_LONG) &&
+               (strcmp(bson_iterator_key(&it), "tv_nsec") == 0))
+
+               ts->tv_nsec = bson_iterator_long(&it);
+       else
+               return -ENOENT;
+
+       if (bson_iterator_next(&it) != BSON_EOO)
+               return -ENOENT;
+
+       return 0;
+}
+
 static int bson_to_faultd_object(bson *b, struct faultd_object *out)
 {
        bson_type bt;
@@ -151,22 +183,52 @@ static int bson_to_faultd_object(bson *b, struct faultd_object *out)
                case BSON_INT:
                        ret = faultd_object_append_int(out, key, bson_iterator_int(&it));
                        break;
-               case BSON_TIMESTAMP:
-                       /* TODO */
-                       ret = 0;
-                       break;
                case BSON_LONG:
                        ret = faultd_object_append_time_t(out, key, bson_iterator_time_t(&it));
                        break;
+               case BSON_DATE:
+                       ret = faultd_object_append_time_t(out, key, bson_iterator_time_t(&it));
+                       break;
                case BSON_BINDATA:
-                       /* FIXME: find information about subtype */
-                       /* we assume every bindata is uuid */
-                       ret = faultd_object_append_uuid(out, key, (sd_id128_t *)bson_iterator_bin_data(&it));
+                       switch (bson_iterator_bin_type(&it)) {
+                               case BSON_BIN_UUID:
+                                       ret = faultd_object_append_uuid(out, key,
+                                                 (sd_id128_t *)bson_iterator_bin_data(&it));
+                                       break;
+                               default:
+                                       ret = -ENOTSUP;
+                                       break;
+                       }
                        break;
                case BSON_OBJECT:
-                       /* TODO */
-                       ret = -ENOTSUP;
-                       break;
+                       {
+                               struct timespec ts;
+                               bson b;
+
+                               bson_iterator_subobject(&it, &b);
+
+                               if (bson_to_timespec(&b, &ts) == 0) {
+                                       ret = faultd_object_append_timespec(out, key, &ts);
+                               } else {
+                                       struct faultd_object *child;
+
+                                       ret = faultd_object_new(&child);
+                                       if (ret != 0)
+                                               break;
+
+                                       ret = bson_to_faultd_object(&b, child);
+                                       if (ret != 0)
+                                               goto cleanup;
+
+                                       ret = faultd_object_append_object(out, key, child);
+
+                               cleanup:
+                                       faultd_object_unref(child);
+                               }
+
+                               break;
+                       }
+
                default:
                        ret = -ENOTSUP;
                }