chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use 'long long' unless we have a really good reason to
[elogind.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index dee6109c005d35319a731dc3f530388ba1c25274..da42d7d78b573e5a366a04861a442416a51b43b1 100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-177,7
+177,7
@@
static int manager_setup_signals(Manager *m) {
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->signal_watch.fd, &ev) < 0)
return -errno;
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->signal_watch.fd, &ev) < 0)
return -errno;
- if (m->running_as == MANAGER_
INIT
)
+ if (m->running_as == MANAGER_
SYSTEM
)
return enable_special_signals(m);
return 0;
return enable_special_signals(m);
return 0;
@@
-243,8
+243,7
@@
int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) {
goto fail;
/* Try to connect to the busses, if possible. */
goto fail;
/* Try to connect to the busses, if possible. */
- if ((r = bus_init_system(m)) < 0 ||
- (r = bus_init_api(m)) < 0)
+ if ((r = bus_init(m)) < 0)
goto fail;
if (asprintf(&p, "%s/%s", m->cgroup_mount_point, m->cgroup_hierarchy) < 0) {
goto fail;
if (asprintf(&p, "%s/%s", m->cgroup_mount_point, m->cgroup_hierarchy) < 0) {
@@
-424,8
+423,7
@@
void manager_free(Manager *m) {
* around */
manager_shutdown_cgroup(m, m->exit_code != MANAGER_REEXECUTE);
* around */
manager_shutdown_cgroup(m, m->exit_code != MANAGER_REEXECUTE);
- bus_done_api(m);
- bus_done_system(m);
+ bus_done(m);
hashmap_free(m->units);
hashmap_free(m->jobs);
hashmap_free(m->units);
hashmap_free(m->jobs);
@@
-1703,7
+1701,7
@@
static int manager_dispatch_sigchld(Manager *m) {
char *name = NULL;
get_process_name(si.si_pid, &name);
char *name = NULL;
get_process_name(si.si_pid, &name);
- log_debug("Got SIGCHLD for process %l
lu (%s)", (unsigned long
long) si.si_pid, strna(name));
+ log_debug("Got SIGCHLD for process %l
u (%s)", (unsigned
long) si.si_pid, strna(name));
free(name);
}
free(name);
}
@@
-1729,8
+1727,8
@@
static int manager_dispatch_sigchld(Manager *m) {
if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED)
continue;
if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED)
continue;
- log_debug("Child %l
l
u died (code=%s, status=%i/%s)",
- (long
long
unsigned) si.si_pid,
+ log_debug("Child %lu died (code=%s, status=%i/%s)",
+ (long unsigned) si.si_pid,
sigchld_code_to_string(si.si_code),
si.si_status,
strna(si.si_code == CLD_EXITED ? exit_status_to_string(si.si_status) : strsignal(si.si_status)));
sigchld_code_to_string(si.si_code),
si.si_status,
strna(si.si_code == CLD_EXITED ? exit_status_to_string(si.si_status) : strsignal(si.si_status)));
@@
-1782,7
+1780,7
@@
static int manager_process_signal_fd(Manager *m) {
break;
case SIGTERM:
break;
case SIGTERM:
- if (m->running_as == MANAGER_
INIT
) {
+ if (m->running_as == MANAGER_
SYSTEM
) {
/* This is for compatibility with the
* original sysvinit */
m->exit_code = MANAGER_REEXECUTE;
/* This is for compatibility with the
* original sysvinit */
m->exit_code = MANAGER_REEXECUTE;
@@
-1792,7
+1790,7
@@
static int manager_process_signal_fd(Manager *m) {
/* Fall through */
case SIGINT:
/* Fall through */
case SIGINT:
- if (m->running_as == MANAGER_
INIT
) {
+ if (m->running_as == MANAGER_
SYSTEM
) {
manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE);
break;
}
manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE);
break;
}
@@
-1806,14
+1804,14
@@
static int manager_process_signal_fd(Manager *m) {
break;
case SIGWINCH:
break;
case SIGWINCH:
- if (m->running_as == MANAGER_
INIT
)
+ if (m->running_as == MANAGER_
SYSTEM
)
manager_start_target(m, SPECIAL_KBREQUEST_TARGET, JOB_REPLACE);
/* This is a nop on non-init */
break;
case SIGPWR:
manager_start_target(m, SPECIAL_KBREQUEST_TARGET, JOB_REPLACE);
/* This is a nop on non-init */
break;
case SIGPWR:
- if (m->running_as == MANAGER_
INIT
)
+ if (m->running_as == MANAGER_
SYSTEM
)
manager_start_target(m, SPECIAL_SIGPWR_TARGET, JOB_REPLACE);
/* This is a nop on non-init */
manager_start_target(m, SPECIAL_SIGPWR_TARGET, JOB_REPLACE);
/* This is a nop on non-init */
@@
-1826,8
+1824,7
@@
static int manager_process_signal_fd(Manager *m) {
if (!u || UNIT_IS_ACTIVE_OR_RELOADING(unit_active_state(u))) {
log_info("Trying to reconnect to bus...");
if (!u || UNIT_IS_ACTIVE_OR_RELOADING(unit_active_state(u))) {
log_info("Trying to reconnect to bus...");
- bus_init_system(m);
- bus_init_api(m);
+ bus_init(m);
}
if (!u || !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) {
}
if (!u || !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) {
@@
-2108,7
+2105,7
@@
void manager_write_utmp_reboot(Manager *m) {
if (m->utmp_reboot_written)
return;
if (m->utmp_reboot_written)
return;
- if (m->running_as != MANAGER_
INIT
)
+ if (m->running_as != MANAGER_
SYSTEM
)
return;
if (!manager_utmp_good(m))
return;
if (!manager_utmp_good(m))
@@
-2134,7
+2131,7
@@
void manager_write_utmp_runlevel(Manager *m, Unit *u) {
if (u->meta.type != UNIT_TARGET)
return;
if (u->meta.type != UNIT_TARGET)
return;
- if (m->running_as != MANAGER_
INIT
)
+ if (m->running_as != MANAGER_
SYSTEM
)
return;
if (!manager_utmp_good(m))
return;
if (!manager_utmp_good(m))
@@
-2340,7
+2337,6
@@
finish:
}
static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = {
}
static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = {
- [MANAGER_INIT] = "init",
[MANAGER_SYSTEM] = "system",
[MANAGER_SESSION] = "session"
};
[MANAGER_SYSTEM] = "system",
[MANAGER_SESSION] = "session"
};