Commit Graph

10334 Commits

Author SHA1 Message Date
Michal Schmidt
146b012e50 treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all
low-level logging calls and intrdouce log_error_errno() as log calls
that take error numbers", use sed to convert the simple cases to use
the new macros:

find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/'

Multi-line log_*() invocations are not covered.
And we also should add log_unit_*_errno().

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-28 11:16:51 -05:00
Lennart Poettering
e72e57a66f log: rearrange log function naming
- Rename log_meta() → log_internal(), to follow naming scheme of most
  other log functions that are usually invoked through macros, but never
  directly.

- Rename log_info_object() to log_object_info(), simply because the
  object should be before any other parameters, to follow OO-style
  programming style.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-28 10:26:48 -05:00
Lennart Poettering
107530eaa3 log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers
This change has two benefits:

- The format string %m will now resolve to the specified error (or to
  errno if the specified error is 0. This allows getting rid of a ton of
  strerror() invocations, a function that is not thread-safe.

- The specified error can be passed to the journal in the ERRNO= field.

Now of course, we just need somebody to convert all cases of this:

        log_error("Something happened: %s", strerror(-r));

into thus:

        log_error_errno(-r, "Something happened: %m");

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-28 10:13:40 -05:00
Zbigniew Jędrzejewski-Szmek
62d9908a84 udevadm trigger: allow matching by device name
This makes udevadm trigger mirror udevadm info, except that multiple
device names can be specified. Instructions in 60-keyboard.hwdb should
now actually work.

udevadm(8) is updated, but it could use a bit more polishing.

https://bugs.freedesktop.org/show_bug.cgi?id=82311

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-28 08:54:14 -05:00
Zbigniew Jędrzejewski-Szmek
c0f2fad6a5 udevadm: split out find_device helper
The idea is to unify the way that devices can be specified.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-28 08:44:21 -05:00
Peter Hutterer
3481b5b976 hwdb: add a new db for the DPI/frequency settings of mice
Pointer acceleration for relative input devices (mice, trackballs, etc.)
applies to the deltas of the device. Alas, those deltas have no physical
reference point - a delta of 10 may be caused by a large movement of a
low-dpi mouse or by a minute movement of a high-dpi mouse.
Which makes pointer acceleration a bit useless and high-dpi devices
essentially unusable.

In an ideal world, we could read the DPI from the device directly and work
with that. In the world we actually live in, we need to compile this list
manually. This patch introduces the database, with the usual match formats
and a single property to be set on a device: MOUSE_DPI

That is either a single value for most mice, or a list of values for mice
that can change resolution at runtime. The exact format is detailed in the
hwdb file.

Note that we're explicitly overshooting the requirements we have for
libinput atm. Frequency could be detected in software and we don't
actually use the list of multiple resolutions (because we can't detect
when they change anyway). However, we might as well collect those values
from the get-go, adding/modifying what will eventually amount to hundreds
of entries is a bit cumbersome.

Note: we rely on the input_id builtin to tag us as mouse first, ordering
of the rules is important.

(David: fixed up typos and moved hwdb file into ./hwdb/)

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-28 08:12:30 -05:00
Peter Hutterer
c317efd55c hwdb: fix a typo
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-27 16:50:49 -05:00
WaLyong Cho
70a41ab585 smack: introduce new SmackProcessLabel option
In service file, if the file has some of special SMACK label in
ExecStart= and systemd has no permission for the special SMACK label
then permission error will occurred. To resolve this, systemd should
be able to set its SMACK label to something accessible of ExecStart=.
So introduce new SmackProcessLabel. If label is specified with
SmackProcessLabel= then the child systemd will set its label to
that. To successfully execute the ExecStart=, accessible label should
be specified with SmackProcessLabel=.
Additionally, by SMACK policy, if the file in ExecStart= has no
SMACK64EXEC then the executed process will have given label by
SmackProcessLabel=. But if the file has SMACK64EXEC then the
SMACK64EXEC label will be overridden.

[zj: reword man page]

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-27 12:34:36 -05:00
Lennart Poettering
2694f4de06 man: add emacs header to get correct indention in nxml-mode for the manpage XML files that use 2ch indenting
In the long run we really should figure out if we want to stick with 8ch
or 2ch indenting, and not continue with half-and-half. For now, just
make emacs aware of the files that use 2ch indenting.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-27 08:29:53 -05:00
Lennart Poettering
0ddc209efd set: make set_consume() actually free the allocated string if the string already is in the set
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-20 06:43:53 -05:00
Susant Sahani
690c855960 log: unchecked return value from library
fix 1237557 Unchecked return value from library

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-17 17:59:53 -05:00
Ronny Chevalier
9f5d1bc3cd udev: silence TOCTOU warning when creating a directory
CID#979416. There is no real race here to fix, but lets make coverity
happy and rework the code.

Note that we still fail if the directory is removed _after_ we ran
mkdir(), so the same race is still there. Coverity is complaining, though.
Rewrite the code to make it happy.

(David: rewrote the commit-message to note that this is not a race. If I'm
        wrong, blame me, not Ronny!)

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-17 07:38:24 -05:00
Anthony G. Basile
6740579367 configure.ac: don't die on missing linux/btrfs.h, fixes issue
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-16 13:40:43 -05:00
Anthony G. Basile
d3ef837153 src/udev: update the definition of udev_event_execute_rule
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-16 08:44:52 -05:00
Kay Sievers
5fe138cdda udev: move global property handling from libudev to udevd
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 20:53:59 -05:00
Kay Sievers
dacd994fda udev: switch to systemd logging functions
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 20:46:11 -05:00
Ronny Chevalier
aec5d2b9b4 udev: use properly the systemd logging functions
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 19:54:23 -05:00
Anthony G. Basile
1425cbb606 src/shared/util.{c,h}: import needed functions from upstream 2014-11-14 19:54:07 -05:00
Kay Sievers
d1952898c7 udev: use the systemd logging functions in udev tools
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 17:39:08 -05:00
Lennart Poettering
e2c392176c utf8: when looking at the next unichar, honour the size parameter, in utf8_is_printable_newline()
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 17:26:13 -05:00
Lennart Poettering
71f9ca7cef util: simplify proc_cmdline() to reuse get_process_cmdline()
Also, make all parsing of the kernel cmdline non-fatal.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 14:34:25 -05:00
Michal Schmidt
5ce04ca64c shared: create files even if the SELinux policy has no context for them
The SELinux policy defines no context for some files. E.g.:
  $ matchpathcon /run/lock/subsys /dev/mqueue
  /run/lock/subsys        <<none>>
  /dev/mqueue     <<none>>

We still need to be able to create them.
In this case selabel_lookup_raw() returns ENOENT. We should then skip
setfscreatecon(), but still return success.
It was broken since c34255bdb2 ("label: unify code to make directories,
symlinks").

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 14:24:11 -05:00
Lennart Poettering
afd5b52fcf condition: unify condition logic in one file
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-14 14:22:02 -05:00
Lennart Poettering
9db4dfff9e util: simplify proc_cmdline() to reuse get_process_cmdline()
Also, make all parsing of the kernel cmdline non-fatal.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-07 16:54:58 -05:00
Anthony G. Basile
e9b029ac53 src/libudev/libudev-hwdb.c: update error message 2014-11-07 16:42:56 -05:00
Anthony G. Basile
903c8a36e1 man/udev.conf.xml: fix s/commandline/command line/g and rebuild man pages
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-07 08:33:37 -05:00
Harald Hoyer
ea4a086b39 s/commandline/command line/g
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-07 08:31:51 -05:00
David Herrmann
0f89a3c563 udev: avoid magic constants in kernel-cmdline parsers
Lets recognize the fact that startswith() returns a pointer to the tail on
success. Use it instead of hard-coding string-lengths as magic constants.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-07 08:29:22 -05:00
Richard W.M. Jones
7be58d7b48 udev: Fix parsing of udev.event-timeout kernel parameter.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-07 08:28:32 -05:00
Zbigniew Jędrzejewski-Szmek
c45f1f9002 man: describe all log levels in udevadm(8)
https://bugs.freedesktop.org/show_bug.cgi?id=85657

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-02 14:44:51 -05:00
Joe Lawrence
3d6ead6908 scsi_id: fix usage spelling
s/threat/treat/g

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-02 14:39:33 -05:00
Colin Walters
daaa2f764b libudev: Use correct free function
FILE * wants cleanup_fclose().

Spotted by udev hwdb segfaulting in gnome-continuous' buildroot
construction.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-02 14:38:03 -05:00
Anthony G. Basile
0ba3128e90 man: update man pages
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-02 14:36:05 -05:00
Zbigniew Jędrzejewski-Szmek
ad9c47a35b Use log "level" instead of "priority"
The term "priority" is misleading because higher levels have lower
priority. "Level" is clearer and shorter.

This commit touches only the textual descriptions, not function and variable
names themselves. "Priority" is used in various command-line switches and
protocol constants, so completly getting rid of "priority" is hard.

I also left "priority" in various places where the clarity suffered
when it was removed.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-02 14:27:23 -05:00
Zbigniew Jędrzejewski-Szmek
66498b0110 libudev: do not accept invalid log levels
Invalid log levels lead to a assert failure later on.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-02 14:22:32 -05:00
Zbigniew Jędrzejewski-Szmek
27756785c2 libudev: modernization
This brings udev logging style a bit closer to normal systemd convention.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-02 14:17:16 -05:00
Marcel Holtmann
73769714f5 hwdb: Update database of Bluetooth company identifiers
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-01 13:33:18 -04:00
Anthony G. Basile
887305880a man/make.sh: die if /usr/bin/xsltproc is not found
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-11-01 13:22:24 -04:00
Anthony G. Basile
2886f6c9e5 man: change systemd-udev to udev everywhere
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 21:25:43 -04:00
Anthony G. Basile
96fe7e83d4 man: ship pre-build man pages
This addresses https://github.com/gentoo/eudev/issues/98

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 20:12:39 -04:00
Anthony G. Basile
8b1eb9c754 src/shared/sparse-endian.h: cosmetic change
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 17:56:11 -04:00
Anthony G. Basile
a1941af5ee src/udev/udev-node.c: fix selinux label
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 17:43:39 -04:00
Anthony G. Basile
77e2c6addb rules/50-firmware.rules: remove firmware rules
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 16:45:12 -04:00
Michal Schmidt
03221aa40a hashmap: rewrite the implementation
We reintroduce hashmap.{h,c}, list.h and set.h verbatim from upstream,
before we punt dead code.  The following is the upstream message:

This is a rewrite of the hashmap implementation. Its advantage is lower
memory usage.

It uses open addressing (entries are stored in an array, as opposed to
linked lists). Hash collisions are resolved with linear probing and
Robin Hood displacement policy. See the references in hashmap.c.

Some fun empirical findings about hashmap usage in systemd on my laptop:
  - 98 % of allocated hashmaps are Sets.
  - Sets contain 78 % of all entries, plain Hashmaps 17 %, and
    OrderedHashmaps 5 %.
  - 60 % of allocated hashmaps contain only 1 entry.
  - 90 % of allocated hashmaps contain 5 or fewer entries.
  - 75 % of all entries are in hashmaps that use trivial_hash_ops.

Clearly it makes sense to:
  - store entries in distinct entry types. Especially for Sets - their
    entries are the most numerous and they require the least information
    to store an entry.
  - have a way to store small numbers of entries directly in the hashmap
    structs, and only allocate the usual entry arrays when the direct
    storage is full.

The implementation has an optional debugging feature (enabled by
defining the ENABLE_HASHMAP_DEBUG macro), where it:
  - tracks all allocated hashmaps in a linked list so that one can
    easily find them in gdb,
  - tracks which function/line allocated a given hashmap, and
  - checks for invalid mixing of hashmap iteration and modification.

Since entries are not allocated one-by-one anymore, mempools are not
used for entries. Originally I meant to drop mempools entirely, but it's
still worth it to use them for the hashmap structs. My testing indicates
that it makes loading of units about 5 % faster (a test with 10000 units
where more than 200000 hashmaps are allocated - pure malloc: 449±4 ms,
mempools: 427±7 ms).

Here are some memory usage numbers, taken on my laptop with a more or
less normal Fedora setup after booting with SELinux disabled (SELinux
increases systemd's memory usage significantly):

systemd (PID 1)                            Original   New    Change
dirty memory (from pmap -x 1) [KiB]            2152  1264     -41 %
total heap allocations (from gdb-heap) [KiB]   1623   756     -53 %

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 13:28:12 -04:00
Michal Schmidt
11c32d3baa mempool: add a zeroing alloc function
Add mempool_alloc0_tile(). It's like mempool_alloc_tile(), but it
initializes the allocated tile's memory to zero.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 12:05:27 -04:00
Lennart Poettering
eaa45759c7 util: don't block on getrandom()
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 12:02:25 -04:00
Dave Reisner
d21fc3fc8e missing.h: fix wrong __NR_getrandom syscall def
278 is vmsplice on x86_64. 318 is what we want:

http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x86/syscalls/syscall_64.tbl

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 12:01:37 -04:00
Lennart Poettering
ea79c9cdf0 util: make use of the new getrandom() syscall if it is available when needing entropy
Doesn't require an fd, and could be a bit faster, so let's make use of
it, if it is available.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 11:58:25 -04:00
Hans de Goede
fb45281a7a keymap: Ignore brightness keys on Dell Inspiron 1520 to avoid double events
On the Dell Inspiron 1520 both the atkbd and acpi-video input devices report
an event for pressing the brightness up / down key-combos, resulting in user
space seeing double events and increasing / decreasing the brightness 2 steps
for each keypress.

This hwdb snippet suppresses the atkbd events, making the Inspiron 1520 work
like most modern laptops which emit brightness up / down events through
acpi-video only.

Reported by Pavel Malyshev <p.malishev@gmail.com>

https://bugzilla.redhat.com/show_bug.cgi?id=1141525

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-31 06:29:53 -04:00
Anthony G. Basile
014ba30c45 man/udev.xml: update man page
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-10-30 21:55:57 -04:00