Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(#2066325) bus: Use OrderedSet for introspection #76

Merged
merged 1 commit into from
Mar 25, 2022
Merged

(#2066325) bus: Use OrderedSet for introspection #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libsystemd/sd-bus/bus-introspect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ static int set_interface_name(struct introspect *intro, const char *interface_na
return free_and_strdup(&intro->interface_name, interface_name);
}

int introspect_write_child_nodes(struct introspect *i, Set *s, const char *prefix) {
int introspect_write_child_nodes(struct introspect *i, OrderedSet *s, const char *prefix) {
char *node;

assert(i);
assert(prefix);

assert_se(set_interface_name(i, NULL) >= 0);

while ((node = set_steal_first(s))) {
while ((node = ordered_set_steal_first(s))) {
const char *e;

e = object_path_startswith(node, prefix);
Expand Down
4 changes: 2 additions & 2 deletions src/libsystemd/sd-bus/bus-introspect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "sd-bus.h"

#include "set.h"
#include "ordered-set.h"

struct introspect {
FILE *f;
Expand All @@ -17,7 +17,7 @@ struct introspect {

int introspect_begin(struct introspect *i, bool trusted);
int introspect_write_default_interfaces(struct introspect *i, bool object_manager);
int introspect_write_child_nodes(struct introspect *i, Set *s, const char *prefix);
int introspect_write_child_nodes(struct introspect *i, OrderedSet *s, const char *prefix);
int introspect_write_interface(
struct introspect *i,
const char *interface_name,
Expand Down
45 changes: 22 additions & 23 deletions src/libsystemd/sd-bus/bus-objects.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "bus-slot.h"
#include "bus-type.h"
#include "missing_capability.h"
#include "set.h"
#include "string-util.h"
#include "strv.h"

Expand Down Expand Up @@ -99,7 +98,7 @@ static int add_enumerated_to_set(
sd_bus *bus,
const char *prefix,
struct node_enumerator *first,
Set *s,
OrderedSet *s,
sd_bus_error *error) {

struct node_enumerator *c;
Expand Down Expand Up @@ -146,7 +145,7 @@ static int add_enumerated_to_set(
continue;
}

r = set_consume(s, *k);
r = ordered_set_consume(s, *k);
if (r == -EEXIST)
r = 0;
}
Expand All @@ -171,7 +170,7 @@ static int add_subtree_to_set(
const char *prefix,
struct node *n,
unsigned flags,
Set *s,
OrderedSet *s,
sd_bus_error *error) {

struct node *i;
Expand All @@ -198,7 +197,7 @@ static int add_subtree_to_set(
if (!t)
return -ENOMEM;

r = set_consume(s, t);
r = ordered_set_consume(s, t);
if (r < 0 && r != -EEXIST)
return r;

Expand All @@ -220,24 +219,24 @@ static int get_child_nodes(
const char *prefix,
struct node *n,
unsigned flags,
Set **_s,
OrderedSet **_s,
sd_bus_error *error) {

Set *s = NULL;
OrderedSet *s = NULL;
int r;

assert(bus);
assert(prefix);
assert(n);
assert(_s);

s = set_new(&string_hash_ops);
s = ordered_set_new(&string_hash_ops);
if (!s)
return -ENOMEM;

r = add_subtree_to_set(bus, prefix, n, flags, s, error);
if (r < 0) {
set_free_free(s);
ordered_set_free_free(s);
return r;
}

Expand Down Expand Up @@ -937,7 +936,7 @@ int introspect_path(
char **ret,
sd_bus_error *error) {

_cleanup_set_free_free_ Set *s = NULL;
_cleanup_ordered_set_free_ OrderedSet *s = NULL;
_cleanup_(introspect_free) struct introspect intro = {};
struct node_vtable *c;
bool empty;
Expand All @@ -963,7 +962,7 @@ int introspect_path(
if (r < 0)
return r;

empty = set_isempty(s);
empty = ordered_set_isempty(s);

LIST_FOREACH(vtables, c, n->vtables) {
if (require_fallback && !c->is_fallback)
Expand Down Expand Up @@ -1233,7 +1232,7 @@ static int process_get_managed_objects(

_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_set_free_free_ Set *s = NULL;
_cleanup_ordered_set_free_free_ OrderedSet *s = NULL;
char *path;
int r;

Expand Down Expand Up @@ -1263,7 +1262,7 @@ static int process_get_managed_objects(
if (r < 0)
return r;

SET_FOREACH(path, s) {
ORDERED_SET_FOREACH(path, s) {
r = object_manager_serialize_path_and_fallbacks(bus, reply, path, &error);
if (r < 0)
return bus_maybe_reply_error(m, r, &error);
Expand Down Expand Up @@ -2352,7 +2351,7 @@ _public_ int sd_bus_emit_properties_changed(
static int object_added_append_all_prefix(
sd_bus *bus,
sd_bus_message *m,
Set *s,
OrderedSet *s,
const char *prefix,
const char *path,
bool require_fallback) {
Expand Down Expand Up @@ -2392,10 +2391,10 @@ static int object_added_append_all_prefix(
* skip it on any of its parents. The child vtables
* always fully override any conflicting vtables of
* any parent node. */
if (set_get(s, c->interface))
if (ordered_set_get(s, c->interface))
continue;

r = set_put(s, c->interface);
r = ordered_set_put(s, c->interface);
if (r < 0)
return r;

Expand Down Expand Up @@ -2441,7 +2440,7 @@ static int object_added_append_all_prefix(
}

static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
_cleanup_set_free_ Set *s = NULL;
_cleanup_ordered_set_free_ OrderedSet *s = NULL;
_cleanup_free_ char *prefix = NULL;
size_t pl;
int r;
Expand All @@ -2465,7 +2464,7 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p
* a parent that were overwritten by a child.
*/

s = set_new(&string_hash_ops);
s = ordered_set_new(&string_hash_ops);
if (!s)
return -ENOMEM;

Expand Down Expand Up @@ -2572,7 +2571,7 @@ _public_ int sd_bus_emit_object_added(sd_bus *bus, const char *path) {
static int object_removed_append_all_prefix(
sd_bus *bus,
sd_bus_message *m,
Set *s,
OrderedSet *s,
const char *prefix,
const char *path,
bool require_fallback) {
Expand Down Expand Up @@ -2605,7 +2604,7 @@ static int object_removed_append_all_prefix(
* skip it on any of its parents. The child vtables
* always fully override any conflicting vtables of
* any parent node. */
if (set_get(s, c->interface))
if (ordered_set_get(s, c->interface))
continue;

r = node_vtable_get_userdata(bus, path, c, &u, &error);
Expand All @@ -2616,7 +2615,7 @@ static int object_removed_append_all_prefix(
if (r == 0)
continue;

r = set_put(s, c->interface);
r = ordered_set_put(s, c->interface);
if (r < 0)
return r;

Expand All @@ -2631,7 +2630,7 @@ static int object_removed_append_all_prefix(
}

static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
_cleanup_set_free_ Set *s = NULL;
_cleanup_ordered_set_free_ OrderedSet *s = NULL;
_cleanup_free_ char *prefix = NULL;
size_t pl;
int r;
Expand All @@ -2642,7 +2641,7 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char

/* see sd_bus_emit_object_added() for details */

s = set_new(&string_hash_ops);
s = ordered_set_new(&string_hash_ops);
if (!s)
return -ENOMEM;

Expand Down
4 changes: 2 additions & 2 deletions src/shared/bus-object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ int bus_introspect_implementations(
if (impl != main_impl)
bus_introspect_implementation(&intro, impl);

_cleanup_set_free_ Set *nodes = NULL;
_cleanup_ordered_set_free_ OrderedSet *nodes = NULL;

for (size_t i = 0; impl->children && impl->children[i]; i++) {
r = set_put_strdup(&nodes, impl->children[i]->path);
r = ordered_set_put_strdup(&nodes, impl->children[i]->path);
if (r < 0)
return log_oom();
}
Expand Down