summaryrefslogtreecommitdiff
path: root/src/fdset.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-06 00:47:39 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-06 00:47:42 +0200
commita75560529663e5fd055884e32ab9c73f47f8aaa5 (patch)
tree38a52e5176648f51ed823616c4316ed0e2fa1fe6 /src/fdset.c
parent38a285d776cc0bf4440efe79fc7691032bcf3d67 (diff)
manager: merge serialization and desrialization counter into one, and increase it when reexecuting
Instead of having individual counters n_serializing and n_deserializing have a single one n_reloading, which should be sufficient. Set n_reloading when we are about to go down for reexecution to avoid cgroup trimming when we free the units for reexecution.
Diffstat (limited to 'src/fdset.c')
-rw-r--r--src/fdset.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/fdset.c b/src/fdset.c
index 9bf3788849..e67fe6fabf 100644
--- a/src/fdset.c
+++ b/src/fdset.c
@@ -49,6 +49,12 @@ void fdset_free(FDSet *s) {
* here, so that the EBADFD that valgrind will return
* us on close() doesn't influence us */
+ /* When reloading duplicates of the private bus
+ * connection fds and suchlike are closed here, which
+ * has no effect at all, since they are only
+ * duplicates. So don't be surprised about these log
+ * messages. */
+
log_debug("Closing left-over fd %i", PTR_TO_FD(p));
close_nointr(PTR_TO_FD(p));
}