#include "../rcS.h"
-struct avl_tree services;
+AVL_TREE(services, avl_strcmp, false, NULL);
static struct blob_buf b;
+static struct ubus_context *ctx;
+static struct ubus_object main_object;
static void
service_instance_add(struct service *s, struct blob_attr *attr)
instance_update(in_o, in_n);
instance_free(in_n);
} else if (in_o) {
- DEBUG(2, "Free instance %s::%s\n", in_o->srv->name, in_o->name);
- instance_stop(in_o);
- instance_free(in_o);
- } else if (in_n) {
- DEBUG(2, "Create instance %s::%s\n", in_n->srv->name, in_n->name);
+ DEBUG(2, "Stop instance %s::%s\n", in_o->srv->name, in_o->name);
+ instance_stop(in_o, true);
+ } else if (in_n && in_n->srv->autostart) {
+ DEBUG(2, "Start instance %s::%s\n", in_n->srv->name, in_n->name);
instance_start(in_n);
}
+ blob_buf_init(&b, 0);
+ trigger_event("instance.update", b.head);
}
static struct service *
strcpy(new_name, name);
vlist_init(&s->instances, avl_strcmp, service_instance_update);
- s->instances.keep_old = true;
+ s->instances.no_delete = true;
s->name = new_name;
s->avl.key = s->name;
INIT_LIST_HEAD(&s->validators);
SERVICE_SET_INSTANCES,
SERVICE_SET_TRIGGER,
SERVICE_SET_VALIDATE,
+ SERVICE_SET_AUTOSTART,
__SERVICE_SET_MAX
};
[SERVICE_SET_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
[SERVICE_SET_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY },
[SERVICE_SET_VALIDATE] = { "validate", BLOBMSG_TYPE_ARRAY },
+ [SERVICE_SET_AUTOSTART] = { "autostart", BLOBMSG_TYPE_BOOL },
};
static int
-service_update(struct service *s, struct blob_attr *config, struct blob_attr **tb, bool add)
+service_update(struct service *s, struct blob_attr **tb, bool add)
{
struct blob_attr *cur;
int rem;
service_validate_del(s);
+ if (tb[SERVICE_SET_AUTOSTART] && !blobmsg_get_bool(tb[SERVICE_SET_AUTOSTART]))
+ s->autostart = false;
+ else
+ s->autostart = true;
+
if (tb[SERVICE_SET_TRIGGER] && blobmsg_data_len(tb[SERVICE_SET_TRIGGER])) {
s->trigger = blob_memdup(tb[SERVICE_SET_TRIGGER]);
if (!s->trigger)
vlist_flush(&s->instances);
}
+ s->deleted = false;
+
rc(s->name, "running");
return 0;
service_delete(struct service *s)
{
vlist_flush_all(&s->instances);
- avl_delete(&services, &s->avl);
- trigger_del(s);
- s->trigger = NULL;
- free(s->trigger);
- free(s);
- service_validate_del(s);
+ s->deleted = true;
+ service_stopped(s);
}
enum {
};
enum {
+ SERVICE_LIST_ATTR_NAME,
SERVICE_LIST_ATTR_VERBOSE,
__SERVICE_LIST_ATTR_MAX,
};
static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] = {
+ [SERVICE_LIST_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
[SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_BOOL },
};
enum {
+ SERVICE_SIGNAL_ATTR_NAME,
+ SERVICE_SIGNAL_ATTR_INSTANCE,
+ SERVICE_SIGNAL_ATTR_SIGNAL,
+ __SERVICE_SIGNAL_ATTR_MAX,
+};
+
+static const struct blobmsg_policy service_signal_attrs[__SERVICE_SIGNAL_ATTR_MAX] = {
+ [SERVICE_SIGNAL_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+ [SERVICE_SIGNAL_ATTR_INSTANCE] = { "instance", BLOBMSG_TYPE_STRING },
+ [SERVICE_SIGNAL_ATTR_SIGNAL] = { "signal", BLOBMSG_TYPE_INT32 },
+};
+
+enum {
+ SERVICE_STATE_ATTR_SPAWN,
+ SERVICE_STATE_ATTR_NAME,
+ __SERVICE_STATE_ATTR_MAX,
+};
+
+static const struct blobmsg_policy service_state_attrs[__SERVICE_STATE_ATTR_MAX] = {
+ [SERVICE_STATE_ATTR_SPAWN] = { "spawn", BLOBMSG_TYPE_BOOL },
+ [SERVICE_STATE_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+};
+
+enum {
EVENT_TYPE,
EVENT_DATA,
__EVENT_MAX
[VALIDATE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING },
};
+enum {
+ DATA_NAME,
+ DATA_INSTANCE,
+ DATA_TYPE,
+ __DATA_MAX
+};
+
+static const struct blobmsg_policy get_data_policy[] = {
+ [DATA_NAME] = { "name", BLOBMSG_TYPE_STRING },
+ [DATA_INSTANCE] = { "instance", BLOBMSG_TYPE_STRING },
+ [DATA_TYPE] = { "type", BLOBMSG_TYPE_STRING },
+};
+
static int
service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
int ret;
blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
- cur = tb[SERVICE_ATTR_NAME];
+ cur = tb[SERVICE_SET_NAME];
if (!cur)
return UBUS_STATUS_INVALID_ARGUMENT;
s = avl_find_element(&services, name, s, avl);
if (s) {
DEBUG(2, "Update service %s\n", name);
- return service_update(s, msg, tb, add);
+ return service_update(s, tb, add);
}
DEBUG(2, "Create service %s\n", name);
if (!s)
return UBUS_STATUS_UNKNOWN_ERROR;
- ret = service_update(s, msg, tb, add);
+ ret = service_update(s, tb, add);
if (ret)
return ret;
avl_insert(&services, &s->avl);
+ service_event("service.start", s->name, NULL);
+
return 0;
}
static void
-service_dump(struct service *s, int verbose)
+service_dump(struct service *s, bool verbose)
{
struct service_instance *in;
void *c, *i;
c = blobmsg_open_table(&b, s->name);
+ if (!s->autostart)
+ blobmsg_add_u8(&b, "autostart", false);
+
if (!avl_is_empty(&s->instances.avl)) {
i = blobmsg_open_table(&b, "instances");
vlist_for_each_element(&s->instances, in, node)
{
struct blob_attr *tb[__SERVICE_LIST_ATTR_MAX];
struct service *s;
- int verbose = 0;
+ const char *name = NULL;
+ bool verbose = false;
blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
- if (tb[SERVICE_LIST_ATTR_VERBOSE] && blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]))
- verbose = 1;
+ if (tb[SERVICE_LIST_ATTR_VERBOSE])
+ verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
+ if (tb[SERVICE_LIST_ATTR_NAME])
+ name = blobmsg_get_string(tb[SERVICE_LIST_ATTR_NAME]);
blob_buf_init(&b, 0);
- avl_for_each_element(&services, s, avl)
+ avl_for_each_element(&services, s, avl) {
+ if (name && strcmp(s->name, name) != 0)
+ continue;
+
service_dump(s, verbose);
+ }
ubus_send_reply(ctx, req, b.head);
}
static int
+service_handle_kill(struct service_instance *in, int sig)
+{
+ if (kill(in->proc.pid, sig) == 0)
+ return 0;
+
+ switch (errno) {
+ case EINVAL: return UBUS_STATUS_INVALID_ARGUMENT;
+ case EPERM: return UBUS_STATUS_PERMISSION_DENIED;
+ case ESRCH: return UBUS_STATUS_NOT_FOUND;
+ }
+
+ return UBUS_STATUS_UNKNOWN_ERROR;
+}
+
+static int
+service_handle_signal(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_SIGNAL_ATTR_MAX], *cur;
+ struct service *s;
+ struct service_instance *in;
+ int sig = SIGHUP;
+ int rv = 0;
+
+ blobmsg_parse(service_signal_attrs, __SERVICE_SIGNAL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+ cur = tb[SERVICE_SIGNAL_ATTR_SIGNAL];
+ if (cur)
+ sig = blobmsg_get_u32(cur);
+
+ cur = tb[SERVICE_SIGNAL_ATTR_NAME];
+ if (!cur)
+ return UBUS_STATUS_NOT_FOUND;
+
+ s = avl_find_element(&services, blobmsg_data(cur), s, avl);
+ if (!s)
+ return UBUS_STATUS_NOT_FOUND;
+
+ cur = tb[SERVICE_SIGNAL_ATTR_INSTANCE];
+ if (!cur) {
+ vlist_for_each_element(&s->instances, in, node)
+ rv = service_handle_kill(in, sig);
+
+ return rv;
+ }
+
+ in = vlist_find(&s->instances, blobmsg_data(cur), in, node);
+ if (!in) {
+ ERROR("instance %s not found\n", blobmsg_get_string(cur));
+ return UBUS_STATUS_NOT_FOUND;
+ }
+
+ return service_handle_kill(in, sig);
+}
+
+static int
+service_handle_state(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_STATE_ATTR_MAX];
+ struct service *s;
+ struct service_instance *in;
+ int spawn;
+
+ blobmsg_parse(service_state_attrs, __SERVICE_STATE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+ if (!tb[SERVICE_STATE_ATTR_SPAWN])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ if (!tb[SERVICE_STATE_ATTR_NAME])
+ return UBUS_STATUS_NOT_FOUND;
+
+ s = avl_find_element(&services, blobmsg_data(tb[SERVICE_STATE_ATTR_NAME]), s, avl);
+ if (!s)
+ return UBUS_STATUS_NOT_FOUND;
+
+ spawn = !!blobmsg_get_u8(tb[SERVICE_STATE_ATTR_SPAWN]);
+ vlist_for_each_element(&s->instances, in, node) {
+ if (!!in->proc.pending == !!spawn)
+ continue;
+ else if (!in->proc.pending)
+ instance_start(in);
+ else
+ instance_stop(in, false);
+ }
+
+ return UBUS_STATUS_OK;
+}
+
+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)
blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
- cur = tb[SERVICE_ATTR_NAME];
+ cur = tb[SERVICE_SET_NAME];
if (!cur)
return UBUS_STATUS_INVALID_ARGUMENT;
return 0;
}
+static void ubus_event_bcast(const char *type, const char *param1, const char *val1,
+ const char *param2, const char *val2)
+{
+ if (!ctx)
+ return;
+
+ blob_buf_init(&b, 0);
+ if (param1 && val1)
+ blobmsg_add_string(&b, param1, val1);
+ if (param2 && val2)
+ blobmsg_add_string(&b, param2, val2);
+ ubus_notify(ctx, &main_object, type, b.head, -1);
+}
+
static int
service_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
struct blob_attr *tb[__EVENT_MAX];
+ const char *event;
if (!msg)
return UBUS_STATUS_INVALID_ARGUMENT;
if (!tb[EVENT_TYPE] || !tb[EVENT_DATA])
return UBUS_STATUS_INVALID_ARGUMENT;
- trigger_event(blobmsg_get_string(tb[EVENT_TYPE]), tb[EVENT_DATA]);
+ event = blobmsg_get_string(tb[EVENT_TYPE]);
+ trigger_event(event, tb[EVENT_DATA]);
+
+ if (!strcmp(event, "config.change")) {
+ struct blob_attr *tb2[__DATA_MAX];
+ blobmsg_parse(validate_policy, __VALIDATE_MAX, tb2,
+ blobmsg_data(tb[EVENT_DATA]), blobmsg_len(tb[EVENT_DATA]));
+ if (tb2[VALIDATE_PACKAGE])
+ ubus_event_bcast("config.change", "config",
+ blobmsg_get_string(tb2[VALIDATE_PACKAGE]), NULL, NULL);
+ }
return 0;
}
return 0;
}
+static int
+service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct service_instance *in;
+ struct service *s;
+ struct blob_attr *tb[__DATA_MAX];
+ const char *name = NULL;
+ const char *instance = NULL;
+ const char *type = NULL;
+
+ blobmsg_parse(get_data_policy, __DATA_MAX, tb, blob_data(msg), blob_len(msg));
+ if (tb[DATA_NAME])
+ name = blobmsg_data(tb[DATA_NAME]);
+ if (tb[DATA_INSTANCE])
+ instance = blobmsg_data(tb[DATA_INSTANCE]);
+ if (tb[DATA_TYPE])
+ type = blobmsg_data(tb[DATA_TYPE]);
+
+ blob_buf_init(&b, 0);
+ avl_for_each_element(&services, s, avl) {
+ void *cs = NULL;
+
+ if (name && strcmp(name, s->name))
+ continue;
+
+ vlist_for_each_element(&s->instances, in, node) {
+ struct blobmsg_list_node *var;
+ void *ci = NULL;
+
+ if (instance && strcmp(instance, in->name))
+ continue;
+
+ blobmsg_list_for_each(&in->data, var) {
+ if (type &&
+ strcmp(blobmsg_name(var->data), type))
+ continue;
+
+ if (!cs)
+ cs = blobmsg_open_table(&b, s->name);
+ if (!ci)
+ ci = blobmsg_open_table(&b, in->name);
+
+ blobmsg_add_blob(&b, var->data);
+ }
+
+ if (ci)
+ blobmsg_close_table(&b, ci);
+ }
+
+ if (cs)
+ blobmsg_close_table(&b, cs);
+ }
+
+ ubus_send_reply(ctx, req, b.head);
+ return 0;
+}
+
static struct ubus_method main_object_methods[] = {
UBUS_METHOD("set", service_handle_set, service_set_attrs),
UBUS_METHOD("add", service_handle_set, service_set_attrs),
- UBUS_METHOD("list", service_handle_list, service_attrs),
+ UBUS_METHOD("list", service_handle_list, service_list_attrs),
UBUS_METHOD("delete", service_handle_delete, service_del_attrs),
+ UBUS_METHOD("signal", service_handle_signal, service_signal_attrs),
UBUS_METHOD("update_start", service_handle_update, service_attrs),
UBUS_METHOD("update_complete", service_handle_update, service_attrs),
UBUS_METHOD("event", service_handle_event, event_policy),
UBUS_METHOD("validate", service_handle_validate, validate_policy),
+ UBUS_METHOD("get_data", service_get_data, get_data_policy),
+ UBUS_METHOD("state", service_handle_state, service_state_attrs),
};
static struct ubus_object_type main_object_type =
return service_handle_set(NULL, NULL, NULL, "add", b.head);
}
-void ubus_init_service(struct ubus_context *ctx)
+void service_stopped(struct service *s)
{
- ubus_add_object(ctx, &main_object);
+ if (s->deleted && avl_is_empty(&s->instances.avl)) {
+ service_event("service.stop", s->name, NULL);
+ avl_delete(&services, &s->avl);
+ trigger_del(s);
+ service_validate_del(s);
+ free(s->trigger);
+ free(s);
+ }
}
-void
-service_init(void)
+void service_event(const char *type, const char *service, const char *instance)
{
- avl_init(&services, avl_strcmp, false, NULL);
- service_validate_init();
+ ubus_event_bcast(type, "service", service, "instance", instance);
}
+void ubus_init_service(struct ubus_context *_ctx)
+{
+ ctx = _ctx;
+ ubus_add_object(ctx, &main_object);
+}
projects / project / procd.git / blobdiff