chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make use of logging API wherever appropriate
[elogind.git]
/
manager.c
diff --git
a/manager.c
b/manager.c
index a104e2f401c8689ec572558206ad37699a776020..456eb8db1cc5ce703b8d975c143d2b3c90cc9acb 100644
(file)
--- a/
manager.c
+++ b/
manager.c
@@
-8,6
+8,7
@@
#include "hashmap.h"
#include "macro.h"
#include "strv.h"
#include "hashmap.h"
#include "macro.h"
#include "strv.h"
+#include "log.h"
Manager* manager_new(void) {
Manager *m;
Manager* manager_new(void) {
Manager *m;
@@
-166,7
+167,6
@@
static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, Job
j->object_list = other->object_list;
}
j->object_list = other->object_list;
}
-
/* Kill the other job */
other->subject_list = NULL;
other->object_list = NULL;
/* Kill the other job */
other->subject_list = NULL;
other->object_list = NULL;
@@
-221,6
+221,7
@@
static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned
for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) {
if (!k->matters_to_anchor) {
for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) {
if (!k->matters_to_anchor) {
+ log_debug("Breaking order cycle by deleting job %s", name_id(k->name));
manager_transaction_delete_job(m, k);
return -EAGAIN;
}
manager_transaction_delete_job(m, k);
return -EAGAIN;
}