Commit 8fe914ec authored by Lennart Poettering's avatar Lennart Poettering

device: do not merge devices

Don't try to merge devices that have been created via dependencies when
they appear in the system and can be recognized as the same.  Instead,
simply continue to maintain them independently of each other, however
with the same state cycle. Why? Because otherwise we'd have a hard time
to seperate the dependencies after the devices are unplugged again and
we hence cannot be sure anymore that next time the device is plugged in
it will carry the same names.

Example: if one depndency refers to dev-sda.device and another one to
dev-by-id-xxxyyy.device we only learn at time of plug in of the device
that it is actually the same device that was ment. In the moment the
device is unplugged again we won't know anymore their relation to each
other and the next time the harddisk is plugged it might even appear as
dev-by-id-xxxyyy.device and dev-sdb.service. To ensure the dependencies
continue to have the meaning they were intended to have let's hence keep
the .device objects seperate all the time, even when they are plugged
in.

This patch also introduces a new Following= property which points from
the various .device units of a specific device to the main .device unit
for it. This can be used by the client side to figure out the relation
of the .device units to each other and even filter units from display.
parent 5632e374
......@@ -38,8 +38,11 @@
* place /etc/inittab with explaining blurb.
* In command lines, support both "$FOO" and $FOO
* /etc must always take precedence even if we follow symlinks!
* fix merging of device units
* color aus bei stdout auf !tty
getty before prefdm
* /lib/init/rw
......@@ -49,13 +52,17 @@
* fingerprint.target, wireless.target, gps.target
* fix merging of device units
* set_put(), hashmap_put() return values checken. i.e. == 0 macht kein free()!
* crash on missing hostname
* fix merging in .swap units
* pahole
* color aus bei stdout auf !tty
* io priority
* network.target darf nm nicht unbedingt starten
External:
......
......@@ -115,6 +115,15 @@
they are set or not.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--full</option></term>
<listitem><para>Do not ellipsize unit
names in the output of
<command>list-units</command> and
<command>list-jobs</command>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--fail</option></term>
......
......@@ -82,7 +82,7 @@
" <method name=\"ClearJobs\"/>\n" \
" <method name=\"ResetMaintenance\"/>\n" \
" <method name=\"ListUnits\">\n" \
" <arg name=\"units\" type=\"a(sssssouso)\" direction=\"out\"/>\n" \
" <arg name=\"units\" type=\"a(ssssssouso)\" direction=\"out\"/>\n" \
" </method>\n" \
" <method name=\"ListJobs\">\n" \
" <arg name=\"jobs\" type=\"a(usssoo)\" direction=\"out\"/>\n" \
......@@ -405,12 +405,12 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
dbus_message_iter_init_append(reply, &iter);
if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(sssssouso)", &sub))
if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(ssssssouso)", &sub))
goto oom;
HASHMAP_FOREACH_KEY(u, k, m->units, i) {
char *u_path, *j_path;
const char *description, *load_state, *active_state, *sub_state, *sjob_type;
const char *description, *load_state, *active_state, *sub_state, *sjob_type, *following;
DBusMessageIter sub2;
uint32_t job_id;
......@@ -424,6 +424,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
load_state = unit_load_state_to_string(u->meta.load_state);
active_state = unit_active_state_to_string(unit_active_state(u));
sub_state = unit_sub_state_to_string(u);
following = u->meta.following ? u->meta.following->meta.id : "";
if (!(u_path = unit_dbus_path(u)))
goto oom;
......@@ -448,6 +449,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &load_state) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &active_state) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &sub_state) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &following) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_OBJECT_PATH, &u_path) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT32, &job_id) ||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &sjob_type) ||
......
......@@ -47,6 +47,23 @@ int bus_unit_append_names(Manager *m, DBusMessageIter *i, const char *property,
return 0;
}
int bus_unit_append_following(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Unit *u = data;
const char *d;
assert(m);
assert(i);
assert(property);
assert(u);
d = u->meta.following ? u->meta.following->meta.id : "";
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
return -ENOMEM;
return 0;
}
int bus_unit_append_dependencies(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Unit *u;
Iterator j;
......
......@@ -60,6 +60,7 @@
" <signal name=\"Changed\"/>\n" \
" <property name=\"Id\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"Names\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"Following\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"Requires\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"RequiresOverridable\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"Requisite\" type=\"as\" access=\"read\"/>\n" \
......@@ -97,6 +98,7 @@
#define BUS_UNIT_PROPERTIES \
{ "org.freedesktop.systemd1.Unit", "Id", bus_property_append_string, "s", u->meta.id }, \
{ "org.freedesktop.systemd1.Unit", "Names", bus_unit_append_names, "as", u }, \
{ "org.freedesktop.systemd1.Unit", "Following", bus_unit_append_following, "s", u }, \
{ "org.freedesktop.systemd1.Unit", "Requires", bus_unit_append_dependencies, "as", u->meta.dependencies[UNIT_REQUIRES] }, \
{ "org.freedesktop.systemd1.Unit", "RequiresOverridable", bus_unit_append_dependencies, "as", u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE] }, \
{ "org.freedesktop.systemd1.Unit", "Requisite", bus_unit_append_dependencies, "as", u->meta.dependencies[UNIT_REQUISITE] }, \
......@@ -131,6 +133,7 @@
{ "org.freedesktop.systemd1.Unit", "JobTimeoutUSec", bus_property_append_usec, "t", &u->meta.job_timeout }
int bus_unit_append_names(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_following(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_dependencies(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_description(Manager *m, DBusMessageIter *i, const char *property, void *data);
int bus_unit_append_load_state(Manager *m, DBusMessageIter *i, const char *property, void *data);
......
This diff is collapsed.
......@@ -41,6 +41,12 @@ struct Device {
DeviceState state;
char *sysfs;
/* In order to be able to distuingish dependencies on
different device nodes we might end up creating multiple
devices for the same sysfs path. We chain them up here. */
LIST_FIELDS(struct Device, same_sysfs);
};
extern const UnitVTable device_vtable;
......
......@@ -296,6 +296,33 @@ int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key,
return 0;
}
int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value) {
struct hashmap_entry *e, *k;
unsigned old_hash, new_hash;
if (!h)
return -ENOENT;
old_hash = h->hash_func(old_key) % NBUCKETS;
if (!(e = hash_scan(h, old_hash, old_key)))
return -ENOENT;
new_hash = h->hash_func(new_key) % NBUCKETS;
if ((k = hash_scan(h, new_hash, new_key)))
if (e != k)
remove_entry(h, k);
unlink_entry(h, e, old_hash);
e->key = new_key;
e->value = value;
link_entry(h, e, new_hash);
return 0;
}
void* hashmap_remove_value(Hashmap *h, const void *key, void *value) {
struct hashmap_entry *e;
unsigned hash;
......
......@@ -56,6 +56,7 @@ void* hashmap_get(Hashmap *h, const void *key);
void* hashmap_remove(Hashmap *h, const void *key);
void* hashmap_remove_value(Hashmap *h, const void *key, void *value);
int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value);
int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value);
int hashmap_merge(Hashmap *h, Hashmap *other);
void hashmap_move(Hashmap *h, Hashmap *other);
......
......@@ -146,6 +146,7 @@ struct Manager {
struct udev* udev;
struct udev_monitor* udev_monitor;
Watch udev_watch;
Hashmap *devices_by_sysfs;
/* Data specific to the mount subsystem */
FILE *proc_self_mountinfo;
......
......@@ -45,16 +45,18 @@ typedef enum PathType {
} PathType;
typedef struct PathSpec {
PathType type;
char *path;
Watch watch;
LIST_FIELDS(struct PathSpec, spec);
PathType type;
int inotify_fd;
int primary_wd;
bool previous_exists;
Watch watch;
bool previous_exists;
LIST_FIELDS(struct PathSpec, spec);
} PathSpec;
struct Path {
......@@ -62,9 +64,10 @@ struct Path {
LIST_HEAD(PathSpec, specs);
PathState state, deserialized_state;
Unit *unit;
PathState state, deserialized_state;
bool failure;
};
......
......@@ -90,8 +90,6 @@ struct Service {
ServiceType type;
ServiceRestart restart;
NotifyAccess notify_access;
/* If set we'll read the main daemon PID from this file */
char *pid_file;
......@@ -101,10 +99,6 @@ struct Service {
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
ExecContext exec_context;
bool permissions_start_only;
bool root_directory_start_only;
bool valid_no_process;
ServiceState state, deserialized_state;
ExecStatus main_exec_status;
......@@ -112,6 +106,11 @@ struct Service {
ExecCommand *control_command;
ServiceExecCommand control_command_id;
pid_t main_pid, control_pid;
bool permissions_start_only;
bool root_directory_start_only;
bool valid_no_process;
bool main_pid_known:1;
/* If we shut down, remember why */
......@@ -124,8 +123,11 @@ struct Service {
bool got_socket_fd:1;
bool sysv_has_lsb:1;
char *sysv_path;
int socket_fd;
int sysv_start_priority;
char *sysv_path;
char *sysv_runlevels;
char *bus_name;
......@@ -134,10 +136,11 @@ struct Service {
RateLimit ratelimit;
int socket_fd;
struct Socket *socket;
Watch timer_watch;
NotifyAccess notify_access;
};
extern const UnitVTable service_vtable;
......
......@@ -58,6 +58,7 @@ static bool arg_no_sync = false;
static bool arg_no_wall = false;
static bool arg_dry = false;
static bool arg_quiet = false;
static char arg_full = false;
static char **arg_wall = NULL;
static enum action {
ACTION_INVALID,
......@@ -192,7 +193,7 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
printf("%-45s %-6s %-12s %-12s %-15s %s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB", "DESCRIPTION");
while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
const char *id, *description, *load_state, *active_state, *sub_state, *unit_path, *job_type, *job_path, *dot;
const char *id, *description, *load_state, *active_state, *sub_state, *following, *unit_path, *job_type, *job_path, *dot;
uint32_t job_id;
if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
......@@ -208,6 +209,7 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &load_state, true) < 0 ||
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &active_state, true) < 0 ||
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &sub_state, true) < 0 ||
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &following, true) < 0 ||
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &unit_path, true) < 0 ||
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &job_id, true) < 0 ||
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &job_type, true) < 0 ||
......@@ -219,14 +221,16 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
if ((!arg_type || ((dot = strrchr(id, '.')) &&
streq(dot+1, arg_type))) &&
(arg_all || !streq(active_state, "inactive") || job_id > 0)) {
(arg_all || !(streq(active_state, "inactive") || following[0]) || job_id > 0)) {
char *e;
int a = 0, b = 0;
if (streq(active_state, "maintenance"))
fputs(ANSI_HIGHLIGHT_ON, stdout);
printf("%-45s %-6s %-12s %-12s%n", id, load_state, active_state, sub_state, &a);
e = arg_full ? NULL : ellipsize(id, 45, 33);
printf("%-45s %-6s %-12s %-12s%n", e ? e : id, load_state, active_state, sub_state, &a);
free(e);
if (job_id != 0)
printf(" => %-12s%n", job_type, &b);
......@@ -558,6 +562,7 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) {
while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
const char *name, *type, *state, *job_path, *unit_path;
uint32_t id;
char *e;
if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
log_error("Failed to parse reply.");
......@@ -578,7 +583,10 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) {
goto finish;
}
printf("%4u %-45s %-17s %-7s\n", id, name, type, state);
e = arg_full ? NULL : ellipsize(name, 45, 33);
printf("%4u %-45s %-17s %-7s\n", id, e ? e : name, type, state);
free(e);
k++;
dbus_message_iter_next(&sub);
......@@ -2895,6 +2903,7 @@ static int systemctl_help(void) {
" -t --type=TYPE List only units of a particular type\n"
" -p --property=NAME Show only properties by this name\n"
" -a --all Show all units/properties, including dead/empty ones\n"
" --full Don't ellipsize unit names.\n"
" --fail When installing a new job, fail if conflicting jobs are\n"
" pending\n"
" --system Connect to system bus\n"
......@@ -3022,7 +3031,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
ARG_NO_BLOCK,
ARG_NO_WALL,
ARG_ORDER,
ARG_REQUIRE
ARG_REQUIRE,
ARG_FULL
};
static const struct option options[] = {
......@@ -3030,6 +3040,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
{ "type", required_argument, NULL, 't' },
{ "property", required_argument, NULL, 'p' },
{ "all", no_argument, NULL, 'a' },
{ "full", no_argument, NULL, ARG_FULL },
{ "fail", no_argument, NULL, ARG_FAIL },
{ "session", no_argument, NULL, ARG_SESSION },
{ "system", no_argument, NULL, ARG_SYSTEM },
......@@ -3099,6 +3110,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
arg_dot = DOT_REQUIRE;
break;
case ARG_FULL:
arg_full = true;
break;
case 'q':
arg_quiet = true;
break;
......
......@@ -28,6 +28,7 @@ public interface Manager : DBus.Object {
string load_state;
string active_state;
string sub_state;
string following;
ObjectPath unit_path;
uint32 job_id;
string job_type;
......
......@@ -625,6 +625,9 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
SET_FOREACH(t, u->meta.names, i)
fprintf(f, "%s\tName: %s\n", prefix, t);
if (u->meta.following)
fprintf(f, "%s\tFollowing: %s\n", prefix, u->meta.following->meta.id);
if (u->meta.fragment_path)
fprintf(f, "%s\tFragment Path: %s\n", prefix, u->meta.fragment_path);
......
......@@ -176,6 +176,9 @@ struct Meta {
/* GC queue */
LIST_FIELDS(Meta, gc_queue);
/* This follows another unit in state */
Unit *following;
/* Used during GC sweeps */
unsigned gc_marker;
......
......@@ -2912,6 +2912,38 @@ int running_in_chroot(void) {
a.st_ino != b.st_ino;
}
char *ellipsize(const char *s, unsigned length, unsigned percent) {
size_t l, x;
char *r;
assert(s);
assert(percent <= 100);
assert(length >= 3);
l = strlen(s);
if (l <= 3 || l <= length)
return strdup(s);
if (!(r = new0(char, length+1)))
return r;
x = (length * percent) / 100;
if (x > length - 3)
x = length - 3;
memcpy(r, s, x);
r[x] = '.';
r[x+1] = '.';
r[x+2] = '.';
memcpy(r + x + 3,
s + l - (length - x - 3),
length - x - 3);
return r;
}
static const char *const ioprio_class_table[] = {
[IOPRIO_CLASS_NONE] = "none",
[IOPRIO_CLASS_RT] = "realtime",
......
......@@ -334,6 +334,8 @@ int columns(void);
int running_in_chroot(void);
char *ellipsize(const char *s, unsigned length, unsigned percent);
const char *ioprio_class_to_string(int i);
int ioprio_class_from_string(const char *s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment