projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a device pointer to struct device_route
[project/netifd.git]
/
device.c
diff --git
a/device.c
b/device.c
index
bc870c2
..
7307414
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-120,10
+120,15
@@
static int set_device_state(struct device *dev, bool state)
return 0;
}
return 0;
}
-int device_claim(struct device
*dev
)
+int device_claim(struct device
_user *dep
)
{
{
+ struct device *dev = dep->dev;
int ret;
int ret;
+ if (dep->claimed)
+ return 0;
+
+ dep->claimed = true;
DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
if (++dev->active != 1)
return 0;
DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
if (++dev->active != 1)
return 0;
@@
-138,8
+143,14
@@
int device_claim(struct device *dev)
return ret;
}
return ret;
}
-void device_release(struct device
*dev
)
+void device_release(struct device
_user *dep
)
{
{
+ struct device *dev = dep->dev;
+
+ if (!dep->claimed)
+ return;
+
+ dep->claimed = false;
dev->active--;
DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
assert(dev->active >= 0);
dev->active--;
DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
assert(dev->active >= 0);
@@
-168,7
+179,7
@@
void device_init_virtual(struct device *dev, const struct device_type *type, con
if (name)
strncpy(dev->ifname, name, IFNAMSIZ);
if (name)
strncpy(dev->ifname, name, IFNAMSIZ);
-
fprintf(stderr,
"Initialize device '%s'\n", dev->ifname);
+
DPRINTF(
"Initialize device '%s'\n", dev->ifname);
INIT_LIST_HEAD(&dev->users);
dev->type = type;
}
INIT_LIST_HEAD(&dev->users);
dev->type = type;
}
@@
-217,7
+228,7
@@
void device_cleanup(struct device *dev)
{
struct device_user *dep, *tmp;
{
struct device_user *dep, *tmp;
-
fprintf(stderr,
"Clean up device '%s'\n", dev->ifname);
+
DPRINTF(
"Clean up device '%s'\n", dev->ifname);
list_for_each_entry_safe(dep, tmp, &dev->users, list) {
if (!dep->cb)
continue;
list_for_each_entry_safe(dep, tmp, &dev->users, list) {
if (!dep->cb)
continue;
@@
-242,7
+253,7
@@
void device_set_present(struct device *dev, bool state)
void device_add_user(struct device_user *dep, struct device *dev)
{
dep->dev = dev;
void device_add_user(struct device_user *dep, struct device *dev)
{
dep->dev = dev;
- list_add(&dep->list, &dev->users);
+ list_add
_tail
(&dep->list, &dev->users);
if (dep->cb && dev->present) {
dep->cb(dep, DEV_EVENT_ADD);
if (dev->active)
if (dep->cb && dev->present) {
dep->cb(dep, DEV_EVENT_ADD);
if (dev->active)
@@
-250,29
+261,35
@@
void device_add_user(struct device_user *dep, struct device *dev)
}
}
}
}
+static void
+__device_free_unused(struct device *dev)
+{
+ if (!list_empty(&dev->users))
+ return;
+
+ device_free(dev);
+}
+
void device_remove_user(struct device_user *dep)
{
struct device *dev = dep->dev;
void device_remove_user(struct device_user *dep)
{
struct device *dev = dep->dev;
- list_del(&dep->list);
-
- if (list_empty(&dev->users)) {
- /* all references have gone away, remove this device */
- device_free(dev);
- }
+ if (dep->claimed)
+ device_release(dep);
+ list_del(&dep->list);
dep->dev = NULL;
dep->dev = NULL;
+ __device_free_unused(dev);
}
void
}
void
-device_free_
all(void
)
+device_free_
unused(struct device *dev
)
{
{
- struct device *
dev, *
tmp;
+ struct device *tmp;
- avl_for_each_element_safe(&devices, dev, avl, tmp) {
- if (!list_empty(&dev->users))
- continue;
+ if (dev)
+ return __device_free_unused(dev);
- device_free(dev);
- }
+ avl_for_each_element_safe(&devices, dev, avl, tmp)
+ __device_free_unused(dev);
}
}