fix interrupted read checks in log collection
[project/netifd.git] / device.c
index ab8ff91..4d0de67 100644 (file)
--- a/device.c
+++ b/device.c
@@ -19,7 +19,6 @@ static struct avl_tree devices;
 
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING },
-       [DEV_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
        [DEV_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY },
        [DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING },
@@ -32,20 +31,12 @@ const struct config_param_list device_attr_list = {
 };
 
 static struct device *
-simple_device_create(struct blob_attr *attr)
+simple_device_create(const char *name, struct blob_attr *attr)
 {
        struct blob_attr *tb[__DEV_ATTR_MAX];
        struct device *dev = NULL;
-       const char *name;
 
        blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb, blob_data(attr), blob_len(attr));
-       if (!tb[DEV_ATTR_NAME])
-               return NULL;
-
-       name = blobmsg_data(tb[DEV_ATTR_NAME]);
-       if (!name)
-               return NULL;
-
        dev = device_get(name, true);
        if (!dev)
                return NULL;
@@ -99,7 +90,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
 
 static void __init dev_init(void)
 {
-       avl_init(&devices, avl_strcmp, false, NULL);
+       avl_init(&devices, avl_strcmp, true, NULL);
 }
 
 static void device_broadcast_event(struct device *dev, enum device_event ev)
@@ -133,7 +124,7 @@ int device_claim(struct device_user *dep)
                return 0;
 
        dep->claimed = true;
-       DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
+       D(DEVICE, "claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
        if (++dev->active != 1)
                return 0;
 
@@ -141,8 +132,11 @@ int device_claim(struct device_user *dep)
        ret = dev->set_state(dev, true);
        if (ret == 0)
                device_broadcast_event(dev, DEV_EVENT_UP);
-       else
+       else {
+               D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
                dev->active = 0;
+               dep->claimed = false;
+       }
 
        return ret;
 }
@@ -156,7 +150,7 @@ void device_release(struct device_user *dep)
 
        dep->claimed = false;
        dev->active--;
-       DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
+       D(DEVICE, "release device %s, new refcount: %d\n", dev->ifname, dev->active);
        assert(dev->active >= 0);
 
        if (dev->active)
@@ -167,7 +161,7 @@ void device_release(struct device_user *dep)
        device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
-int check_device_state(struct device *dev)
+int device_check_state(struct device *dev)
 {
        if (!dev->type->check_state)
                return 0;
@@ -183,7 +177,7 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
        if (name)
                strncpy(dev->ifname, name, IFNAMSIZ);
 
-       DPRINTF("Initialize device '%s'\n", dev->ifname);
+       D(DEVICE, "Initialize device '%s'\n", dev->ifname);
        INIT_LIST_HEAD(&dev->users);
        dev->type = type;
 }
@@ -203,12 +197,26 @@ int device_init(struct device *dev, const struct device_type *type, const char *
        if (ret < 0)
                return ret;
 
-       check_device_state(dev);
+       system_if_clear_state(dev);
+       device_check_state(dev);
 
        return 0;
 }
 
-struct device *device_get(const char *name, bool create)
+static struct device *
+device_create_default(const char *name)
+{
+       struct device *dev;
+
+       D(DEVICE, "Create simple device '%s'\n", name);
+       dev = calloc(1, sizeof(*dev));
+       device_init(dev, &simple_device_type, name);
+       dev->default_config = true;
+       return dev;
+}
+
+struct device *
+device_get(const char *name, bool create)
 {
        struct device *dev;
 
@@ -222,26 +230,34 @@ struct device *device_get(const char *name, bool create)
        if (!create)
                return NULL;
 
-       dev = calloc(1, sizeof(*dev));
-       device_init(dev, &simple_device_type, name);
+       return device_create_default(name);
+}
 
-       return dev;
+static void
+device_delete(struct device *dev)
+{
+       if (!dev->avl.key)
+               return;
+
+       D(DEVICE, "Delete device '%s' from list\n", dev->ifname);
+       avl_delete(&devices, &dev->avl);
+       dev->avl.key = NULL;
 }
 
 void device_cleanup(struct device *dev)
 {
        struct device_user *dep, *tmp;
 
-       DPRINTF("Clean up device '%s'\n", dev->ifname);
+       D(DEVICE, "Clean up device '%s'\n", dev->ifname);
        list_for_each_entry_safe(dep, tmp, &dev->users, list) {
                if (!dep->cb)
                        continue;
 
                dep->cb(dep, DEV_EVENT_REMOVE);
+               device_release(dep);
        }
 
-       if (dev->avl.key)
-               avl_delete(&devices, &dev->avl);
+       device_delete(dev);
 }
 
 void device_set_present(struct device *dev, bool state)
@@ -249,7 +265,7 @@ void device_set_present(struct device *dev, bool state)
        if (dev->present == state)
                return;
 
-       DPRINTF("Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
+       D(DEVICE, "Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
        dev->present = state;
        device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
@@ -268,7 +284,7 @@ void device_add_user(struct device_user *dep, struct device *dev)
 static void
 __device_free_unused(struct device *dev)
 {
-       if (!list_empty(&dev->users))
+       if (!list_empty(&dev->users) || dev->current_config || config_init)
                return;
 
        device_free(dev);
@@ -298,29 +314,49 @@ device_free_unused(struct device *dev)
                __device_free_unused(dev);
 }
 
+void
+device_init_pending(void)
+{
+       struct device *dev, *tmp;
+
+       avl_for_each_element_safe(&devices, dev, avl, tmp) {
+               if (!dev->config_pending)
+                       continue;
+
+               dev->type->config_init(dev);
+               dev->config_pending = false;
+       }
+}
+
 enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
-       struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX];
-
-       blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
-               blob_data(attr), blob_len(attr));
-       if (dev->config)
-               blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1,
-                       blob_data(dev->config), blob_len(dev->config));
-       else
-               memset(tb1, 0, sizeof(tb1));
+       struct blob_attr *tb[__DEV_ATTR_MAX];
+       const struct config_param_list *cfg = dev->type->config_params;
 
