#include "../rcS.h"
-struct avl_tree services;
+AVL_TREE(services, avl_strcmp, false, NULL);
static struct blob_buf b;
static struct ubus_context *ctx;
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);
+ DEBUG(2, "Stop 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, "Start instance %s::%s\n", in_n->srv->name, in_n->name);
instance_start(in_n);
}
blob_buf_init(&b, 0);
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);
vlist_flush(&s->instances);
}
+ s->deleted = false;
+
rc(s->name, "running");
return 0;
static void
service_delete(struct service *s)
{
- service_event("service.stop", s->name, NULL);
vlist_flush_all(&s->instances);
- avl_delete(&services, &s->avl);
- trigger_del(s);
- free(s->trigger);
- free(s);
- service_validate_del(s);
+ s->deleted = true;
+ service_stopped(s);
}
enum {
[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 {
EVENT_TYPE,
EVENT_DATA,
bool add = !strcmp(method, "add");
int ret;
- blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
- cur = tb[SERVICE_ATTR_NAME];
+ blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
+ cur = tb[SERVICE_SET_NAME];
if (!cur)
return UBUS_STATUS_INVALID_ARGUMENT;
const char *name = NULL;
bool verbose = false;
- blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (tb[SERVICE_LIST_ATTR_VERBOSE])
verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
struct service *s;
struct service_instance *in;
- blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
cur = tb[SERVICE_DEL_ATTR_NAME];
if (!cur)
return 0;
}
+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, blobmsg_data(msg), blobmsg_data_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_update(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
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));
+ blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
- cur = tb[SERVICE_ATTR_NAME];
+ cur = tb[SERVICE_SET_NAME];
if (!cur)
return UBUS_STATUS_INVALID_ARGUMENT;
if (!msg)
return UBUS_STATUS_INVALID_ARGUMENT;
- blobmsg_parse(event_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(event_policy, __EVENT_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (!tb[EVENT_TYPE] || !tb[EVENT_DATA])
return UBUS_STATUS_INVALID_ARGUMENT;
if (!msg)
return UBUS_STATUS_INVALID_ARGUMENT;
- blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (tb[VALIDATE_SERVICE]) {
return 0;
}
const char *instance = NULL;
const char *type = NULL;
- blobmsg_parse(get_data_policy, __DATA_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(get_data_policy, __DATA_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (tb[DATA_NAME])
name = blobmsg_data(tb[DATA_NAME]);
if (tb[DATA_INSTANCE])
UBUS_METHOD("add", service_handle_set, service_set_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),
return service_handle_set(NULL, NULL, NULL, "add", b.head);
}
+void service_stopped(struct service *s)
+{
+ 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_event(const char *type, const char *service, const char *instance)
{
if (!ctx)
ctx = _ctx;
ubus_add_object(ctx, &main_object);
}
-
-void
-service_init(void)
-{
- avl_init(&services, avl_strcmp, false, NULL);
- service_validate_init();
-}
-
projects / project / procd.git / blobdiff