X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=manager.c;h=14ae652578d2fe71d8bf78eb0aee025b3a554110;hb=cd2dbd7df9f1b8c46386b2898523aec3dd4578fd;hp=d6bc35a289d04034f8fe275a1400f0b5ebd20184;hpb=6091827530d6dd43479d6709fb6e9f745c11e900;p=elogind.git

diff --git a/manager.c b/manager.c
index d6bc35a28..14ae65257 100644
--- a/manager.c
+++ b/manager.c
@@ -2,11 +2,13 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "manager.h"
 #include "hashmap.h"
 #include "macro.h"
 #include "strv.h"
+#include "log.h"
 
 Manager* manager_new(void) {
         Manager *m;
@@ -20,10 +22,7 @@ Manager* manager_new(void) {
         if (!(m->jobs = hashmap_new(trivial_hash_func, trivial_compare_func)))
                 goto fail;
 
-        if (!(m->jobs_to_add = hashmap_new(trivial_hash_func, trivial_compare_func)))
-                goto fail;
-
-        if (!(m->jobs_to_remove = set_new(trivial_hash_func, trivial_compare_func)))
+        if (!(m->transaction_jobs = hashmap_new(trivial_hash_func, trivial_compare_func)))
                 goto fail;
 
         return m;
@@ -35,245 +34,776 @@ fail:
 
 void manager_free(Manager *m) {
         Name *n;
+        Job *j;
 
         assert(m);
 
         while ((n = hashmap_first(m->names)))
                 name_free(n);
 
+        while ((j = hashmap_steal_first(m->transaction_jobs)))
+                job_free(j);
+
         hashmap_free(m->names);
         hashmap_free(m->jobs);
+        hashmap_free(m->transaction_jobs);
 
-        /* FIXME: This is incomplete */
+        free(m);
+}
 
-        hashmap_free(m->jobs_to_add);
-        set_free(m->jobs_to_remove);
+static void transaction_delete_job(Manager *m, Job *j) {
+        assert(m);
+        assert(j);
 
-        free(m);
+        /* Deletes one job from the transaction */
+
+        manager_transaction_unlink_job(m, j);
+
+        if (!j->linked)
+                job_free(j);
+}
+
+static void transaction_delete_name(Manager *m, Name *n) {
+        Job *j;
+
+        /* Deletes all jobs associated with a certain name from the
+         * transaction */
+
+        while ((j = hashmap_get(m->transaction_jobs, n)))
+                transaction_delete_job(m, j);
+}
+
+static void transaction_abort(Manager *m) {
+        Job *j;
+
+        assert(m);
+
+        while ((j = hashmap_first(m->transaction_jobs)))
+                if (j->linked)
+                        transaction_delete_job(m, j);
+                else
+                        job_free(j);
+
+        assert(hashmap_isempty(m->transaction_jobs));
+        assert(!m->transaction_anchor);
+}
+
+static void transaction_find_jobs_that_matter_to_anchor(Manager *m, Job *j, unsigned generation) {
+        JobDependency *l;
+
+        assert(m);
+
+        /* A recursive sweep through the graph that marks all names
+         * that matter to the anchor job, i.e. are directly or
+         * indirectly a dependency of the anchor job via paths that
+         * are fully marked as mattering. */
+
+        for (l = j ? j->subject_list : m->transaction_anchor; l; l = l->subject_next) {
+
+                /* This link does not matter */
+                if (!l->matters)
+                        continue;
+
+                /* This name has already been marked */
+                if (l->object->generation == generation)
+                        continue;
+
+                l->object->matters_to_anchor = true;
+                l->object->generation = generation;
+
+                transaction_find_jobs_that_matter_to_anchor(m, l->object, generation);
+        }
+}
+
+static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, JobType t) {
+        JobDependency *l, *last;
+
+        assert(j);
+        assert(other);
+        assert(j->name == other->name);
+        assert(!j->linked);
+
+        /* Merges 'other' into 'j' and then deletes j. */
+
+        j->type = t;
+        j->state = JOB_WAITING;
+
+        j->matters_to_anchor = j->matters_to_anchor || other->matters_to_anchor;
+
+        /* Patch us in as new owner of the JobDependency objects */
+        last = NULL;
+        for (l = other->subject_list; l; l = l->subject_next) {
+                assert(l->subject == other);
+                l->subject = j;
+                last = l;
+        }
+
+        /* Merge both lists */
+        if (last) {
+                last->subject_next = j->subject_list;
+                if (j->subject_list)
+                        j->subject_list->subject_prev = last;
+                j->subject_list = other->subject_list;
+        }
+
+        /* Patch us in as new owner of the JobDependency objects */
+        last = NULL;
+        for (l = other->object_list; l; l = l->object_next) {
+                assert(l->object == other);
+                l->object = j;
+                last = l;
+        }
+
+        /* Merge both lists */
+        if (last) {
+                last->object_next = j->object_list;
+                if (j->object_list)
+                        j->object_list->object_prev = last;
+                j->object_list = other->object_list;
+        }
+
+        /* Kill the other job */
+        other->subject_list = NULL;
+        other->object_list = NULL;
+        transaction_delete_job(m, other);
 }
 
-int manager_add_job(Manager *m, JobType type, Name *name, JobMode mode, Job **_ret) {
-        Job *ret, *other;
+static int delete_one_unmergable_job(Manager *m, Job *j) {
+        Job *k;
+
+        assert(j);
+
+        /* Tries to delete one item in the linked list
+         * j->transaction_next->transaction_next->... that conflicts
+         * whith another one, in an attempt to make an inconsistent
+         * transaction work. */
+
+        /* We rely here on the fact that if a merged with b does not
+         * merge with c, either a or b merge with c neither */
+        for (; j; j = j->transaction_next)
+                for (k = j->transaction_next; k; k = k->transaction_next) {
+                        Job *d;
+
+                        /* Is this one mergeable? Then skip it */
+                        if (job_type_mergeable(j->type, k->type))
+                                continue;
+
+                        /* Ok, we found two that conflict, let's see if we can
+                         * drop one of them */
+                        if (!j->matters_to_anchor)
+                                d = j;
+                        else if (!k->matters_to_anchor)
+                                d = k;
+                        else
+                                return -ENOEXEC;
+
+                        /* Ok, we can drop one, so let's do so. */
+                        log_debug("Try to fix job merging by deleting job %s", name_id(d->name));
+                        transaction_delete_job(m, d);
+                        return 0;
+                }
+
+        return -EINVAL;
+}
+
+static int transaction_merge_jobs(Manager *m) {
+        Job *j;
         void *state;
-        Name *dep;
         int r;
 
         assert(m);
-        assert(type < _JOB_TYPE_MAX);
-        assert(name);
-        assert(mode < _JOB_MODE_MAX);
-        assert(_ret);
 
-        /* Check for conflicts, first against the jobs we shall
-         * create */
-        if ((other = hashmap_get(m->jobs_to_add, name))) {
+        /* First step, check whether any of the jobs for one specific
+         * task conflict. If so, try to drop one of them. */
+        HASHMAP_FOREACH(j, m->transaction_jobs, state) {
+                JobType t;
+                Job *k;
+
+                t = j->type;
+                for (k = j->transaction_next; k; k = k->transaction_next) {
+                        if ((r = job_type_merge(&t, k->type)) >= 0)
+                                continue;
+
+                        /* OK, we could not merge all jobs for this
+                         * action. Let's see if we can get rid of one
+                         * of them */
+
+                        if ((r = delete_one_unmergable_job(m, j)) >= 0)
+                                /* Ok, we managed to drop one, now
+                                 * let's ask our callers to call us
+                                 * again after garbage collecting */
+                                return -EAGAIN;
+
+                        /* We couldn't merge anything. Failure */
+                        return r;
+                }
+        }
+
+        /* Second step, merge the jobs. */
+        HASHMAP_FOREACH(j, m->transaction_jobs, state) {
+                JobType t = j->type;
+                Job *k;
+
+                /* Merge all transactions */
+                for (k = j->transaction_next; k; k = k->transaction_next)
+                        assert_se(job_type_merge(&t, k->type) == 0);
+
+                /* If an active job is mergable, merge it too */
+                if (j->name->meta.job)
+                        job_type_merge(&t, j->name->meta.job->type); /* Might fail. Which is OK */
+
+                while ((k = j->transaction_next)) {
+                        if (j->linked) {
+                                transaction_merge_and_delete_job(m, k, j, t);
+                                j = k;
+                        } else
+                                transaction_merge_and_delete_job(m, j, k, t);
+                }
 
-                if (other->type != type)
-                        return -EEXIST;
+                assert(!j->transaction_next);
+                assert(!j->transaction_prev);
+        }
+
+        return 0;
+}
+
+static bool name_matters_to_anchor(Name *n, Job *j) {
+        assert(n);
+        assert(!j->transaction_prev);
 
-        } else if (name->meta.job) {
+        /* Checks whether at least one of the jobs for this name
+         * matters to the anchor. */
 
-                if (name->meta.job->type != type) {
+        for (; j; j = j->transaction_next)
+                if (j->matters_to_anchor)
+                        return true;
 
-                        if (mode == JOB_FAIL)
-                                return -EEXIST;
+        return false;
+}
 
-                        if ((r = set_put(m->jobs_to_remove, name->meta.job)) < 0)
-                                return r;
+static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned generation) {
+        void *state;
+        Name *n;
+        int r;
+
+        assert(m);
+        assert(j);
+        assert(!j->transaction_prev);
+
+        /* Does a recursive sweep through the ordering graph, looking
+         * for a cycle. If we find cycle we try to break it. */
+
+        /* Did we find a cycle? */
+        if (j->marker && j->generation == generation) {
+                Job *k;
+
+                /* So, we already have been here. We have a
+                 * cycle. Let's try to break it. We go backwards in
+                 * our path and try to find a suitable job to
+                 * remove. We use the marker to find our way back,
+                 * since smart how we are we stored our way back in
+                 * there. */
+
+                for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) {
+
+                        if (!k->linked &&
+                            !name_matters_to_anchor(k->name, k)) {
+                                /* Ok, we can drop this one, so let's
+                                 * do so. */
+                                log_debug("Breaking order cycle by deleting job %s", name_id(k->name));
+                                transaction_delete_name(m, k->name);
+                                return -EAGAIN;
+                        }
+
+                        /* Check if this in fact was the beginning of
+                         * the cycle */
+                        if (k == j)
+                                break;
                 }
+
+                return -ENOEXEC;
         }
 
-        if (!(ret = job_new(m, type, name)))
-                return -ENOMEM;
+        /* Make the marker point to where we come from, so that we can
+         * find our way backwards if we want to break a cycle */
+        j->marker = from;
+        j->generation = generation;
 
-        if ((r = hashmap_put(m->jobs_to_add, name, ret)) < 0)
-                goto fail;
+        /* We assume that the the dependencies are bidirectional, and
+         * hence can ignore NAME_AFTER */
+        SET_FOREACH(n, j->name->meta.dependencies[NAME_BEFORE], state) {
+                Job *o;
+
+                /* Is there a job for this name? */
+                if (!(o = hashmap_get(m->transaction_jobs, n)))
 
-        if (type == JOB_START || type == JOB_VERIFY_STARTED || type == JOB_RESTART_FINISH) {
-                SET_FOREACH(dep, ret->name->meta.requires, state)
-                        if ((r = manager_add_job(m, type, dep, mode, NULL)) < 0)
-                                goto fail;
-                SET_FOREACH(dep, ret->name->meta.soft_requires, state)
-                        if ((r = manager_add_job(m, type, dep, JOB_FAIL, NULL)) < 0)
-                                goto fail;
-                SET_FOREACH(dep, ret->name->meta.wants, state)
-                        if ((r = manager_add_job(m, type, dep, JOB_FAIL, NULL)) < 0)
-                                goto fail;
-                SET_FOREACH(dep, ret->name->meta.requisite, state)
-                        if ((r = manager_add_job(m, JOB_VERIFY_STARTED, dep, mode, NULL)) < 0)
-                                goto fail;
-                SET_FOREACH(dep, ret->name->meta.soft_requisite, state)
-                        if ((r = manager_add_job(m, JOB_VERIFY_STARTED, dep, JOB_FAIL, NULL)) < 0)
-                                goto fail;
-                SET_FOREACH(dep, ret->name->meta.conflicts, state)
-                        if ((r = manager_add_job(m, type, dep, mode, NULL)) < 0)
-                                goto fail;
-
-        } else if (type == JOB_STOP || type == JOB_RESTART || type == JOB_TRY_RESTART) {
-
-                SET_FOREACH(dep, ret->name->meta.required_by, state)
-                        if ((r = manager_add_job(m, type, dep, mode, NULL)) < 0)
-                                goto fail;
+                        /* Ok, there is no job for this in the
+                         * transaction, but maybe there is already one
+                         * running? */
+                        if (!(o = n->meta.job))
+                                continue;
+
+                if ((r = transaction_verify_order_one(m, o, j, generation)) < 0)
+                        return r;
         }
 
-        if (_ret)
-                *_ret = ret;
+        return 0;
+}
+
+static int transaction_verify_order(Manager *m, unsigned *generation) {
+        Job *j;
+        int r;
+        void *state;
+
+        assert(m);
+        assert(generation);
+
+        /* Check if the ordering graph is cyclic. If it is, try to fix
+         * that up by dropping one of the jobs. */
+
+        HASHMAP_FOREACH(j, m->transaction_jobs, state)
+                if ((r = transaction_verify_order_one(m, j, NULL, (*generation)++)) < 0)
+                        return r;
 
         return 0;
+}
 
-fail:
-        job_free(ret);
+static void transaction_collect_garbage(Manager *m) {
+        bool again;
 
-        return r;
+        assert(m);
+
+        /* Drop jobs that are not required by any other job */
+
+        do {
+                void *state;
+                Job *j;
+
+                again = false;
+
+                HASHMAP_FOREACH(j, m->transaction_jobs, state) {
+                        if (j->object_list)
+                                continue;
+
+                        log_debug("Garbage collecting job %s", name_id(j->name));
+
+                        transaction_delete_job(m, j);
+                        again = true;
+                        break;
+                }
+
+        } while (again);
 }
 
+static int transaction_is_destructive(Manager *m, JobMode mode) {
+        void *state;
+        Job *j;
 
-Job *manager_get_job(Manager *m, uint32_t id) {
         assert(m);
 
-        return hashmap_get(m->jobs, UINT32_TO_PTR(id));
+        /* Checks whether applying this transaction means that
+         * existing jobs would be replaced */
+
+        HASHMAP_FOREACH(j, m->transaction_jobs, state) {
+
+                /* Assume merged */
+                assert(!j->transaction_prev);
+                assert(!j->transaction_next);
+
+                if (j->name->meta.job &&
+                    j->name->meta.job != j &&
+                    !job_type_is_superset(j->type, j->name->meta.job->type))
+                        return -EEXIST;
+        }
+
+        return 0;
 }
 
-Name *manager_get_name(Manager *m, const char *name) {
+static void transaction_minimize_impact(Manager *m) {
+        bool again;
         assert(m);
-        assert(name);
 
-        return hashmap_get(m->names, name);
+        /* Drops all unnecessary jobs that reverse already active jobs
+         * or that stop a running service. */
+
+        do {
+                Job *j;
+                void *state;
+
+                again = false;
+
+                HASHMAP_FOREACH(j, m->transaction_jobs, state) {
+                        for (; j; j = j->transaction_next) {
+
+                                /* If it matters, we shouldn't drop it */
+                                if (j->matters_to_anchor)
+                                        continue;
+
+                                /* Would this stop a running service?
+                                 * Would this change an existing job?
+                                 * If so, let's drop this entry */
+                                if ((j->type != JOB_STOP || name_is_dead(j->name)) &&
+                                    (!j->name->meta.job  || job_type_is_conflicting(j->type, j->name->meta.job->state)))
+                                        continue;
+
+                                /* Ok, let's get rid of this */
+                                transaction_delete_job(m, j);
+                                again = true;
+                                break;
+                        }
+
+                        if (again)
+                                break;
+                }
+
+        } while (again);
 }
 
-static int detect_type(Name *name) {
-        char **n;
+static int transaction_apply(Manager *m, JobMode mode) {
+        void *state;
+        Job *j;
+        int r;
 
-        assert(name);
+        /* Moves the transaction jobs to the set of active jobs */
 
-        name->meta.type = _NAME_TYPE_INVALID;
+        HASHMAP_FOREACH(j, m->transaction_jobs, state) {
+                /* Assume merged */
+                assert(!j->transaction_prev);
+                assert(!j->transaction_next);
 
-        STRV_FOREACH(n, name->meta.names) {
-                NameType t;
+                if (j->linked)
+                        continue;
 
-                if ((t = name_type_from_string(*n)) == _NAME_TYPE_INVALID)
-                        return -EINVAL;
+                if ((r = hashmap_put(m->jobs, UINT32_TO_PTR(j->id), j)) < 0)
+                        goto rollback;
+        }
 
-                if (name->meta.type == _NAME_TYPE_INVALID) {
-                        name->meta.type = t;
+        while ((j = hashmap_steal_first(m->transaction_jobs))) {
+                if (j->linked)
                         continue;
-                }
 
-                if (name->meta.type != t)
-                        return -EINVAL;
+                if (j->name->meta.job)
+                        job_free(j->name->meta.job);
+
+                j->name->meta.job = j;
+                j->linked = true;
+
+                /* We're fully installed. Now let's free data we don't
+                 * need anymore. */
+
+                assert(!j->transaction_next);
+                assert(!j->transaction_prev);
+
+                while (j->subject_list)
+                        job_dependency_free(j->subject_list);
+                while (j->object_list)
+                        job_dependency_free(j->object_list);
         }
 
+        m->transaction_anchor = NULL;
+
         return 0;
-}
 
-static int fragment_load(Name *n) {
-        assert(n);
+rollback:
 
-        /*... */
+        HASHMAP_FOREACH(j, m->transaction_jobs, state) {
+                if (j->linked)
+                        continue;
 
-        return 0;
+                hashmap_remove(m->jobs, UINT32_TO_PTR(j->id));
+        }
+
+        return r;
 }
 
-static int sysv_load(Service *s) {
-        assert(s);
+static int transaction_activate(Manager *m, JobMode mode) {
+        int r;
+        unsigned generation = 1;
+
+        assert(m);
+
+        /* This applies the changes recorded in transaction_jobs to
+         * the actual list of jobs, if possible. */
+
+        /* First step: figure out which jobs matter */
+        transaction_find_jobs_that_matter_to_anchor(m, NULL, generation++);
+
+        /* Second step: Try not to stop any running services if
+         * we don't have to. Don't try to reverse running
+         * jobs if we don't have to. */
+        transaction_minimize_impact(m);
+
+        for (;;) {
+                /* Third step: Let's remove unneeded jobs that might
+                 * be lurking. */
+                transaction_collect_garbage(m);
 
-        /*... */
+                /* Fourth step: verify order makes sense and correct
+                 * cycles if necessary and possible */
+                if ((r = transaction_verify_order(m, &generation)) >= 0)
+                        break;
+
+                if (r != -EAGAIN)
+                        goto rollback;
+
+                /* Let's see if the resulting transaction ordering
+                 * graph is still cyclic... */
+        }
+
+        for (;;) {
+                /* Fifth step: let's drop unmergable entries if
+                 * necessary and possible, merge entries we can
+                 * merge */
+                if ((r = transaction_merge_jobs(m)) >= 0)
+                        break;
+
+                if (r != -EAGAIN)
+                        goto rollback;
+
+                /* Sixth step: an entry got dropped, let's garbage
+                 * collect its dependencies. */
+                transaction_collect_garbage(m);
+
+                /* Let's see if the resulting transaction still has
+                 * unmergable entries ... */
+        }
+
+        /* Seventh step: check whether we can actually apply this */
+        if (mode == JOB_FAIL)
+                if ((r = transaction_is_destructive(m, mode)) < 0)
+                        goto rollback;
+
+        /* Eights step: apply changes */
+        if ((r = transaction_apply(m, mode)) < 0)
+                goto rollback;
+
+        assert(hashmap_isempty(m->transaction_jobs));
+        assert(!m->transaction_anchor);
 
         return 0;
+
+rollback:
+        transaction_abort(m);
+        return r;
 }
 
-static int fstab_load(Name *n) {
-        assert(n);
-        assert(n->meta.type == NAME_MOUNT || n->meta.type == NAME_AUTOMOUNT);
+static Job* transaction_add_one_job(Manager *m, JobType type, Name *name, bool *is_new) {
+        Job *j, *f;
+        int r;
+
+        assert(m);
+        assert(name);
 
-        /*... */
+        /* Looks for an axisting prospective job and returns that. If
+         * it doesn't exist it is created and added to the prospective
+         * jobs list. */
 
-        return 0;
+        f = hashmap_get(m->transaction_jobs, name);
+
+        for (j = f; j; j = j->transaction_next) {
+                assert(j->name == name);
+
+                if (j->type == type) {
+                        if (is_new)
+                                *is_new = false;
+                        return j;
+                }
+        }
+
+        if (name->meta.job && name->meta.job->type == type)
+                j = name->meta.job;
+        else if (!(j = job_new(m, type, name)))
+                return NULL;
+
+        if ((r = hashmap_replace(m->transaction_jobs, name, j)) < 0) {
+                job_free(j);
+                return NULL;
+        }
+
+        j->transaction_next = f;
+
+        if (f)
+                f->transaction_prev = j;
+
+        j->generation = 0;
+        j->marker = NULL;
+        j->matters_to_anchor = false;
+
+        if (is_new)
+                *is_new = true;
+
+        return j;
 }
 
-static int snapshot_load(Snapshot *s) {
-        assert(s);
+void manager_transaction_unlink_job(Manager *m, Job *j) {
+        assert(m);
+        assert(j);
 
-        /*... */
+        if (j->transaction_prev)
+                j->transaction_prev->transaction_next = j->transaction_next;
+        else if (j->transaction_next)
+                hashmap_replace(m->transaction_jobs, j->name, j->transaction_next);
+        else
+                hashmap_remove_value(m->transaction_jobs, j->name, j);
 
-        return 0;
+        if (j->transaction_next)
+                j->transaction_next->transaction_prev = j->transaction_prev;
+
+        j->transaction_prev = j->transaction_next = NULL;
+
+        while (j->subject_list)
+                job_dependency_free(j->subject_list);
+
+        while (j->object_list) {
+                Job *other = j->object_list->matters ? j->object_list->subject : NULL;
+
+                job_dependency_free(j->object_list);
+
+                if (other) {
+                        log_debug("Deleting job %s as dependency of job %s", name_id(other->name), name_id(j->name));
+                        transaction_delete_job(m, other);
+                }
+        }
 }
 
-static int load(Name *name) {
+static int transaction_add_job_and_dependencies(Manager *m, JobType type, Name *name, Job *by, bool matters, bool force, Job **_ret) {
+        Job *ret;
+        void *state;
+        Name *dep;
         int r;
+        bool is_new;
 
+        assert(m);
+        assert(type < _JOB_TYPE_MAX);
         assert(name);
 
-        if (name->meta.state != NAME_STUB)
-                return 0;
+        if (name->meta.state != NAME_LOADED)
+                return -EINVAL;
 
-        if ((r = detect_type(name)) < 0)
-                return r;
+        if (!job_type_applicable(type, name->meta.type))
+                return -EBADR;
 
-        if (name->meta.type == NAME_SERVICE) {
+        /* First add the job. */
+        if (!(ret = transaction_add_one_job(m, type, name, &is_new)))
+                return -ENOMEM;
 
-                /* Load a .service file */
-                if ((r = fragment_load(name)) == 0)
-                        goto finish;
+        /* Then, add a link to the job. */
+        if (!job_dependency_new(by, ret, matters))
+                return -ENOMEM;
 
-                /* Load a classic init script */
-                if (r == -ENOENT)
-                        if ((r = sysv_load(SERVICE(name))) == 0)
-                                goto finish;
+        if (is_new) {
+                /* Finally, recursively add in all dependencies. */
+                if (type == JOB_START || type == JOB_RELOAD_OR_START) {
+                        SET_FOREACH(dep, ret->name->meta.dependencies[NAME_REQUIRES], state)
+                                if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, true, force, NULL))  != -EBADR)
+                                        goto fail;
+                        SET_FOREACH(dep, ret->name->meta.dependencies[NAME_SOFT_REQUIRES], state)
+                                if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !force, force, NULL)) != -EBADR)
+                                        goto fail;
+                        SET_FOREACH(dep, ret->name->meta.dependencies[NAME_WANTS], state)
+                                if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, force, NULL)) != -EBADR)
+                                        goto fail;
+                        SET_FOREACH(dep, ret->name->meta.dependencies[NAME_REQUISITE], state)
+                                if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_STARTED, dep, ret, true, force, NULL)) != -EBADR)
+                                        goto fail;
+                        SET_FOREACH(dep, ret->name->meta.dependencies[NAME_SOFT_REQUISITE], state)
+                                if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_STARTED, dep, ret, !force, force, NULL)) != -EBADR)
+                                        goto fail;
+                        SET_FOREACH(dep, ret->name->meta.dependencies[NAME_CONFLICTS], state)
+                                if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, true, force, NULL)) != -EBADR)
+                                        goto fail;
+
+                } else if (type == JOB_STOP || type == JOB_RESTART || type == JOB_TRY_RESTART) {
+
+                        SET_FOREACH(dep, ret->name->meta.dependencies[NAME_REQUIRED_BY], state)
+                                if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, force, NULL))  != -EBADR)
+                                        goto fail;
+                }
 
