|
 |
8f24f2 |
From a46d3732a4f8baacf1be3e5e0ac152119fe26d4c Mon Sep 17 00:00:00 2001
|
|
|
8f24f2 |
From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
|
|
|
8f24f2 |
Date: Fri, 2 Oct 2020 17:30:35 +0200
|
|
|
8f24f2 |
Subject: [PATCH] unit: don't emit PropertiesChanged signal if adding a
|
|
|
8f24f2 |
dependency to a unit is a no-op
|
|
|
8f24f2 |
|
|
|
8f24f2 |
(cherry picked from commit 5177cb0a9add4ae568cff6e6f7c2b3c77760c343)
|
|
|
8f24f2 |
|
|
|
8f24f2 |
Resolves: #1948480
|
|
|
8f24f2 |
---
|
|
|
8f24f2 |
src/core/unit.c | 14 +++++++++++++-
|
|
|
8f24f2 |
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
8f24f2 |
|
|
|
8f24f2 |
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
|
8f24f2 |
index 68affa2c0e..e3e534ea2e 100644
|
|
|
8f24f2 |
--- a/src/core/unit.c
|
|
|
8f24f2 |
+++ b/src/core/unit.c
|
|
|
8f24f2 |
@@ -2818,6 +2818,9 @@ int unit_add_dependency(
|
|
|
8f24f2 |
};
|
|
|
8f24f2 |
Unit *original_u = u, *original_other = other;
|
|
|
8f24f2 |
int r;
|
|
|
8f24f2 |
+ /* Helper to know whether sending a notification is necessary or not:
|
|
|
8f24f2 |
+ * if the dependency is already there, no need to notify! */
|
|
|
8f24f2 |
+ bool noop = true;
|
|
|
8f24f2 |
|
|
|
8f24f2 |
assert(u);
|
|
|
8f24f2 |
assert(d >= 0 && d < _UNIT_DEPENDENCY_MAX);
|
|
|
8f24f2 |
@@ -2842,24 +2845,33 @@ int unit_add_dependency(
|
|
|
8f24f2 |
r = unit_add_dependency_hashmap(u->dependencies + d, other, mask, 0);
|
|
|
8f24f2 |
if (r < 0)
|
|
|
8f24f2 |
return r;
|
|
|
8f24f2 |
+ else if (r > 0)
|
|
|
8f24f2 |
+ noop = false;
|
|
|
8f24f2 |
|
|
|
8f24f2 |
if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID && inverse_table[d] != d) {
|
|
|
8f24f2 |
r = unit_add_dependency_hashmap(other->dependencies + inverse_table[d], u, 0, mask);
|
|
|
8f24f2 |
if (r < 0)
|
|
|
8f24f2 |
return r;
|
|
|
8f24f2 |
+ else if (r > 0)
|
|
|
8f24f2 |
+ noop = false;
|
|
|
8f24f2 |
}
|
|
|
8f24f2 |
|
|
|
8f24f2 |
if (add_reference) {
|
|
|
8f24f2 |
r = unit_add_dependency_hashmap(u->dependencies + UNIT_REFERENCES, other, mask, 0);
|
|
|
8f24f2 |
if (r < 0)
|
|
|
8f24f2 |
return r;
|
|
|
8f24f2 |
+ else if (r > 0)
|
|
|
8f24f2 |
+ noop = false;
|
|
|
8f24f2 |
|
|
|
8f24f2 |
r = unit_add_dependency_hashmap(other->dependencies + UNIT_REFERENCED_BY, u, 0, mask);
|
|
|
8f24f2 |
if (r < 0)
|
|
|
8f24f2 |
return r;
|
|
|
8f24f2 |
+ else if (r > 0)
|
|
|
8f24f2 |
+ noop = false;
|
|
|
8f24f2 |
}
|
|
|
8f24f2 |
|
|
|
8f24f2 |
- unit_add_to_dbus_queue(u);
|
|
|
8f24f2 |
+ if (!noop)
|
|
|
8f24f2 |
+ unit_add_to_dbus_queue(u);
|
|
|
8f24f2 |
return 0;
|
|
|
8f24f2 |
}
|
|
|
8f24f2 |
|