diff --git a/Makefile b/Makefile index 6d055ca..19b8260 100644 --- a/Makefile +++ b/Makefile @@ -11,20 +11,6 @@ BUILD_DIR = build all: build -.PHONY: update-constants -update-constants: update-constants.py $(INCLUDE_DIR)/systemd/sd-messages.h - $(PYTHON) $+ src/systemd/id128-defines.h | \ - sort -u | \ - tee src/systemd/id128-defines.h.tmp | \ - $(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' | \ - sort -u > src/systemd/id128-constants.h.tmp - mv src/systemd/id128-defines.h{.tmp,} - mv src/systemd/id128-constants.h{.tmp,} - ($(SED) 9q docs/id128.rst.tmp - mv docs/id128.rst{.tmp,} - build: $(PYTHON) -m build -Cbuild-dir=$(BUILD_DIR) diff --git a/docs/id128.rst b/docs/id128.rst index eb5e876..a0d7b5e 100644 --- a/docs/id128.rst +++ b/docs/id128.rst @@ -10,17 +10,44 @@ .. autogenerated, do not edit! .. autoattribute:: systemd.id128.SD_MESSAGE_BACKTRACE + .. autoattribute:: systemd.id128.SD_MESSAGE_BATTERY_LOW_POWEROFF + .. autoattribute:: systemd.id128.SD_MESSAGE_BATTERY_LOW_WARNING .. autoattribute:: systemd.id128.SD_MESSAGE_BOOTCHART + .. autoattribute:: systemd.id128.SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE .. autoattribute:: systemd.id128.SD_MESSAGE_CONFIG_ERROR .. autoattribute:: systemd.id128.SD_MESSAGE_COREDUMP + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_CAPABILITY_BOUNDING + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_CAPABILITY_BOUNDING_USER + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_DISABLE_PRIVILEGES + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_FD_SET_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_ISOLATE_TARGET_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_MAINLOOP_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_MANAGER_ALLOCATE + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_NO_XDGDIR_PATH + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_PID1_ENVIRONMENT + .. autoattribute:: systemd.id128.SD_MESSAGE_CORE_START_TARGET_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_COREDUMP_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_COREDUMP_PID + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_EXECLE_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_EXIT + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_FREEZE + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_NO_COREDUMP + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_NO_FORK + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_PROCESS_SIGNAL + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_SHELL_FORK_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_SYSTEMD_SIGNAL + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_UNKNOWN_SIGNAL + .. autoattribute:: systemd.id128.SD_MESSAGE_CRASH_WAITPID_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE .. autoattribute:: systemd.id128.SD_MESSAGE_DEVICE_PATH_NOT_SUITABLE .. autoattribute:: systemd.id128.SD_MESSAGE_DNSSEC_DOWNGRADE .. autoattribute:: systemd.id128.SD_MESSAGE_DNSSEC_FAILURE .. autoattribute:: systemd.id128.SD_MESSAGE_DNSSEC_TRUST_ANCHOR_REVOKED .. autoattribute:: systemd.id128.SD_MESSAGE_FACTORY_RESET .. autoattribute:: systemd.id128.SD_MESSAGE_FORWARD_SYSLOG_MISSED - .. autoattribute:: systemd.id128.SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS .. autoattribute:: systemd.id128.SD_MESSAGE_HIBERNATE_KEY + .. autoattribute:: systemd.id128.SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS .. autoattribute:: systemd.id128.SD_MESSAGE_INVALID_CONFIGURATION .. autoattribute:: systemd.id128.SD_MESSAGE_JOURNAL_DROPPED .. autoattribute:: systemd.id128.SD_MESSAGE_JOURNAL_MISSED @@ -31,35 +58,52 @@ .. autoattribute:: systemd.id128.SD_MESSAGE_LID_OPENED .. autoattribute:: systemd.id128.SD_MESSAGE_MACHINE_START .. autoattribute:: systemd.id128.SD_MESSAGE_MACHINE_STOP + .. autoattribute:: systemd.id128.SD_MESSAGE_MEMORY_TRIM .. autoattribute:: systemd.id128.SD_MESSAGE_MOUNT_POINT_PATH_NOT_SUITABLE .. autoattribute:: systemd.id128.SD_MESSAGE_NOBODY_USER_UNSUITABLE + .. autoattribute:: systemd.id128.SD_MESSAGE_NON_CANONICAL_MOUNT .. autoattribute:: systemd.id128.SD_MESSAGE_OVERMOUNTING - .. autoattribute:: systemd.id128.SD_MESSAGE_POWER_KEY_LONG_PRESS + .. autoattribute:: systemd.id128.SD_MESSAGE_PORTABLE_ATTACHED + .. autoattribute:: systemd.id128.SD_MESSAGE_PORTABLE_DETACHED .. autoattribute:: systemd.id128.SD_MESSAGE_POWER_KEY - .. autoattribute:: systemd.id128.SD_MESSAGE_REBOOT_KEY_LONG_PRESS + .. autoattribute:: systemd.id128.SD_MESSAGE_POWER_KEY_LONG_PRESS .. autoattribute:: systemd.id128.SD_MESSAGE_REBOOT_KEY + .. autoattribute:: systemd.id128.SD_MESSAGE_REBOOT_KEY_LONG_PRESS .. autoattribute:: systemd.id128.SD_MESSAGE_SEAT_START .. autoattribute:: systemd.id128.SD_MESSAGE_SEAT_STOP + .. autoattribute:: systemd.id128.SD_MESSAGE_SECURE_ATTENTION_KEY_PRESS + .. autoattribute:: systemd.id128.SD_MESSAGE_SELINUX_FAILED .. autoattribute:: systemd.id128.SD_MESSAGE_SESSION_START .. autoattribute:: systemd.id128.SD_MESSAGE_SESSION_STOP .. autoattribute:: systemd.id128.SD_MESSAGE_SHUTDOWN + .. autoattribute:: systemd.id128.SD_MESSAGE_SHUTDOWN_CANCELED + .. autoattribute:: systemd.id128.SD_MESSAGE_SHUTDOWN_ERROR + .. autoattribute:: systemd.id128.SD_MESSAGE_SHUTDOWN_SCHEDULED .. autoattribute:: systemd.id128.SD_MESSAGE_SLEEP_START .. autoattribute:: systemd.id128.SD_MESSAGE_SLEEP_STOP + .. autoattribute:: systemd.id128.SD_MESSAGE_SMACK_FAILED_WRITE .. autoattribute:: systemd.id128.SD_MESSAGE_SPAWN_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_SRK_ENROLLMENT_NEEDS_AUTHORIZATION .. autoattribute:: systemd.id128.SD_MESSAGE_STARTUP_FINISHED - .. autoattribute:: systemd.id128.SD_MESSAGE_SUSPEND_KEY_LONG_PRESS .. autoattribute:: systemd.id128.SD_MESSAGE_SUSPEND_KEY - .. autoattribute:: systemd.id128.SD_MESSAGE_SYSTEM_DOCKED + .. autoattribute:: systemd.id128.SD_MESSAGE_SUSPEND_KEY_LONG_PRESS + .. autoattribute:: systemd.id128.SD_MESSAGE_SYSCTL_CHANGED .. autoattribute:: systemd.id128.SD_MESSAGE_SYSTEMD_UDEV_SETTLE_DEPRECATED + .. autoattribute:: systemd.id128.SD_MESSAGE_SYSTEM_DOCKED .. autoattribute:: systemd.id128.SD_MESSAGE_SYSTEM_UNDOCKED + .. autoattribute:: systemd.id128.SD_MESSAGE_SYSV_GENERATOR_DEPRECATED .. autoattribute:: systemd.id128.SD_MESSAGE_TAINTED + .. autoattribute:: systemd.id128.SD_MESSAGE_TIMEZONE_CHANGE + .. autoattribute:: systemd.id128.SD_MESSAGE_TIME_BUMP .. autoattribute:: systemd.id128.SD_MESSAGE_TIME_CHANGE .. autoattribute:: systemd.id128.SD_MESSAGE_TIME_SYNC - .. autoattribute:: systemd.id128.SD_MESSAGE_TIMEZONE_CHANGE + .. autoattribute:: systemd.id128.SD_MESSAGE_TPM2_CLEAR_REQUESTED + .. autoattribute:: systemd.id128.SD_MESSAGE_TPM_PCR_EXTEND .. autoattribute:: systemd.id128.SD_MESSAGE_TRUNCATED_CORE .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_FAILED .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_FAILURE_RESULT .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_OOMD_KILL + .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_ORDERING_CYCLE .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_OUT_OF_MEMORY .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_PROCESS_EXIT .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_RELOADED @@ -74,3 +118,7 @@ .. autoattribute:: systemd.id128.SD_MESSAGE_UNIT_SUCCESS .. autoattribute:: systemd.id128.SD_MESSAGE_UNSAFE_USER_NAME .. autoattribute:: systemd.id128.SD_MESSAGE_USER_STARTUP_FINISHED + .. autoattribute:: systemd.id128.SD_MESSAGE_VALGRIND_HELPER_FORK + .. autoattribute:: systemd.id128.SD_MESSAGE_WATCHDOG_OPENED + .. autoattribute:: systemd.id128.SD_MESSAGE_WATCHDOG_OPEN_FAILED + .. autoattribute:: systemd.id128.SD_MESSAGE_WATCHDOG_PING_FAILED diff --git a/meson.build b/meson.build index 590f929..fa6f192 100644 --- a/meson.build +++ b/meson.build @@ -20,4 +20,8 @@ common_c_args = [ '-DLIBSYSTEMD_VERSION=@0@'.format(libsystemd_dep.version()), ] +update_constants_py = files('update-constants.py') + subdir('src/systemd') + +alias_target('update-constants', update_constants) diff --git a/src/systemd/_reader.c b/src/systemd/_reader.c index 3f642fc..33ba92c 100644 --- a/src/systemd/_reader.c +++ b/src/systemd/_reader.c @@ -80,13 +80,13 @@ static PyStructSequence_Desc Monotonic_desc = { * Returns NULL on error. */ static char* str_converter(PyObject *str, PyObject **bytes) { - int r; + int r; - r = PyUnicode_FSConverter(str, bytes); - if (r == 0) - return NULL; + r = PyUnicode_FSConverter(str, bytes); + if (r == 0) + return NULL; - return PyBytes_AsString(*bytes); + return PyBytes_AsString(*bytes); } /** diff --git a/src/systemd/id128-constants.h b/src/systemd/id128-constants.h index a1d215c..77f1ded 100644 --- a/src/systemd/id128-constants.h +++ b/src/systemd/id128-constants.h @@ -1,15 +1,42 @@ add_id(m, "SD_MESSAGE_BACKTRACE", SD_MESSAGE_BACKTRACE) JOINER +add_id(m, "SD_MESSAGE_BATTERY_LOW_POWEROFF", SD_MESSAGE_BATTERY_LOW_POWEROFF) JOINER +add_id(m, "SD_MESSAGE_BATTERY_LOW_WARNING", SD_MESSAGE_BATTERY_LOW_WARNING) JOINER add_id(m, "SD_MESSAGE_BOOTCHART", SD_MESSAGE_BOOTCHART) JOINER +add_id(m, "SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE", SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE) JOINER add_id(m, "SD_MESSAGE_CONFIG_ERROR", SD_MESSAGE_CONFIG_ERROR) JOINER add_id(m, "SD_MESSAGE_COREDUMP", SD_MESSAGE_COREDUMP) JOINER +add_id(m, "SD_MESSAGE_CORE_CAPABILITY_BOUNDING", SD_MESSAGE_CORE_CAPABILITY_BOUNDING) JOINER +add_id(m, "SD_MESSAGE_CORE_CAPABILITY_BOUNDING_USER", SD_MESSAGE_CORE_CAPABILITY_BOUNDING_USER) JOINER +add_id(m, "SD_MESSAGE_CORE_DISABLE_PRIVILEGES", SD_MESSAGE_CORE_DISABLE_PRIVILEGES) JOINER +add_id(m, "SD_MESSAGE_CORE_FD_SET_FAILED", SD_MESSAGE_CORE_FD_SET_FAILED) JOINER +add_id(m, "SD_MESSAGE_CORE_ISOLATE_TARGET_FAILED", SD_MESSAGE_CORE_ISOLATE_TARGET_FAILED) JOINER +add_id(m, "SD_MESSAGE_CORE_MAINLOOP_FAILED", SD_MESSAGE_CORE_MAINLOOP_FAILED) JOINER +add_id(m, "SD_MESSAGE_CORE_MANAGER_ALLOCATE", SD_MESSAGE_CORE_MANAGER_ALLOCATE) JOINER +add_id(m, "SD_MESSAGE_CORE_NO_XDGDIR_PATH", SD_MESSAGE_CORE_NO_XDGDIR_PATH) JOINER +add_id(m, "SD_MESSAGE_CORE_PID1_ENVIRONMENT", SD_MESSAGE_CORE_PID1_ENVIRONMENT) JOINER +add_id(m, "SD_MESSAGE_CORE_START_TARGET_FAILED", SD_MESSAGE_CORE_START_TARGET_FAILED) JOINER +add_id(m, "SD_MESSAGE_CRASH_COREDUMP_FAILED", SD_MESSAGE_CRASH_COREDUMP_FAILED) JOINER +add_id(m, "SD_MESSAGE_CRASH_COREDUMP_PID", SD_MESSAGE_CRASH_COREDUMP_PID) JOINER +add_id(m, "SD_MESSAGE_CRASH_EXECLE_FAILED", SD_MESSAGE_CRASH_EXECLE_FAILED) JOINER +add_id(m, "SD_MESSAGE_CRASH_EXIT", SD_MESSAGE_CRASH_EXIT) JOINER +add_id(m, "SD_MESSAGE_CRASH_FAILED", SD_MESSAGE_CRASH_FAILED) JOINER +add_id(m, "SD_MESSAGE_CRASH_FREEZE", SD_MESSAGE_CRASH_FREEZE) JOINER +add_id(m, "SD_MESSAGE_CRASH_NO_COREDUMP", SD_MESSAGE_CRASH_NO_COREDUMP) JOINER +add_id(m, "SD_MESSAGE_CRASH_NO_FORK", SD_MESSAGE_CRASH_NO_FORK) JOINER +add_id(m, "SD_MESSAGE_CRASH_PROCESS_SIGNAL", SD_MESSAGE_CRASH_PROCESS_SIGNAL) JOINER +add_id(m, "SD_MESSAGE_CRASH_SHELL_FORK_FAILED", SD_MESSAGE_CRASH_SHELL_FORK_FAILED) JOINER +add_id(m, "SD_MESSAGE_CRASH_SYSTEMD_SIGNAL", SD_MESSAGE_CRASH_SYSTEMD_SIGNAL) JOINER +add_id(m, "SD_MESSAGE_CRASH_UNKNOWN_SIGNAL", SD_MESSAGE_CRASH_UNKNOWN_SIGNAL) JOINER +add_id(m, "SD_MESSAGE_CRASH_WAITPID_FAILED", SD_MESSAGE_CRASH_WAITPID_FAILED) JOINER +add_id(m, "SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE", SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE) JOINER add_id(m, "SD_MESSAGE_DEVICE_PATH_NOT_SUITABLE", SD_MESSAGE_DEVICE_PATH_NOT_SUITABLE) JOINER add_id(m, "SD_MESSAGE_DNSSEC_DOWNGRADE", SD_MESSAGE_DNSSEC_DOWNGRADE) JOINER add_id(m, "SD_MESSAGE_DNSSEC_FAILURE", SD_MESSAGE_DNSSEC_FAILURE) JOINER add_id(m, "SD_MESSAGE_DNSSEC_TRUST_ANCHOR_REVOKED", SD_MESSAGE_DNSSEC_TRUST_ANCHOR_REVOKED) JOINER add_id(m, "SD_MESSAGE_FACTORY_RESET", SD_MESSAGE_FACTORY_RESET) JOINER add_id(m, "SD_MESSAGE_FORWARD_SYSLOG_MISSED", SD_MESSAGE_FORWARD_SYSLOG_MISSED) JOINER -add_id(m, "SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS", SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS) JOINER add_id(m, "SD_MESSAGE_HIBERNATE_KEY", SD_MESSAGE_HIBERNATE_KEY) JOINER +add_id(m, "SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS", SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS) JOINER add_id(m, "SD_MESSAGE_INVALID_CONFIGURATION", SD_MESSAGE_INVALID_CONFIGURATION) JOINER add_id(m, "SD_MESSAGE_JOURNAL_DROPPED", SD_MESSAGE_JOURNAL_DROPPED) JOINER add_id(m, "SD_MESSAGE_JOURNAL_MISSED", SD_MESSAGE_JOURNAL_MISSED) JOINER @@ -20,35 +47,52 @@ add_id(m, "SD_MESSAGE_LID_CLOSED", SD_MESSAGE_LID_CLOSED) JOINER add_id(m, "SD_MESSAGE_LID_OPENED", SD_MESSAGE_LID_OPENED) JOINER add_id(m, "SD_MESSAGE_MACHINE_START", SD_MESSAGE_MACHINE_START) JOINER add_id(m, "SD_MESSAGE_MACHINE_STOP", SD_MESSAGE_MACHINE_STOP) JOINER +add_id(m, "SD_MESSAGE_MEMORY_TRIM", SD_MESSAGE_MEMORY_TRIM) JOINER add_id(m, "SD_MESSAGE_MOUNT_POINT_PATH_NOT_SUITABLE", SD_MESSAGE_MOUNT_POINT_PATH_NOT_SUITABLE) JOINER add_id(m, "SD_MESSAGE_NOBODY_USER_UNSUITABLE", SD_MESSAGE_NOBODY_USER_UNSUITABLE) JOINER +add_id(m, "SD_MESSAGE_NON_CANONICAL_MOUNT", SD_MESSAGE_NON_CANONICAL_MOUNT) JOINER add_id(m, "SD_MESSAGE_OVERMOUNTING", SD_MESSAGE_OVERMOUNTING) JOINER -add_id(m, "SD_MESSAGE_POWER_KEY_LONG_PRESS", SD_MESSAGE_POWER_KEY_LONG_PRESS) JOINER +add_id(m, "SD_MESSAGE_PORTABLE_ATTACHED", SD_MESSAGE_PORTABLE_ATTACHED) JOINER +add_id(m, "SD_MESSAGE_PORTABLE_DETACHED", SD_MESSAGE_PORTABLE_DETACHED) JOINER add_id(m, "SD_MESSAGE_POWER_KEY", SD_MESSAGE_POWER_KEY) JOINER -add_id(m, "SD_MESSAGE_REBOOT_KEY_LONG_PRESS", SD_MESSAGE_REBOOT_KEY_LONG_PRESS) JOINER +add_id(m, "SD_MESSAGE_POWER_KEY_LONG_PRESS", SD_MESSAGE_POWER_KEY_LONG_PRESS) JOINER add_id(m, "SD_MESSAGE_REBOOT_KEY", SD_MESSAGE_REBOOT_KEY) JOINER +add_id(m, "SD_MESSAGE_REBOOT_KEY_LONG_PRESS", SD_MESSAGE_REBOOT_KEY_LONG_PRESS) JOINER add_id(m, "SD_MESSAGE_SEAT_START", SD_MESSAGE_SEAT_START) JOINER add_id(m, "SD_MESSAGE_SEAT_STOP", SD_MESSAGE_SEAT_STOP) JOINER +add_id(m, "SD_MESSAGE_SECURE_ATTENTION_KEY_PRESS", SD_MESSAGE_SECURE_ATTENTION_KEY_PRESS) JOINER +add_id(m, "SD_MESSAGE_SELINUX_FAILED", SD_MESSAGE_SELINUX_FAILED) JOINER add_id(m, "SD_MESSAGE_SESSION_START", SD_MESSAGE_SESSION_START) JOINER add_id(m, "SD_MESSAGE_SESSION_STOP", SD_MESSAGE_SESSION_STOP) JOINER add_id(m, "SD_MESSAGE_SHUTDOWN", SD_MESSAGE_SHUTDOWN) JOINER +add_id(m, "SD_MESSAGE_SHUTDOWN_CANCELED", SD_MESSAGE_SHUTDOWN_CANCELED) JOINER +add_id(m, "SD_MESSAGE_SHUTDOWN_ERROR", SD_MESSAGE_SHUTDOWN_ERROR) JOINER +add_id(m, "SD_MESSAGE_SHUTDOWN_SCHEDULED", SD_MESSAGE_SHUTDOWN_SCHEDULED) JOINER add_id(m, "SD_MESSAGE_SLEEP_START", SD_MESSAGE_SLEEP_START) JOINER add_id(m, "SD_MESSAGE_SLEEP_STOP", SD_MESSAGE_SLEEP_STOP) JOINER +add_id(m, "SD_MESSAGE_SMACK_FAILED_WRITE", SD_MESSAGE_SMACK_FAILED_WRITE) JOINER add_id(m, "SD_MESSAGE_SPAWN_FAILED", SD_MESSAGE_SPAWN_FAILED) JOINER +add_id(m, "SD_MESSAGE_SRK_ENROLLMENT_NEEDS_AUTHORIZATION", SD_MESSAGE_SRK_ENROLLMENT_NEEDS_AUTHORIZATION) JOINER add_id(m, "SD_MESSAGE_STARTUP_FINISHED", SD_MESSAGE_STARTUP_FINISHED) JOINER -add_id(m, "SD_MESSAGE_SUSPEND_KEY_LONG_PRESS", SD_MESSAGE_SUSPEND_KEY_LONG_PRESS) JOINER add_id(m, "SD_MESSAGE_SUSPEND_KEY", SD_MESSAGE_SUSPEND_KEY) JOINER -add_id(m, "SD_MESSAGE_SYSTEM_DOCKED", SD_MESSAGE_SYSTEM_DOCKED) JOINER +add_id(m, "SD_MESSAGE_SUSPEND_KEY_LONG_PRESS", SD_MESSAGE_SUSPEND_KEY_LONG_PRESS) JOINER +add_id(m, "SD_MESSAGE_SYSCTL_CHANGED", SD_MESSAGE_SYSCTL_CHANGED) JOINER add_id(m, "SD_MESSAGE_SYSTEMD_UDEV_SETTLE_DEPRECATED", SD_MESSAGE_SYSTEMD_UDEV_SETTLE_DEPRECATED) JOINER +add_id(m, "SD_MESSAGE_SYSTEM_DOCKED", SD_MESSAGE_SYSTEM_DOCKED) JOINER add_id(m, "SD_MESSAGE_SYSTEM_UNDOCKED", SD_MESSAGE_SYSTEM_UNDOCKED) JOINER +add_id(m, "SD_MESSAGE_SYSV_GENERATOR_DEPRECATED", SD_MESSAGE_SYSV_GENERATOR_DEPRECATED) JOINER add_id(m, "SD_MESSAGE_TAINTED", SD_MESSAGE_TAINTED) JOINER +add_id(m, "SD_MESSAGE_TIMEZONE_CHANGE", SD_MESSAGE_TIMEZONE_CHANGE) JOINER +add_id(m, "SD_MESSAGE_TIME_BUMP", SD_MESSAGE_TIME_BUMP) JOINER add_id(m, "SD_MESSAGE_TIME_CHANGE", SD_MESSAGE_TIME_CHANGE) JOINER add_id(m, "SD_MESSAGE_TIME_SYNC", SD_MESSAGE_TIME_SYNC) JOINER -add_id(m, "SD_MESSAGE_TIMEZONE_CHANGE", SD_MESSAGE_TIMEZONE_CHANGE) JOINER +add_id(m, "SD_MESSAGE_TPM2_CLEAR_REQUESTED", SD_MESSAGE_TPM2_CLEAR_REQUESTED) JOINER +add_id(m, "SD_MESSAGE_TPM_PCR_EXTEND", SD_MESSAGE_TPM_PCR_EXTEND) JOINER add_id(m, "SD_MESSAGE_TRUNCATED_CORE", SD_MESSAGE_TRUNCATED_CORE) JOINER add_id(m, "SD_MESSAGE_UNIT_FAILED", SD_MESSAGE_UNIT_FAILED) JOINER add_id(m, "SD_MESSAGE_UNIT_FAILURE_RESULT", SD_MESSAGE_UNIT_FAILURE_RESULT) JOINER add_id(m, "SD_MESSAGE_UNIT_OOMD_KILL", SD_MESSAGE_UNIT_OOMD_KILL) JOINER +add_id(m, "SD_MESSAGE_UNIT_ORDERING_CYCLE", SD_MESSAGE_UNIT_ORDERING_CYCLE) JOINER add_id(m, "SD_MESSAGE_UNIT_OUT_OF_MEMORY", SD_MESSAGE_UNIT_OUT_OF_MEMORY) JOINER add_id(m, "SD_MESSAGE_UNIT_PROCESS_EXIT", SD_MESSAGE_UNIT_PROCESS_EXIT) JOINER add_id(m, "SD_MESSAGE_UNIT_RELOADED", SD_MESSAGE_UNIT_RELOADED) JOINER @@ -63,3 +107,7 @@ add_id(m, "SD_MESSAGE_UNIT_STOPPING", SD_MESSAGE_UNIT_STOPPING) JOINER add_id(m, "SD_MESSAGE_UNIT_SUCCESS", SD_MESSAGE_UNIT_SUCCESS) JOINER add_id(m, "SD_MESSAGE_UNSAFE_USER_NAME", SD_MESSAGE_UNSAFE_USER_NAME) JOINER add_id(m, "SD_MESSAGE_USER_STARTUP_FINISHED", SD_MESSAGE_USER_STARTUP_FINISHED) JOINER +add_id(m, "SD_MESSAGE_VALGRIND_HELPER_FORK", SD_MESSAGE_VALGRIND_HELPER_FORK) JOINER +add_id(m, "SD_MESSAGE_WATCHDOG_OPENED", SD_MESSAGE_WATCHDOG_OPENED) JOINER +add_id(m, "SD_MESSAGE_WATCHDOG_OPEN_FAILED", SD_MESSAGE_WATCHDOG_OPEN_FAILED) JOINER +add_id(m, "SD_MESSAGE_WATCHDOG_PING_FAILED", SD_MESSAGE_WATCHDOG_PING_FAILED) JOINER diff --git a/src/systemd/id128-defines.h b/src/systemd/id128-defines.h index 178de83..6764cd1 100644 --- a/src/systemd/id128-defines.h +++ b/src/systemd/id128-defines.h @@ -1,15 +1,42 @@ #define SD_MESSAGE_BACKTRACE SD_ID128_MAKE(1f,4e,0a,44,a8,86,49,93,9a,ae,a3,4f,c6,da,8c,95) +#define SD_MESSAGE_BATTERY_LOW_POWEROFF SD_ID128_MAKE(26,74,37,d3,3f,dd,41,09,9a,d7,62,21,cc,24,a3,35) +#define SD_MESSAGE_BATTERY_LOW_WARNING SD_ID128_MAKE(e6,f4,56,bd,92,00,4d,95,80,16,0b,22,07,55,51,86) #define SD_MESSAGE_BOOTCHART SD_ID128_MAKE(9f,26,aa,56,2c,f4,40,c2,b1,6c,77,3d,04,79,b5,18) +#define SD_MESSAGE_CANT_BREAK_ORDERING_CYCLE SD_ID128_MAKE(b3,11,2d,da,d1,90,45,53,8c,76,68,5b,a5,91,8a,80) #define SD_MESSAGE_CONFIG_ERROR SD_ID128_MAKE(c7,72,d2,4e,9a,88,4c,be,b9,ea,12,62,5c,30,6c,01) #define SD_MESSAGE_COREDUMP SD_ID128_MAKE(fc,2e,22,bc,6e,e6,47,b6,b9,07,29,ab,34,a2,50,b1) +#define SD_MESSAGE_CORE_CAPABILITY_BOUNDING SD_ID128_MAKE(42,69,5b,50,0d,f0,48,29,8b,ee,37,15,9c,aa,9f,2e) +#define SD_MESSAGE_CORE_CAPABILITY_BOUNDING_USER SD_ID128_MAKE(ed,15,8c,2d,f8,88,4f,a5,84,ee,ad,2d,90,2c,10,32) +#define SD_MESSAGE_CORE_DISABLE_PRIVILEGES SD_ID128_MAKE(bf,c2,43,07,24,ab,44,49,97,35,b4,f9,4c,ca,92,95) +#define SD_MESSAGE_CORE_FD_SET_FAILED SD_ID128_MAKE(5e,d8,36,f1,76,6f,4a,8a,9f,c5,da,45,aa,e2,3b,29) +#define SD_MESSAGE_CORE_ISOLATE_TARGET_FAILED SD_ID128_MAKE(68,9b,4f,cc,97,b4,48,6e,a5,da,92,db,69,c9,e3,14) +#define SD_MESSAGE_CORE_MAINLOOP_FAILED SD_ID128_MAKE(79,e0,5b,67,bc,45,45,d1,92,2f,e4,71,07,ee,60,c5) +#define SD_MESSAGE_CORE_MANAGER_ALLOCATE SD_ID128_MAKE(0e,54,47,09,84,ac,41,96,89,74,3d,95,7a,11,9e,2e) +#define SD_MESSAGE_CORE_NO_XDGDIR_PATH SD_ID128_MAKE(db,b1,36,b1,0e,f4,45,7b,a4,7a,79,5d,62,f1,08,c9) +#define SD_MESSAGE_CORE_PID1_ENVIRONMENT SD_ID128_MAKE(6a,40,fb,fb,d2,ba,4b,8d,b0,2f,b4,0c,9c,d0,90,d7) +#define SD_MESSAGE_CORE_START_TARGET_FAILED SD_ID128_MAKE(59,28,8a,f5,23,be,43,a2,8d,49,4e,41,e2,6e,45,10) +#define SD_MESSAGE_CRASH_COREDUMP_FAILED SD_ID128_MAKE(56,b1,cd,96,f2,42,46,c5,b6,07,66,6f,da,95,23,56) +#define SD_MESSAGE_CRASH_COREDUMP_PID SD_ID128_MAKE(4a,c7,56,6d,4d,75,48,f4,98,1f,62,9a,28,f0,f8,29) +#define SD_MESSAGE_CRASH_EXECLE_FAILED SD_ID128_MAKE(87,27,29,b4,7d,be,47,3e,b7,68,cc,ec,d4,77,be,da) +#define SD_MESSAGE_CRASH_EXIT SD_ID128_MAKE(d9,ec,5e,95,e4,b6,46,aa,ae,a2,fd,05,21,4e,db,da) +#define SD_MESSAGE_CRASH_FAILED SD_ID128_MAKE(3e,d0,16,3e,86,8a,44,17,ab,8b,9e,21,04,07,a9,6c) +#define SD_MESSAGE_CRASH_FREEZE SD_ID128_MAKE(64,5c,73,55,37,63,4a,e0,a3,2b,15,a7,c6,cb,a7,d4) +#define SD_MESSAGE_CRASH_NO_COREDUMP SD_ID128_MAKE(5a,dd,b3,a0,6a,73,4d,33,96,b7,94,bf,98,fb,2d,01) +#define SD_MESSAGE_CRASH_NO_FORK SD_ID128_MAKE(5c,9e,98,de,4a,b9,4c,6a,9d,04,d0,ad,79,3b,d9,03) +#define SD_MESSAGE_CRASH_PROCESS_SIGNAL SD_ID128_MAKE(3a,73,a9,8b,af,5b,4b,19,99,29,e3,22,6c,0b,e7,83) +#define SD_MESSAGE_CRASH_SHELL_FORK_FAILED SD_ID128_MAKE(38,e8,b1,e0,39,ad,46,92,91,b1,8b,44,c5,53,a5,b7) +#define SD_MESSAGE_CRASH_SYSTEMD_SIGNAL SD_ID128_MAKE(83,f8,4b,35,ee,26,4f,74,a3,89,6a,97,17,af,34,cb) +#define SD_MESSAGE_CRASH_UNKNOWN_SIGNAL SD_ID128_MAKE(5e,6f,1f,5e,4d,b6,4a,0e,ae,e3,36,82,49,d2,0b,94) +#define SD_MESSAGE_CRASH_WAITPID_FAILED SD_ID128_MAKE(2e,d1,8d,4f,78,ca,47,f0,a9,bc,25,27,1c,26,ad,b4) +#define SD_MESSAGE_DELETING_JOB_BECAUSE_ORDERING_CYCLE SD_ID128_MAKE(50,84,36,75,42,f7,47,2d,bc,6a,94,12,5d,5d,eb,ce) #define SD_MESSAGE_DEVICE_PATH_NOT_SUITABLE SD_ID128_MAKE(01,01,90,13,8f,49,4e,29,a0,ef,66,69,74,95,31,aa) #define SD_MESSAGE_DNSSEC_DOWNGRADE SD_ID128_MAKE(36,db,2d,fa,5a,90,45,e1,bd,4a,f5,f9,3e,1c,f0,57) #define SD_MESSAGE_DNSSEC_FAILURE SD_ID128_MAKE(16,75,d7,f1,72,17,40,98,b1,10,8b,f8,c7,dc,8f,5d) #define SD_MESSAGE_DNSSEC_TRUST_ANCHOR_REVOKED SD_ID128_MAKE(4d,44,08,cf,d0,d1,44,85,91,84,d1,e6,5d,7c,8a,65) #define SD_MESSAGE_FACTORY_RESET SD_ID128_MAKE(c1,4a,af,76,ec,28,4a,5f,a1,f1,05,f8,8d,fb,06,1c) #define SD_MESSAGE_FORWARD_SYSLOG_MISSED SD_ID128_MAKE(00,27,22,9c,a0,64,41,81,a7,6c,4e,92,45,8a,fa,2e) -#define SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS SD_ID128_MAKE(16,78,36,df,6f,7f,42,8e,98,14,72,27,b2,dc,89,45) #define SD_MESSAGE_HIBERNATE_KEY SD_ID128_MAKE(b7,2e,a4,a2,88,15,45,a0,b5,0e,20,0e,55,b9,b0,73) +#define SD_MESSAGE_HIBERNATE_KEY_LONG_PRESS SD_ID128_MAKE(16,78,36,df,6f,7f,42,8e,98,14,72,27,b2,dc,89,45) #define SD_MESSAGE_INVALID_CONFIGURATION SD_ID128_MAKE(c7,72,d2,4e,9a,88,4c,be,b9,ea,12,62,5c,30,6c,01) #define SD_MESSAGE_JOURNAL_DROPPED SD_ID128_MAKE(a5,96,d6,fe,7b,fa,49,94,82,8e,72,30,9e,95,d6,1e) #define SD_MESSAGE_JOURNAL_MISSED SD_ID128_MAKE(e9,bf,28,e6,e8,34,48,1b,b6,f4,8f,54,8a,d1,36,06) @@ -20,35 +47,52 @@ #define SD_MESSAGE_LID_OPENED SD_ID128_MAKE(b7,2e,a4,a2,88,15,45,a0,b5,0e,20,0e,55,b9,b0,6f) #define SD_MESSAGE_MACHINE_START SD_ID128_MAKE(24,d8,d4,45,25,73,40,24,96,06,83,81,a6,31,2d,f2) #define SD_MESSAGE_MACHINE_STOP SD_ID128_MAKE(58,43,2b,d3,ba,ce,47,7c,b5,14,b5,63,81,b8,a7,58) +#define SD_MESSAGE_MEMORY_TRIM SD_ID128_MAKE(f9,b0,be,46,5a,d5,40,d0,85,0a,d3,21,72,d5,7c,21) #define SD_MESSAGE_MOUNT_POINT_PATH_NOT_SUITABLE SD_ID128_MAKE(1b,3b,b9,40,37,f0,4b,bf,81,02,8e,13,5a,12,d2,93) #define SD_MESSAGE_NOBODY_USER_UNSUITABLE SD_ID128_MAKE(b4,80,32,5f,9c,39,4a,7b,80,2c,23,1e,51,a2,75,2c) +#define SD_MESSAGE_NON_CANONICAL_MOUNT SD_ID128_MAKE(1e,da,bb,4e,da,2a,49,c1,9b,c0,20,6f,24,b4,38,89) #define SD_MESSAGE_OVERMOUNTING SD_ID128_MAKE(1d,ee,03,69,c7,fc,47,36,b7,09,9b,38,ec,b4,6e,e7) -#define SD_MESSAGE_POWER_KEY_LONG_PRESS SD_ID128_MAKE(3e,01,17,10,1e,b2,43,c1,b9,a5,0d,b3,49,4a,b1,0b) +#define SD_MESSAGE_PORTABLE_ATTACHED SD_ID128_MAKE(18,7c,62,eb,1e,7f,46,3b,b5,30,39,4f,52,cb,09,0f) +#define SD_MESSAGE_PORTABLE_DETACHED SD_ID128_MAKE(76,c5,c7,54,d6,28,49,0d,8e,cb,a4,c9,d0,42,11,2b) #define SD_MESSAGE_POWER_KEY SD_ID128_MAKE(b7,2e,a4,a2,88,15,45,a0,b5,0e,20,0e,55,b9,b0,71) -#define SD_MESSAGE_REBOOT_KEY_LONG_PRESS SD_ID128_MAKE(f1,c5,9a,58,c9,d9,43,66,89,65,c3,37,ca,ec,59,75) +#define SD_MESSAGE_POWER_KEY_LONG_PRESS SD_ID128_MAKE(3e,01,17,10,1e,b2,43,c1,b9,a5,0d,b3,49,4a,b1,0b) #define SD_MESSAGE_REBOOT_KEY SD_ID128_MAKE(9f,a9,d2,c0,12,13,4e,c3,85,45,1f,fe,31,6f,97,d0) +#define SD_MESSAGE_REBOOT_KEY_LONG_PRESS SD_ID128_MAKE(f1,c5,9a,58,c9,d9,43,66,89,65,c3,37,ca,ec,59,75) #define SD_MESSAGE_SEAT_START SD_ID128_MAKE(fc,be,fc,5d,a2,3d,42,80,93,f9,7c,82,a9,29,0f,7b) #define SD_MESSAGE_SEAT_STOP SD_ID128_MAKE(e7,85,2b,fe,46,78,4e,d0,ac,cd,e0,4b,c8,64,c2,d5) +#define SD_MESSAGE_SECURE_ATTENTION_KEY_PRESS SD_ID128_MAKE(b2,bc,ba,f5,ed,f9,48,e0,93,ce,50,bb,ea,0e,81,ec) +#define SD_MESSAGE_SELINUX_FAILED SD_ID128_MAKE(65,8a,67,ad,c1,c9,40,b3,b3,31,6e,7e,86,28,83,4a) #define SD_MESSAGE_SESSION_START SD_ID128_MAKE(8d,45,62,0c,1a,43,48,db,b1,74,10,da,57,c6,0c,66) #define SD_MESSAGE_SESSION_STOP SD_ID128_MAKE(33,54,93,94,24,b4,45,6d,98,02,ca,83,33,ed,42,4a) #define SD_MESSAGE_SHUTDOWN SD_ID128_MAKE(98,26,88,66,d1,d5,4a,49,9c,4e,98,92,1d,93,bc,40) +#define SD_MESSAGE_SHUTDOWN_CANCELED SD_ID128_MAKE(24,9f,6f,b9,e6,e2,42,8c,96,f3,f0,87,56,81,ff,a3) +#define SD_MESSAGE_SHUTDOWN_ERROR SD_ID128_MAKE(af,55,a6,f7,5b,54,44,31,b7,26,49,f3,6f,f6,d6,2c) +#define SD_MESSAGE_SHUTDOWN_SCHEDULED SD_ID128_MAKE(9e,70,66,27,9d,c8,40,3d,a7,9c,e4,b1,a6,90,64,b2) #define SD_MESSAGE_SLEEP_START SD_ID128_MAKE(6b,bd,95,ee,97,79,41,e4,97,c4,8b,e2,7c,25,41,28) #define SD_MESSAGE_SLEEP_STOP SD_ID128_MAKE(88,11,e6,df,2a,8e,40,f5,8a,94,ce,a2,6f,8e,bf,14) +#define SD_MESSAGE_SMACK_FAILED_WRITE SD_ID128_MAKE(d6,7f,a9,f8,47,aa,4b,04,8a,2a,e3,35,35,33,1a,db) #define SD_MESSAGE_SPAWN_FAILED SD_ID128_MAKE(64,12,57,65,1c,1b,4e,c9,a8,62,4d,7a,40,a9,e1,e7) +#define SD_MESSAGE_SRK_ENROLLMENT_NEEDS_AUTHORIZATION SD_ID128_MAKE(ad,70,89,f9,28,ac,4f,7e,a0,0c,07,45,7d,47,ba,8a) #define SD_MESSAGE_STARTUP_FINISHED SD_ID128_MAKE(b0,7a,24,9c,d0,24,41,4a,82,dd,00,cd,18,13,78,ff) -#define SD_MESSAGE_SUSPEND_KEY_LONG_PRESS SD_ID128_MAKE(bf,da,f6,d3,12,ab,40,07,bc,1f,e4,0a,15,df,78,e8) #define SD_MESSAGE_SUSPEND_KEY SD_ID128_MAKE(b7,2e,a4,a2,88,15,45,a0,b5,0e,20,0e,55,b9,b0,72) -#define SD_MESSAGE_SYSTEM_DOCKED SD_ID128_MAKE(f5,f4,16,b8,62,07,4b,28,92,7a,48,c3,ba,7d,51,ff) +#define SD_MESSAGE_SUSPEND_KEY_LONG_PRESS SD_ID128_MAKE(bf,da,f6,d3,12,ab,40,07,bc,1f,e4,0a,15,df,78,e8) +#define SD_MESSAGE_SYSCTL_CHANGED SD_ID128_MAKE(9c,f5,6b,8b,af,95,46,cf,94,78,78,3a,8d,e4,21,13) #define SD_MESSAGE_SYSTEMD_UDEV_SETTLE_DEPRECATED SD_ID128_MAKE(1c,04,54,c1,bd,22,41,e0,ac,6f,ef,b4,bc,63,14,33) +#define SD_MESSAGE_SYSTEM_DOCKED SD_ID128_MAKE(f5,f4,16,b8,62,07,4b,28,92,7a,48,c3,ba,7d,51,ff) #define SD_MESSAGE_SYSTEM_UNDOCKED SD_ID128_MAKE(51,e1,71,bd,58,52,48,56,81,10,14,4c,51,7c,ca,53) +#define SD_MESSAGE_SYSV_GENERATOR_DEPRECATED SD_ID128_MAKE(a8,fa,8d,ac,db,1d,44,3e,95,03,b8,be,36,7a,6a,db) #define SD_MESSAGE_TAINTED SD_ID128_MAKE(50,87,6a,9d,b0,0f,4c,40,bd,e1,a2,ad,38,1c,3a,1b) +#define SD_MESSAGE_TIMEZONE_CHANGE SD_ID128_MAKE(45,f8,2f,4a,ef,7a,4b,bf,94,2c,e8,61,d1,f2,09,90) +#define SD_MESSAGE_TIME_BUMP SD_ID128_MAKE(7d,b7,3c,8a,f0,d9,4e,eb,82,2a,e0,43,23,fe,6a,b6) #define SD_MESSAGE_TIME_CHANGE SD_ID128_MAKE(c7,a7,87,07,9b,35,4e,aa,a9,e7,7b,37,18,93,cd,27) #define SD_MESSAGE_TIME_SYNC SD_ID128_MAKE(7c,8a,41,f3,7b,76,49,41,a0,e1,78,0b,1b,e2,f0,37) -#define SD_MESSAGE_TIMEZONE_CHANGE SD_ID128_MAKE(45,f8,2f,4a,ef,7a,4b,bf,94,2c,e8,61,d1,f2,09,90) +#define SD_MESSAGE_TPM2_CLEAR_REQUESTED SD_ID128_MAKE(43,81,88,86,1e,0b,42,7a,9d,63,8a,90,48,7a,0c,a6) +#define SD_MESSAGE_TPM_PCR_EXTEND SD_ID128_MAKE(3f,7d,5e,f3,e5,4f,43,02,b4,f0,b1,43,bb,27,0c,ab) #define SD_MESSAGE_TRUNCATED_CORE SD_ID128_MAKE(5a,ad,d8,e9,54,dc,4b,1a,8c,95,4d,63,fd,9e,11,37) #define SD_MESSAGE_UNIT_FAILED SD_ID128_MAKE(be,02,cf,68,55,d2,42,8b,a4,0d,f7,e9,d0,22,f0,3d) #define SD_MESSAGE_UNIT_FAILURE_RESULT SD_ID128_MAKE(d9,b3,73,ed,55,a6,4f,eb,82,42,e0,2d,be,79,a4,9c) #define SD_MESSAGE_UNIT_OOMD_KILL SD_ID128_MAKE(d9,89,61,1b,15,e4,4c,9d,bf,31,e3,c8,12,56,e4,ed) +#define SD_MESSAGE_UNIT_ORDERING_CYCLE SD_ID128_MAKE(f2,7a,3f,94,40,6a,47,83,b9,46,a9,bc,84,9e,94,52) #define SD_MESSAGE_UNIT_OUT_OF_MEMORY SD_ID128_MAKE(fe,6f,aa,94,e7,77,46,63,a0,da,52,71,78,91,d8,ef) #define SD_MESSAGE_UNIT_PROCESS_EXIT SD_ID128_MAKE(98,e3,22,20,3f,7a,4e,d2,90,d0,9f,e0,3c,09,fe,15) #define SD_MESSAGE_UNIT_RELOADED SD_ID128_MAKE(7b,05,eb,c6,68,38,42,22,ba,a8,88,11,79,cf,da,54) @@ -63,3 +107,7 @@ #define SD_MESSAGE_UNIT_SUCCESS SD_ID128_MAKE(7a,d2,d1,89,f7,e9,4e,70,a3,8c,78,13,54,91,24,48) #define SD_MESSAGE_UNSAFE_USER_NAME SD_ID128_MAKE(b6,1f,da,c6,12,e9,4b,91,82,28,5b,99,88,43,06,1f) #define SD_MESSAGE_USER_STARTUP_FINISHED SD_ID128_MAKE(ee,d0,0a,68,ff,d8,4e,31,88,21,05,fd,97,3a,bd,d1) +#define SD_MESSAGE_VALGRIND_HELPER_FORK SD_ID128_MAKE(d1,8e,03,39,ef,b2,4a,06,8d,9c,10,60,22,10,48,c2) +#define SD_MESSAGE_WATCHDOG_OPENED SD_ID128_MAKE(21,66,8d,bd,3d,7a,4a,32,a2,67,6d,53,da,da,b0,22) +#define SD_MESSAGE_WATCHDOG_OPEN_FAILED SD_ID128_MAKE(37,5a,c1,51,ef,9d,4d,e3,90,68,b3,ef,bf,ed,0c,ee) +#define SD_MESSAGE_WATCHDOG_PING_FAILED SD_ID128_MAKE(87,39,78,9e,ca,06,43,25,af,15,a8,ed,0e,cf,c5,56) diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 6a10428..0021420 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -66,3 +66,15 @@ python.install_sources( 'test/test_id128.py', subdir: 'systemd/test', ) + +include_dir = libsystemd_dep.get_variable(pkgconfig: 'includedir') + +update_constants = custom_target( + output: 'update-constants-impl', + command: [ + update_constants_py, + meson.current_source_dir() / 'id128-constants.h', + meson.project_source_root() / 'docs/id128.rst', + meson.current_source_dir() / 'id128-defines.h', + include_dir / 'systemd/sd-messages.h', + ]) diff --git a/update-constants.py b/update-constants.py old mode 100644 new mode 100755 index 3a91290..aff1725 --- a/update-constants.py +++ b/update-constants.py @@ -1,11 +1,51 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: LGPL-2.1-or-later import sys -for file in sys.argv[1:]: +def defines(file): lines = iter(open(file).read().splitlines()) for line in lines: if line.startswith('#define SD_MESSAGE') and '_STR ' not in line: if line.endswith('\\'): line = line[:-1] + next(lines) - print(' '.join(line.split())) + _, name, value = line.split() + assert 'SD_' in name + assert 'SD_ID128_MAKE' in value + yield name, value + + +def process(includefile, docfile, *headers): + # Collects all messages from all headers and saves the sorted list back to + # headers[0]. Writes includefile (C) and docfile (rst). + + # Collect all messages into a single sorted, deduplicated list + defs = sum((list(defines(file)) for file in headers), start=[]) + defs = sorted(set(defs)) + + with open(includefile, 'wt') as out: + print(f'Writing {out.name}…') + for name, value in defs: + print(f'add_id(m, "{name}", {name}) JOINER', file=out) + + with open(headers[0], 'wt') as out: + print(f'Writing {out.name}…') + for name, value in defs: + print(f'#define {name} {value}', file=out) + + old = open(docfile).read().splitlines() + + with open(docfile, 'wt') as out: + print(f'Writing {out.name}…') + for line in old: + print(line, file=out) + if 'autogenerated' in line: + break + for name, value in defs: + print(f' .. autoattribute:: systemd.id128.{name}', file=out) + +if __name__ == '__main__': + includefile = sys.argv[1] + docfile = sys.argv[2] + headers = sys.argv[3:] + process(includefile, docfile, *headers)