chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core/smack: downgrade info to debug
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index 5527e9d429299fd6c49912c0f6a50bd7263dcb23..c261b25fb658ad0f515afde1f309367c026863e5 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-269,8
+269,9
@@
static void manager_print_jobs_in_progress(Manager *m) {
if (j->state == JOB_RUNNING && counter++ == print_nr)
break;
if (j->state == JOB_RUNNING && counter++ == print_nr)
break;
- if (!j)
- return;
+ /* m->n_running_jobs must be consistent with the contents of m->jobs,
+ * so the above loop must have succeeded in finding j. */
+ assert(counter == print_nr + 1);
cylon_pos = m->jobs_in_progress_iteration % 14;
if (cylon_pos >= 8)
cylon_pos = m->jobs_in_progress_iteration % 14;
if (cylon_pos >= 8)
@@
-678,6
+679,9
@@
static void manager_clear_jobs_and_units(Manager *m) {
assert(hashmap_isempty(m->jobs));
assert(hashmap_isempty(m->units));
assert(hashmap_isempty(m->jobs));
assert(hashmap_isempty(m->units));
+
+ m->n_on_console = 0;
+ m->n_running_jobs = 0;
}
void manager_free(Manager *m) {
}
void manager_free(Manager *m) {
@@
-1140,7
+1144,7
@@
unsigned manager_dispatch_run_queue(Manager *m) {
m->dispatching_run_queue = false;
m->dispatching_run_queue = false;
- if (
hashmap_size(m->jobs)
> 0)
+ if (
m->n_running_jobs
> 0)
manager_watch_jobs_in_progress(m);
return n;
manager_watch_jobs_in_progress(m);
return n;
@@
-1670,6
+1674,8
@@
static int process_event(Manager *m, struct epoll_event *ev) {
NULL);
/* Restart the watch */
NULL);
/* Restart the watch */
+ epoll_ctl(m->epoll_fd, EPOLL_CTL_DEL, m->time_change_watch.fd,
+ NULL);
close_nointr_nofail(m->time_change_watch.fd);
watch_init(&m->time_change_watch);
manager_setup_time_change(m);
close_nointr_nofail(m->time_change_watch.fd);
watch_init(&m->time_change_watch);
manager_setup_time_change(m);
@@
-2364,10
+2370,11
@@
void manager_check_finished(Manager *m) {
assert(m);
assert(m);
- if (hashmap_size(m->jobs) > 0) {
- manager_jobs_in_progress_mod_timer(m);
+ if (m->n_running_jobs == 0)
+ manager_unwatch_jobs_in_progress(m);
+
+ if (hashmap_size(m->jobs) > 0)
return;
return;
- }
/* Notify Type=idle units that we are done now */
close_pipe(m->idle_pipe);
/* Notify Type=idle units that we are done now */
close_pipe(m->idle_pipe);
@@
-2375,8
+2382,6
@@
void manager_check_finished(Manager *m) {
/* Turn off confirm spawn now */
m->confirm_spawn = false;
/* Turn off confirm spawn now */
m->confirm_spawn = false;
- manager_unwatch_jobs_in_progress(m);
-
if (dual_timestamp_is_set(&m->finish_timestamp))
return;
if (dual_timestamp_is_set(&m->finish_timestamp))
return;
@@
-2476,9
+2481,9
@@
static int create_generator_dir(Manager *m, char **generator, const char *name)
return log_oom();
if (!mkdtemp(p)) {
return log_oom();
if (!mkdtemp(p)) {
- free(p);
log_error("Failed to create generator directory %s: %m",
p);
log_error("Failed to create generator directory %s: %m",
p);
+ free(p);
return -errno;
}
}
return -errno;
}
}