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

Merge pull request #29630 from DaanDeMeyer/manager-json

Browse Source 
Various refactoring in preparation for adding JSON dump to pid 1
This commit is contained in:
Daan De Meyer
2023-10-20 16:42:12 +02:00
committed by GitHub
parent f455365031 8eb735b800
commit 26204e1a4a
31 changed files with 606 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/json.c
+77 -6
View File
@@ -21,6 +21,7 @@
#include "math-util.h"
#include "memory-util.h"
#include "memstream-util.h"
#include "set.h"
#include "string-table.h"
#include "string-util.h"
#include "strv.h"
@@ -3350,6 +3351,7 @@ int json_parse_file_at(
int json_buildv(JsonVariant **ret, va_list ap) {
JsonStack *stack = NULL;
size_t n_stack = 1;
const char *name = NULL;
int r;
assert_return(ret, -EINVAL);
@@ -3877,6 +3879,77 @@ int json_buildv(JsonVariant **ret, va_list ap) {
break;
}
case _JSON_BUILD_STRING_SET: {
Set *set;
if (!IN_SET(current->expect, EXPECT_TOPLEVEL, EXPECT_OBJECT_VALUE, EXPECT_ARRAY_ELEMENT)) {
r = -EINVAL;
goto finish;
}
set = va_arg(ap, Set*);
if (current->n_suppress == 0) {
_cleanup_free_ char **sorted = NULL;
r = set_dump_sorted(set, (void ***) &sorted, NULL);
if (r < 0)
goto finish;
r = json_variant_new_array_strv(&add, sorted);
if (r < 0)
goto finish;
}
n_subtract = 1;
if (current->expect == EXPECT_TOPLEVEL)
current->expect = EXPECT_END;
else if (current->expect == EXPECT_OBJECT_VALUE)
current->expect = EXPECT_OBJECT_KEY;
else
assert(current->expect == EXPECT_ARRAY_ELEMENT);
break;
}
case _JSON_BUILD_CALLBACK: {
JsonBuildCallback cb;
void *userdata;
if (!IN_SET(current->expect, EXPECT_TOPLEVEL, EXPECT_OBJECT_VALUE, EXPECT_ARRAY_ELEMENT)) {
r = -EINVAL;
goto finish;
}
cb = va_arg(ap, JsonBuildCallback);
userdata = va_arg(ap, void *);
if (current->n_suppress == 0) {
if (cb) {
r = cb(&add, name, userdata);
if (r < 0)
goto finish;
}
if (!add)
add = JSON_VARIANT_MAGIC_NULL;
name = NULL;
}
n_subtract = 1;
if (current->expect == EXPECT_TOPLEVEL)
current->expect = EXPECT_END;
else if (current->expect == EXPECT_OBJECT_VALUE)
current->expect = EXPECT_OBJECT_KEY;
else
assert(current->expect == EXPECT_ARRAY_ELEMENT);
break;
}
case _JSON_BUILD_OBJECT_BEGIN:
if (!IN_SET(current->expect, EXPECT_TOPLEVEL, EXPECT_OBJECT_VALUE, EXPECT_ARRAY_ELEMENT)) {
@@ -3930,17 +4003,16 @@ int json_buildv(JsonVariant **ret, va_list ap) {
break;
case _JSON_BUILD_PAIR: {
const char *n;
if (current->expect != EXPECT_OBJECT_KEY) {
r = -EINVAL;
goto finish;
}
n = va_arg(ap, const char *);
name = va_arg(ap, const char *);
if (current->n_suppress == 0) {
r = json_variant_new_string(&add, n);
r = json_variant_new_string(&add, name);
if (r < 0)
goto finish;
}
@@ -3952,7 +4024,6 @@ int json_buildv(JsonVariant **ret, va_list ap) {
}
case _JSON_BUILD_PAIR_CONDITION: {
const char *n;
bool b;
if (current->expect != EXPECT_OBJECT_KEY) {
@@ -3961,10 +4032,10 @@ int json_buildv(JsonVariant **ret, va_list ap) {
}
b = va_arg(ap, int);
n = va_arg(ap, const char *);
name = va_arg(ap, const char *);
if (b && current->n_suppress == 0) {
r = json_variant_new_string(&add, n);
r = json_variant_new_string(&add, name);
if (r < 0)
goto finish;
}
src/shared/json.h
+8
View File
@@ -275,6 +275,8 @@ enum {
_JSON_BUILD_UUID,
_JSON_BUILD_BYTE_ARRAY,
_JSON_BUILD_HW_ADDR,
_JSON_BUILD_STRING_SET,
_JSON_BUILD_CALLBACK,
_JSON_BUILD_PAIR_UNSIGNED_NON_ZERO,
_JSON_BUILD_PAIR_FINITE_USEC,
_JSON_BUILD_PAIR_STRING_NON_EMPTY,
@@ -289,6 +291,8 @@ enum {
_JSON_BUILD_MAX,
};
typedef int (*JsonBuildCallback)(JsonVariant **ret, const char *name, void *userdata);
#define JSON_BUILD_STRING(s) _JSON_BUILD_STRING, (const char*) { s }
#define JSON_BUILD_INTEGER(i) _JSON_BUILD_INTEGER, (int64_t) { i }
#define JSON_BUILD_UNSIGNED(u) _JSON_BUILD_UNSIGNED, (uint64_t) { u }
@@ -319,6 +323,8 @@ enum {
#define JSON_BUILD_IN_ADDR(v, f) JSON_BUILD_BYTE_ARRAY(((const union in_addr_union*) { v })->bytes, FAMILY_ADDRESS_SIZE_SAFE(f))
#define JSON_BUILD_ETHER_ADDR(v) JSON_BUILD_BYTE_ARRAY(((const struct ether_addr*) { v })->ether_addr_octet, sizeof(struct ether_addr))
#define JSON_BUILD_HW_ADDR(v) _JSON_BUILD_HW_ADDR, (const struct hw_addr_data*) { v }
#define JSON_BUILD_STRING_SET(s) _JSON_BUILD_STRING_SET, (Set *) { s }
#define JSON_BUILD_CALLBACK(c, u) _JSON_BUILD_CALLBACK, (JsonBuildCallback) { c }, (void*) { u }
#define JSON_BUILD_PAIR_STRING(name, s) JSON_BUILD_PAIR(name, JSON_BUILD_STRING(s))
#define JSON_BUILD_PAIR_INTEGER(name, i) JSON_BUILD_PAIR(name, JSON_BUILD_INTEGER(i))
@@ -344,6 +350,8 @@ enum {
#define JSON_BUILD_PAIR_IN_ADDR(name, v, f) JSON_BUILD_PAIR(name, JSON_BUILD_IN_ADDR(v, f))
#define JSON_BUILD_PAIR_ETHER_ADDR(name, v) JSON_BUILD_PAIR(name, JSON_BUILD_ETHER_ADDR(v))
#define JSON_BUILD_PAIR_HW_ADDR(name, v) JSON_BUILD_PAIR(name, JSON_BUILD_HW_ADDR(v))
#define JSON_BUILD_PAIR_STRING_SET(name, s) JSON_BUILD_PAIR(name, JSON_BUILD_STRING_SET(s))
#define JSON_BUILD_PAIR_CALLBACK(name, c, u) JSON_BUILD_PAIR(name, JSON_BUILD_CALLBACK(c, u))
#define JSON_BUILD_PAIR_UNSIGNED_NON_ZERO(name, u) _JSON_BUILD_PAIR_UNSIGNED_NON_ZERO, (const char*) { name }, (uint64_t) { u }
#define JSON_BUILD_PAIR_FINITE_USEC(name, u) _JSON_BUILD_PAIR_FINITE_USEC, (const char*) { name }, (usec_t) { u }