-       if (!config_diff(tb, tb1, &device_attr_list, NULL))
+       if (config_check_equal(dev->config, attr, cfg))
                return DEV_CONFIG_NO_CHANGE;
 
-       device_init_settings(dev, tb);
-       return DEV_CONFIG_APPLIED;
+       if (cfg == &device_attr_list) {
+               memset(tb, 0, sizeof(tb));
+
+               if (dev->config)
+                       blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
+                               blob_data(attr), blob_len(attr));
+
+               device_init_settings(dev, tb);
+               return DEV_CONFIG_APPLIED;
+       } else
+               return DEV_CONFIG_RECREATE;
 }
 
 static enum dev_change_type
-device_check_config(struct device *dev, struct blob_attr *attr)
+device_check_config(struct device *dev, const struct device_type *type,
+                   struct blob_attr *attr)
 {
+       if (type != dev->type)
+               return DEV_CONFIG_RECREATE;
+
        if (dev->type->reload)
                return dev->type->reload(dev, attr);
 
@@ -337,6 +373,7 @@ device_replace(struct device *dev, struct device *odev)
                device_set_present(odev, false);
 
        list_for_each_entry_safe(dep, tmp, &odev->users, list) {
+               device_release(dep);
                list_move_tail(&dep->list, &dev->users);
                dep->dev = dev;
        }
@@ -346,6 +383,32 @@ device_replace(struct device *dev, struct device *odev)
                device_set_present(dev, true);
 }
 
+void
+device_reset_config(void)
+{
+       struct device *dev;
+
+       avl_for_each_element(&devices, dev, avl)
+               dev->current_config = false;
+}
+
+void
+device_reset_old(void)
+{
+       struct device *dev, *tmp, *ndev;
+
+       avl_for_each_element_safe(&devices, dev, avl, tmp) {
+               if (dev->current_config || dev->default_config)
+                       continue;
+
+               if (dev->type != &simple_device_type)
+                       continue;
+
+               ndev = device_create_default(dev->ifname);
+               device_replace(ndev, dev);
+       }
+}
+
 struct device *
 device_create(const char *name, const struct device_type *type,
              struct blob_attr *config)
@@ -353,29 +416,80 @@ device_create(const char *name, const struct device_type *type,
        struct device *odev = NULL, *dev;
        enum dev_change_type change;
 
+       config = config_memdup(config);
+       if (!config)
+               return NULL;
+
        odev = device_get(name, false);
        if (odev) {
-               change = device_check_config(odev, config);
+               odev->current_config = true;
+               change = device_check_config(odev, type, config);
                switch (change) {
                case DEV_CONFIG_APPLIED:
+                       D(DEVICE, "Device '%s': config applied\n", odev->ifname);
                        free(odev->config);
-                       odev->config = config_memdup(config);
+                       odev->config = config;
                        if (odev->present) {
                                device_set_present(odev, false);
                                device_set_present(odev, true);
                        }
-                       /* fall through */
+                       return odev;
                case DEV_CONFIG_NO_CHANGE:
+                       D(DEVICE, "Device '%s': no configuration change\n", odev->ifname);
+                       free(config);
                        return odev;
                case DEV_CONFIG_RECREATE:
+                       D(DEVICE, "Device '%s': recreate device\n", odev->ifname);
+                       device_delete(odev);
                        break;
                }
-       }
+       } else
+               D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
+
+       dev = type->create(name, config);
+       if (!dev)
+               return NULL;
 
-       dev = type->create(config);
-       dev->config = config_memdup(config);
+       dev->current_config = true;
+       dev->config = config;
        if (odev)
                device_replace(dev, odev);
 
+       if (!config_init && dev->config_pending)
+               type->config_init(dev);
+
        return dev;
 }
+
+void
+device_dump_status(struct blob_buf *b, struct device *dev)
+{
+       void *c, *s;
+
+       if (!dev) {
+               avl_for_each_element(&devices, dev, avl) {
+                       if (!dev->present)
+                               continue;
+                       c = blobmsg_open_table(b, dev->ifname);
+                       device_dump_status(b, dev);
+                       blobmsg_close_table(b, c);
+               }
+
+               return;
+       }
+
+       if (!dev->present)
+               return;
+
+       blobmsg_add_string(b, "type", dev->type->name);
+       blobmsg_add_u8(b, "up", !!dev->active);
+       if (dev->type->dump_info)
+               dev->type->dump_info(dev, b);
+
+       s = blobmsg_open_table(b, "statistics");
+       if (dev->type->dump_stats)
+               dev->type->dump_stats(dev, b);
+       else
+               system_if_dump_stats(dev, b);
+       blobmsg_close_table(b, s);
+}