WIP: run against dbus-broker bench #23
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@elmarco the config changes are super desirable even w/o dbus-broker tests in mind. Do you think you can clean this up soon? |
zeenix
reviewed
Jun 29, 2023
src/bin/busd.rs
Outdated
Comment on lines
81
to
89
| let address = config | ||
| .elements | ||
| .iter() | ||
| .rev() | ||
| .find_map(|e| match e { | ||
| config::Element::Listen(l) => Some(l), | ||
| _ => None, | ||
| }) | ||
| .unwrap(); |
There was a problem hiding this comment.
I think BusConfig should provide specific API for each element so user doesn't have to deal with generic elements. It's exposing the detail that config is xml-based IMO.
There was a problem hiding this comment.
Also bus module should be handling all this work. The main should remain as thin as possible.
The bus config parsing requires XML.
The tests are from dbus reference implementation. The schema/dtd is a based on a mix of what is accepted by dbus and dbus-broker. Some tests are left with FIXME, as they may not fit in the config parser itself, but rather in the runtime handling of options. dbus has extra tests which may require installation to run (*.conf.in).
As we need require=false on the following patch.
Atm, we simply handle the last <listen> address!
elmarco
force-pushed
the
dbus-broker-bench
branch
from
f85e204 to
81d493d
Compare
|
@jokeyrhyme I have lost interest to help with this, I do not understand @zeenix project management. |
|
Oh, no worries, I can pick this up, hopefully this weekend 🤞 |
41 tasks
jokeyrhyme
added a commit
to jokeyrhyme/busd
that referenced
this pull request
Nov 9, 2024
The list of elements idea was inspired by work performed by @elmarco over in dbus2#23 , which brings a lot of benefits that I was trying to provide using explicit low-level readers and writers of XML events: namely that we have access to element sequence (important for "last `<type>` wins" and the correct interpolation of `<include>`). serde offers a [try_from](https://serde.rs/container-attrs.html#try_from) attribute that allows us to abstract this away from the consumer.
jokeyrhyme
added a commit
to jokeyrhyme/busd
that referenced
this pull request
Nov 19, 2024
The list of elements idea was inspired by work performed by @elmarco over in dbus2#23 , which brings a lot of benefits that I was trying to provide using explicit low-level readers and writers of XML events: namely that we have access to element sequence (important for "last `<type>` wins" and the correct interpolation of `<include>`). serde offers a [try_from](https://serde.rs/container-attrs.html#try_from) attribute that allows us to abstract this away from the consumer.
jokeyrhyme
added a commit
to jokeyrhyme/busd
that referenced
this pull request
Nov 19, 2024
The list of elements idea was inspired by work performed by @elmarco over in dbus2#23 , which brings a lot of benefits that I was trying to provide using explicit low-level readers and writers of XML events: namely that we have access to element sequence (important for "last `<type>` wins" and the correct interpolation of `<include>`). serde offers a [try_from](https://serde.rs/container-attrs.html#try_from) attribute that allows us to abstract this away from the consumer.
jokeyrhyme
added a commit
to jokeyrhyme/busd
that referenced
this pull request
Nov 27, 2024
The list of elements idea was inspired by work performed by @elmarco over in dbus2#23 , which brings a lot of benefits that I was trying to provide using explicit low-level readers and writers of XML events: namely that we have access to element sequence (important for "last `<type>` wins" and the correct interpolation of `<include>`). serde offers a [try_from](https://serde.rs/container-attrs.html#try_from) attribute that allows us to abstract this away from the consumer.
zeenix
pushed a commit
to jokeyrhyme/busd
that referenced
this pull request
Nov 27, 2024
The list of elements idea was inspired by work performed by @elmarco over in dbus2#23 , which brings a lot of benefits that I was trying to provide using explicit low-level readers and writers of XML events: namely that we have access to element sequence (important for "last `<type>` wins" and the correct interpolation of `<include>`). serde offers a [try_from](https://serde.rs/container-attrs.html#try_from) attribute that allows us to abstract this away from the consumer.
jokeyrhyme
added a commit
to jokeyrhyme/busd
that referenced
this pull request
Dec 9, 2024
We can deserialize an XML file using the "serde" and "quick-xml" crates. Creating a struct type with nested structs within is a direct approach that works well with `#[derive(Deserialize)]`. However, the result isn't optimal for consumption, and also makes it very difficult to implement aspects of the business logic that are sensitive to the order of certain XML elements, e.g. `<bus>`, `<include>`, etc. So our approach is to first deserialize into a `Vec<Element>` (inspired by @elmarco 's work over in dbus2#23 ). Importantly, by starting with this intermediate representation, we can preserve the XML author's intention regarding the order of elements. Then we replace any `<include>` and `<includedir>` elements with the parsed contents the XML files to which they refer, further replacing any `<include>` and `<includedir>` elements within those. Finally, we can make one final iteration over the `Vec<Element>` to produce the final optimally-structured `Config`. Fixes dbus2#78
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This series allows to run busd against dbus-broker benchmark, with:
The most important change is the introduction of
<busconfig>parsing, and then handling of a few command line options.The test currently hangs after what looks like an initial successful connection. Further investigation needed.
/!\ This branch needs dbus2/zbus#390