segfault

[project/procd.git] / service.c

diff --git a/service.c b/service.c
index 46f846d..fe60503 100644 (file)
--- a/service.c
+++ b/service.c
@@ -19,7 +19,7 @@ service_instance_add(struct service *s, struct blob_attr *attr)
        if (!in)
                return;
 
-       instance_init(in, attr);
+       instance_init(in, s, attr);
        vlist_add(&s->instances, &in->node, (void *) name);
 }
 
@@ -36,12 +36,15 @@ service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new,
                in_n = container_of(node_new, struct service_instance, node);
 
        if (in_o && in_n) {
+               DPRINTF("Update instance %s::%s\n", in_o->srv->name, in_o->name);
                instance_update(in_o, in_n);
                instance_free(in_n);
        } else if (in_o) {
+               DPRINTF("Free instance %s::%s\n", in_o->srv->name, in_o->name);
                instance_stop(in_o, false);
                instance_free(in_o);
        } else if (in_n) {
+               DPRINTF("Create instance %s::%s\n", in_n->srv->name, in_n->name);
                instance_start(in_n);
        }
 }
@@ -128,9 +131,12 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
        name = blobmsg_data(cur);
 
        s = avl_find_element(&services, name, s, avl);
-       if (s)
+       if (s) {
+               DPRINTF("Update service %s\n", name);
                return service_update(s, msg, tb);
+       }
 
+       DPRINTF("Create service %s\n", name);
        s = service_alloc(name);
        if (!s)
                return UBUS_STATUS_UNKNOWN_ERROR;
@@ -148,6 +154,20 @@ free:
        return ret;
 }
 
+static void
+service_dump(struct service *s)
+{
+       struct service_instance *in;
+       void *c, *i;
+
+       c = blobmsg_open_table(&b, s->name);
+       i = blobmsg_open_table(&b, "instances");
+       vlist_for_each_element(&s->instances, in, node)
+               instance_dump(&b, in);
+       blobmsg_close_table(&b, i);
+       blobmsg_close_table(&b, c);
+}
+
 static int
 service_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
                    struct ubus_request_data *req, const char *method,
@@ -156,12 +176,8 @@ service_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
        struct service *s;
 
        blob_buf_init(&b, 0);
-       avl_for_each_element(&services, s, avl) {
-               void *c;
-
-               c = blobmsg_open_table(&b, s->name);
-               blobmsg_close_table(&b, c);
-       }
+       avl_for_each_element(&services, s, avl)
+               service_dump(s);
 
        ubus_send_reply(ctx, req, b.head);