SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json-util: add json_dispatch_dual_timestamp()

Browse Source
This commit is contained in:
Luca Boccassi
2026-06-30 09:53:28 +01:00
parent 7eed8858d7
commit 00b295aca9
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-json/json-util.c
+25
View File
@@ -23,6 +23,7 @@
#include "string-util.h"
#include "strv.h"
#include "syslog-util.h"
#include "time-util.h"
#include "unit-name.h"
#include "user-util.h"
@@ -303,6 +304,30 @@ int json_dispatch_in_addr_data(const char *name, sd_json_variant *variant, sd_js
return 0;
}
int json_dispatch_dual_timestamp(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
dual_timestamp *ts = ASSERT_PTR(userdata);
/* The inverse of JSON_BUILD_DUAL_TIMESTAMP(): decodes a { "realtime": …, "monotonic": … } object
* into a dual_timestamp. */
if (sd_json_variant_is_null(variant)) {
*ts = DUAL_TIMESTAMP_NULL;
return 0;
}
if (!sd_json_variant_is_object(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL),
"JSON field '%s' is not an object.", strna(name));
static const sd_json_dispatch_field table[] = {
{ "realtime", _SD_JSON_VARIANT_TYPE_INVALID, sd_json_dispatch_uint64, voffsetof(*ts, realtime), 0 },
{ "monotonic", _SD_JSON_VARIANT_TYPE_INVALID, sd_json_dispatch_uint64, voffsetof(*ts, monotonic), 0 },
{}
};
return sd_json_dispatch(variant, table, flags, ts);
}
int json_dispatch_const_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
const char **p = ASSERT_PTR(userdata), *path;
src/libsystemd/sd-json/json-util.h
+1
View File
@@ -120,6 +120,7 @@ int json_dispatch_const_unit_name(const char *name, sd_json_variant *variant, sd
int json_dispatch_in_addr(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_in6_addr(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_in_addr_data(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_dual_timestamp(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_const_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_strv_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);