procd: service gets deleted when its last instance is freed

[project/procd.git] / service / service.c

diff --git a/service/service.c b/service/service.c
index 0796adb..9675ba2 100644 (file)
--- a/service/service.c
+++ b/service/service.c
@@ -59,11 +59,10 @@ service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new,
                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);
@@ -80,7 +79,7 @@ service_alloc(const char *name)
        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);
@@ -141,6 +140,8 @@ service_update(struct service *s, struct blob_attr **tb, bool add)
                        vlist_flush(&s->instances);
        }
 
+       s->deleted = false;
+
        rc(s->name, "running");
 
        return 0;
@@ -149,13 +150,9 @@ service_update(struct service *s, struct blob_attr **tb, bool add)
 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 {
@@ -190,6 +187,19 @@ static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] =
 };
 
 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,
        __EVENT_MAX
@@ -354,6 +364,63 @@ service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 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_update(struct ubus_context *ctx, struct ubus_object *obj,
                      struct ubus_request_data *req, const char *method,
                      struct blob_attr *msg)
@@ -363,7 +430,7 @@ service_handle_update(struct ubus_context *ctx, struct ubus_object *obj,
 
        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;
 
@@ -490,6 +557,7 @@ static struct ubus_method main_object_methods[] = {
        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),
@@ -535,6 +603,18 @@ service_start_early(char *name, char *cmdline)
        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);
+               free(s->trigger);
+               free(s);
+               service_validate_del(s);
+       }
+}
+
 void service_event(const char *type, const char *service, const char *instance)
 {
        if (!ctx)