-        } else if (name->meta.type == NAME_MOUNT ||
-                   name->meta.type == NAME_AUTOMOUNT) {
+                /* JOB_VERIFY_STARTED, JOB_RELOAD require no dependency handling */
+        }
 
-                if ((r = fstab_load(name)) == 0)
-                        goto finish;
+        return 0;
 
-        } else if (name->meta.type == NAME_SNAPSHOT) {
+fail:
+        return r;
+}
 
-                if ((r = snapshot_load(SNAPSHOT(name))) == 0)
-                        goto finish;
+int manager_add_job(Manager *m, JobType type, Name *name, JobMode mode, bool force, Job **_ret) {
+        int r;
+        Job *ret;
+
+        assert(m);
+        assert(type < _JOB_TYPE_MAX);
+        assert(name);
+        assert(mode < _JOB_MODE_MAX);
 
-        } else {
-                if ((r = fragment_load(name)) == 0)
-                        goto finish;
+        if ((r = transaction_add_job_and_dependencies(m, type, name, NULL, true, force, &ret))) {
+                transaction_abort(m);
+                return r;
         }
 
-        name->meta.state = NAME_FAILED;
-        return r;
+        if ((r = transaction_activate(m, mode)) < 0)
+                return r;
+
+        if (_ret)
+                *_ret = ret;
 
-finish:
-        name->meta.state = NAME_LOADED;
         return 0;
 }
 
