chiark / gitweb /
bus: add a more comprehensive test for the bloom filter logic
[elogind.git] / Makefile.am
index 6200610..2b2efcc 100644 (file)
@@ -32,7 +32,7 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=4
+LIBUDEV_REVISION=5
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
@@ -40,7 +40,7 @@ LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=7
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=7
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -48,11 +48,11 @@ LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=22
+LIBSYSTEMD_ID128_REVISION=23
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=10
-LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_REVISION=2
 LIBSYSTEMD_JOURNAL_AGE=10
 
 # Dirs of external packages
@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \
+       units/systemd-update-utmp.service \
        units/systemd-update-utmp-runlevel.service \
-       units/systemd-update-utmp-shutdown.service \
        units/systemd-tmpfiles-setup-dev.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
@@ -463,8 +463,8 @@ EXTRA_DIST += \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-remount-fs.service.in \
+       units/systemd-update-utmp.service.in \
        units/systemd-update-utmp-runlevel.service.in \
-       units/systemd-update-utmp-shutdown.service.in \
        units/systemd-tmpfiles-setup-dev.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \
@@ -695,7 +695,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fileio.h \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \
-       src/shared/MurmurHash3.h
+       src/shared/MurmurHash3.h \
+       src/shared/refcnt.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1718,6 +1719,7 @@ EXTRA_DIST += \
 libsystemd_bus_la_SOURCES = \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
+       src/systemd/sd-memfd.h \
        src/libsystemd-bus/sd-bus.c \
        src/libsystemd-bus/bus-control.c \
        src/libsystemd-bus/bus-control.h \
@@ -1739,13 +1741,18 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-match.h \
        src/libsystemd-bus/bus-bloom.c \
        src/libsystemd-bus/bus-bloom.h \
-       src/libsystemd-bus/kdbus.h
+       src/libsystemd-bus/kdbus.h \
+       src/libsystemd-bus/sd-memfd.c
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
        libsystemd-shared.la \
        libsystemd-daemon.la
 
+libsystemd_bus_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
@@ -1755,7 +1762,10 @@ tests += \
        test-bus-chat \
        test-bus-server \
        test-bus-match \
-       test-bus-kernel
+       test-bus-kernel \
+       test-bus-kernel-bloom \
+       test-bus-memfd \
+       test-bus-zero-copy
 
 noinst_PROGRAMS += \
        busctl
@@ -1827,6 +1837,37 @@ test_bus_kernel_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
+test_bus_kernel_bloom_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_bloom_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_memfd_SOURCES = \
+       src/libsystemd-bus/test-bus-memfd.c
+
+test_bus_memfd_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_memfd_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
+test_bus_zero_copy_SOURCES = \
+       src/libsystemd-bus/test-bus-zero-copy.c
+
+test_bus_zero_copy_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_zero_copy_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
@@ -3138,8 +3179,7 @@ rootlibexec_PROGRAMS += \
        systemd-random-seed
 
 nodist_systemunit_DATA += \
-       units/systemd-random-seed-save.service \
-       units/systemd-random-seed-load.service
+       units/systemd-random-seed.service
 
 systemd_random_seed_SOURCES = \
        src/random-seed/random-seed.c
@@ -3148,16 +3188,13 @@ systemd_random_seed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
-SHUTDOWN_TARGET_WANTS += \
-       systemd-random-seed-save.service
 SYSINIT_TARGET_WANTS += \
-       systemd-random-seed-load.service
+       systemd-random-seed.service
 
 endif
 
 EXTRA_DIST += \
-       units/systemd-random-seed-save.service.in \
-       units/systemd-random-seed-load.service.in
+       units/systemd-random-seed.service.in
 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
@@ -3698,7 +3735,8 @@ pkgpyexec_LTLIBRARIES = \
        _journal.la \
        id128.la \
        _daemon.la \
-       _reader.la
+       _reader.la \
+       login.la
 
 _journal_la_SOURCES = \
        src/python-systemd/_journal.c
@@ -3784,6 +3822,29 @@ _reader_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-daemon-internal.la
 
+login_la_SOURCES = \
+       src/python-systemd/login.c \
+       src/python-systemd/pyutil.c \
+       src/python-systemd/pyutil.h
+
+login_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=default \
+       $(PYTHON_CFLAGS)
+
+login_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -shared \
+       -module \
+       -avoid-version
+
+login_la_LIBADD = \
+       $(PYTHON_LIBS) \
+       libsystemd-journal.la \
+       libsystemd-login.la \
+       libsystemd-shared.la \
+       libsystemd-daemon-internal.la
+
 dist_pkgpyexec_PYTHON = \
        src/python-systemd/journal.py \
        src/python-systemd/daemon.py \
@@ -3802,6 +3863,10 @@ sphinx-%:
        $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
        $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
 
+python-shell:
+       $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
+       $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
+
 destdir-sphinx: all
        dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
                $(MAKE) DESTDIR="$$dir" install && \
@@ -4022,8 +4087,8 @@ RUNLEVEL4_TARGET_WANTS += \
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 endif
-SHUTDOWN_TARGET_WANTS += \
-       systemd-update-utmp-shutdown.service
+SYSINIT_TARGET_WANTS += \
+       systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
        systemd-fsck-root.service \