#include <libubox/avl-cmp.h>
#include "procd.h"
#include "service.h"
+#include "instance.h"
struct avl_tree services;
static struct blob_buf b;
static void
-service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new,
- struct vlist_node *node_old)
-{
- struct service_instance *in_o = NULL, *in_n = NULL;
-
- if (node_old)
- in_o = container_of(node_old, struct service_instance, node);
-
- if (node_new)
- in_n = container_of(node_new, struct service_instance, node);
-
- do {
- if (!in_o || !in_n)
- break;
-
- /* full match, nothing to do */
- return;
- } while (0);
-
- if (in_o) {
- /* kill old process */
- free(in_o);
- }
-
- if (in_n) {
- /* start new process */
- }
-}
-
-static void
service_instance_add(struct service *s, struct blob_attr *attr)
{
struct service_instance *in;
if (!in)
return;
- in->config = attr;
+ instance_init(in, s, attr);
vlist_add(&s->instances, &in->node, (void *) name);
}
+static void
+service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new,
+ struct vlist_node *node_old)
+{
+ struct service_instance *in_o = NULL, *in_n = NULL;
+
+ if (node_old)
+ in_o = container_of(node_old, struct service_instance, node);
+
+ if (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);
+ }
+}
+
static struct service *
service_alloc(const char *name)
{
s = calloc(1, sizeof(*s));
vlist_init(&s->instances, avl_strcmp, service_instance_update);
+ s->instances.keep_old = true;
return s;
}
enum {
- SERVICE_ATTR_NAME,
- SERVICE_ATTR_SCRIPT,
- SERVICE_ATTR_INSTANCES,
- __SERVICE_ATTR_MAX
+ SERVICE_SET_NAME,
+ SERVICE_SET_SCRIPT,
+ SERVICE_SET_INSTANCES,
+ __SERVICE_SET_MAX
};
-static const struct blobmsg_policy service_attrs[__SERVICE_ATTR_MAX] = {
- [SERVICE_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
- [SERVICE_ATTR_SCRIPT] = { "script", BLOBMSG_TYPE_STRING },
- [SERVICE_ATTR_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
+static const struct blobmsg_policy service_set_attrs[__SERVICE_SET_MAX] = {
+ [SERVICE_SET_NAME] = { "name", BLOBMSG_TYPE_STRING },
+ [SERVICE_SET_SCRIPT] = { "script", BLOBMSG_TYPE_STRING },
+ [SERVICE_SET_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
};
/* only the pointer changes, the content stays the same,
* no avl update necessary */
- s->name = s->avl.key = blobmsg_data(tb[SERVICE_ATTR_NAME]);
+ s->name = s->avl.key = blobmsg_data(tb[SERVICE_SET_NAME]);
s->config = config;
- if (tb[SERVICE_ATTR_INSTANCES]) {
+ if (tb[SERVICE_SET_INSTANCES]) {
vlist_update(&s->instances);
- blobmsg_for_each_attr(cur, tb[SERVICE_ATTR_INSTANCES], rem) {
+ blobmsg_for_each_attr(cur, tb[SERVICE_SET_INSTANCES], rem) {
service_instance_add(s, cur);
}
vlist_flush(&s->instances);
free(s);
}
+enum {
+ SERVICE_ATTR_NAME,
+ __SERVICE_ATTR_MAX,
+};
+
+static const struct blobmsg_policy service_attrs[__SERVICE_ATTR_MAX] = {
+ [SERVICE_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+};
+
+
static int
service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
- struct blob_attr *tb[__SERVICE_ATTR_MAX], *cur;
+ struct blob_attr *tb[__SERVICE_SET_MAX], *cur;
struct service *s = NULL;
const char *name;
int ret = UBUS_STATUS_INVALID_ARGUMENT;
if (!msg)
return UBUS_STATUS_UNKNOWN_ERROR;
- blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
cur = tb[SERVICE_ATTR_NAME];
if (!cur)
goto free;
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;
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,
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);
return 0;
}
-enum {
- SERVICE_DEL_NAME,
- __SERVICE_DEL_MAX,
-};
-
-static const struct blobmsg_policy service_del_attrs[__SERVICE_DEL_MAX] = {
- [SERVICE_DEL_NAME] = { "name", BLOBMSG_TYPE_STRING },
-};
-
-
static int
service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
- struct blob_attr *tb[__SERVICE_DEL_MAX], *cur;
+ struct blob_attr *tb[__SERVICE_ATTR_MAX], *cur;
struct service *s, *tmp;
- blobmsg_parse(service_del_attrs, __SERVICE_DEL_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
cur = tb[SERVICE_ATTR_NAME];
if (!cur) {
return 0;
}
+static int
+service_handle_update(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct blob_attr *tb[__SERVICE_ATTR_MAX], *cur;
+ struct service *s;
+
+ blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+ cur = tb[SERVICE_ATTR_NAME];
+ if (!cur)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ s = avl_find_element(&services, blobmsg_data(cur), s, avl);
+ if (!s)
+ return UBUS_STATUS_NOT_FOUND;
+
+ if (!strcmp(method, "update_start"))
+ vlist_update(&s->instances);
+ else
+ vlist_flush(&s->instances);
+
+ return 0;
+}
+
static struct ubus_method main_object_methods[] = {
- { .name = "list", .handler = service_handle_list },
- { .name = "set", .handler = service_handle_set },
- { .name = "delete", .handler = service_handle_delete },
+ UBUS_METHOD("set", service_handle_set, service_set_attrs),
+ UBUS_METHOD("list", service_handle_list, service_attrs),
+ UBUS_METHOD("delete", service_handle_delete, service_attrs),
+ UBUS_METHOD("update_start", service_handle_update, service_attrs),
+ UBUS_METHOD("update_complete", service_handle_update, service_attrs),
};
static struct ubus_object_type main_object_type =
projects / project / procd.git / blobdiff