add support for specifying process priority

[project/procd.git] / instance.c

diff --git a/instance.c b/instance.c
index c70fff6..a25f91a 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -1,3 +1,7 @@
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
 #include <unistd.h>
 
 #include "procd.h"
@@ -8,6 +12,8 @@ enum {
        INSTANCE_ATTR_COMMAND,
        INSTANCE_ATTR_ENV,
        INSTANCE_ATTR_DATA,
+       INSTANCE_ATTR_NETDEV,
+       INSTANCE_ATTR_NICE,
        __INSTANCE_ATTR_MAX
 };
 
@@ -15,6 +21,13 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
        [INSTANCE_ATTR_COMMAND] = { "command", BLOBMSG_TYPE_ARRAY },
        [INSTANCE_ATTR_ENV] = { "env", BLOBMSG_TYPE_TABLE },
        [INSTANCE_ATTR_DATA] = { "data", BLOBMSG_TYPE_TABLE },
+       [INSTANCE_ATTR_NETDEV] = { "netdev", BLOBMSG_TYPE_ARRAY },
+       [INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
+};
+
+struct instance_netdev {
+       struct blobmsg_list_node node;
+       int ifindex;
 };
 
 static void
@@ -26,6 +39,9 @@ instance_run(struct service_instance *in)
        int argc = 1; /* NULL terminated */
        int rem;
 
+       if (in->nice)
+               setpriority(PRIO_PROCESS, 0, in->nice);
+
        blobmsg_for_each_attr(cur, in->command, rem)
                argc++;
 
@@ -116,10 +132,33 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
        if (!blobmsg_list_equal(&in->data, &in_new->data))
                return true;
 
+       if (!blobmsg_list_equal(&in->netdev, &in_new->netdev))
+               return true;
+
+       if (in->nice != in_new->nice)
+               return true;
+
        return false;
 }
 
 static bool
+instance_netdev_cmp(struct blobmsg_list_node *l1, struct blobmsg_list_node *l2)
+{
+       struct instance_netdev *n1 = container_of(l1, struct instance_netdev, node);
+       struct instance_netdev *n2 = container_of(l2, struct instance_netdev, node);
+
+       return n1->ifindex == n2->ifindex;
+}
+
+static void
+instance_netdev_update(struct blobmsg_list_node *l)
+{
+       struct instance_netdev *n = container_of(l, struct instance_netdev, node);
+
+       n->ifindex = if_nametoindex(n->node.avl.key);
+}
+
+static bool
 instance_config_parse(struct service_instance *in)
 {
        struct blob_attr *tb[__INSTANCE_ATTR_MAX];
@@ -146,18 +185,37 @@ instance_config_parse(struct service_instance *in)
 
        in->command = cur;
 
+       if ((cur = tb[INSTANCE_ATTR_NICE])) {
+               in->nice = (int8_t) blobmsg_get_u32(cur);
+               if (in->nice < -20 || in->nice > 20)
+                       return false;
+       }
+
        if ((cur = tb[INSTANCE_ATTR_ENV])) {
                if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
                        return false;
+
                blobmsg_list_fill(&in->env, blobmsg_data(cur), blobmsg_data_len(cur), false);
        }
 
        if ((cur = tb[INSTANCE_ATTR_DATA])) {
                if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
                        return false;
+
                blobmsg_list_fill(&in->data, blobmsg_data(cur), blobmsg_data_len(cur), false);
        }
 
+       if ((cur = tb[INSTANCE_ATTR_NETDEV])) {
+               struct blobmsg_list_node *ndev;
+
+               if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
+                       return false;
+
+               blobmsg_list_fill(&in->netdev, blobmsg_data(cur), blobmsg_data_len(cur), true);
+               blobmsg_list_for_each(&in->netdev, ndev)
+                       instance_netdev_update(ndev);
+       }
+
        return true;
 }
 
@@ -166,6 +224,7 @@ instance_config_cleanup(struct service_instance *in)
 {
        blobmsg_list_free(&in->env);
        blobmsg_list_free(&in->data);
+       blobmsg_list_free(&in->netdev);
 }
 
 static void
@@ -174,8 +233,14 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        instance_config_cleanup(in);
        blobmsg_list_move(&in->env, &in_src->env);
        blobmsg_list_move(&in->data, &in_src->data);
+       blobmsg_list_move(&in->netdev, &in_src->netdev);
        in->command = in_src->command;
        in->name = in_src->name;
+       in->node.avl.key = in_src->node.avl.key;
+
+       free(in->config);
+       in->config = in_src->config;
+       in_src->config = NULL;
 }
 
 bool
@@ -183,7 +248,6 @@ instance_update(struct service_instance *in, struct service_instance *in_new)
 {
        bool changed = instance_config_changed(in, in_new);
 
-       in->config = in_new->config;
        if (!changed)
                return false;
 
@@ -199,18 +263,21 @@ instance_free(struct service_instance *in)
        uloop_process_delete(&in->proc);
        uloop_timeout_cancel(&in->timeout);
        instance_config_cleanup(in);
+       free(in->config);
        free(in);
 }
 
 void
 instance_init(struct service_instance *in, struct service *s, struct blob_attr *config)
 {
+       config = blob_memdup(config);
        in->srv = s;
        in->name = blobmsg_name(config);
        in->config = config;
        in->timeout.cb = instance_timeout;
        in->proc.cb = instance_exit;
 
+       blobmsg_list_init(&in->netdev, struct instance_netdev, node, instance_netdev_cmp);
        blobmsg_list_simple_init(&in->env);
        blobmsg_list_simple_init(&in->data);
        in->valid = instance_config_parse(in);