summaryrefslogtreecommitdiff
path: root/src/hashmap.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-20 20:33:19 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-20 20:33:24 +0200
commit8fe914ec81d9f57bcc083036f528b00119ed2e3b (patch)
treebc12da6934c821d831cb9a45377abd94a6234f6c /src/hashmap.h
parent5632e3743db350a67478acc107d76cdf648a1f99 (diff)
device: do not merge devices
Don't try to merge devices that have been created via dependencies when they appear in the system and can be recognized as the same. Instead, simply continue to maintain them independently of each other, however with the same state cycle. Why? Because otherwise we'd have a hard time to seperate the dependencies after the devices are unplugged again and we hence cannot be sure anymore that next time the device is plugged in it will carry the same names. Example: if one depndency refers to dev-sda.device and another one to dev-by-id-xxxyyy.device we only learn at time of plug in of the device that it is actually the same device that was ment. In the moment the device is unplugged again we won't know anymore their relation to each other and the next time the harddisk is plugged it might even appear as dev-by-id-xxxyyy.device and dev-sdb.service. To ensure the dependencies continue to have the meaning they were intended to have let's hence keep the .device objects seperate all the time, even when they are plugged in. This patch also introduces a new Following= property which points from the various .device units of a specific device to the main .device unit for it. This can be used by the client side to figure out the relation of the .device units to each other and even filter units from display.
Diffstat (limited to 'src/hashmap.h')
-rw-r--r--src/hashmap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/hashmap.h b/src/hashmap.h
index 3ff3efe8d1..8fb7f82357 100644
--- a/src/hashmap.h
+++ b/src/hashmap.h
@@ -56,6 +56,7 @@ void* hashmap_get(Hashmap *h, const void *key);
void* hashmap_remove(Hashmap *h, const void *key);
void* hashmap_remove_value(Hashmap *h, const void *key, void *value);
int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value);
+int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value);
int hashmap_merge(Hashmap *h, Hashmap *other);
void hashmap_move(Hashmap *h, Hashmap *other);