+Job *manager_get_job(Manager *m, uint32_t id) {
+        assert(m);
+
+        return hashmap_get(m->jobs, UINT32_TO_PTR(id));
+}
+
+Name *manager_get_name(Manager *m, const char *name) {
+        assert(m);
+        assert(name);
+
+        return hashmap_get(m->names, name);
+}
+
 static int dispatch_load_queue(Manager *m) {
         Meta *meta;
 
         assert(m);
 
+        /* Make sure we are not run recursively */
+        if (m->dispatching_load_queue)
+                return 0;
+
+        m->dispatching_load_queue = true;
+
         /* Dispatches the load queue. Takes a name from the queue and
          * tries to load its data until the queue is empty */
 
         while ((meta = m->load_queue)) {
-                load(NAME(meta));
+                name_load(NAME(meta));
                 LIST_REMOVE(Meta, m->load_queue, meta);
         }
 
+        m->dispatching_load_queue = false;
+
         return 0;
 }
 
-
-
 int manager_load_name(Manager *m, const char *name, Name **_ret) {
         Name *ret;
         NameType t;
         int r;
+        char *n;
 
         assert(m);
         assert(name);
         assert(_ret);
-/* This will load the service information files, but not actually
- * start any services or anything */
 
+        if (!name_is_valid(name))
+                return -EINVAL;
+
+        /* This will load the service information files, but not actually
+         * start any services or anything */
 
         if ((ret = manager_get_name(m, name)))
                 goto finish;
@@ -286,11 +816,17 @@ int manager_load_name(Manager *m, const char *name, Name **_ret) {
 
         ret->meta.type = t;
 
-        if (!(ret->meta.names = strv_new(name, NULL))) {
+        if (!(n = strdup(name))) {
                 name_free(ret);
                 return -ENOMEM;
         }
 
+        if ((r = set_put(ret->meta.names, n)) < 0) {
+                name_free(ret);
+                free(n);
+                return r;
+        }
+
         if ((r = name_link(ret)) < 0) {
                 name_free(ret);
                 return r;
@@ -307,3 +843,38 @@ finish:
         *_ret = ret;
         return 0;
 }
+
+void manager_dump_jobs(Manager *s, FILE *f, const char *prefix) {
+        void *state;
+        Job *j;
+
+        assert(s);
+        assert(f);
+
+        HASHMAP_FOREACH(j, s->jobs, state)
+                job_dump(j, f, prefix);
+}
+
+void manager_dump_names(Manager *s, FILE *f, const char *prefix) {
+        void *state;
+        Name *n;
+        const char *t;
+
+        assert(s);
+        assert(f);
+
+        HASHMAP_FOREACH_KEY(n, t, s->names, state)
+                if (name_id(n) == t)
+                        name_dump(n, f, prefix);
+}
+
+void manager_clear_jobs(Manager *m) {
+        Job *j;
+
+        assert(m);
+
+        transaction_abort(m);
+
+        while ((j = hashmap_first(m->jobs)))
+                job_free(j);
+}