🧵 zb: Use async versions of UnixStream when possible by germaniuss · Pull Request #1798 · z-galaxy/zbus

germaniuss · 2026-05-22T11:24:53Z

When connecting to a UnixSocket a blocking/threaded API is being used. This commit changes this to use tokio::net::UnixStream and Async<std::os::unix::net::UnixStream> when possible, preventing the use of extra threads. The windows version continues using the blocking/threaded API.

The connect_addr API is dropped since neither tokio nor async-io supports it. Instead, we use the connect functions in both environments, since they allow for abstract names when the path is prepended with '\0'.

Move the connection code to unix.rs for better future maintainability.

Closes #1796

germaniuss · 2026-05-22T11:35:32Z

@zeenix Can't check if windows functions correctly since I don't have it installed atm but I think everything should work fine. If you can give it a look and tell me if anything is not right. I've also moved the connect code to unix.rs since that is what is being done with Tcp and Unixexec and seemed easier to maintain than a lot of code in mod.rs.

codspeed-hq · 2026-05-22T13:12:48Z

Merging this PR will not alter performance

✅ 22 untouched benchmarks

_{Comparing germaniuss:main (0c38b23) with main (7e074ed)}

germaniuss · 2026-05-23T20:23:09Z

@zeenix So, can this be merged? I've been using the fork on my PC for a personal project and all seems to work fine. There was an issue with windows but it should be solved now.

zeenix · 2026-05-24T13:37:44Z

@zeenix So, can this be merged?

I was on a work trip this week so didn't get to review but in any case, please be patient.

I've been using the fork on my PC for a personal project and all seems to work fine.

Great to hear.

There was an issue with windows but it should be solved now.

Cool. I'll check. @elmarco could you please look at this from Windows' perspective?

zeenix · 2026-05-24T13:38:41Z

@zeenix So, can this be merged?

Multiple CI failures here, so this will need more work for sure. :)

germaniuss · 2026-05-24T13:40:06Z

I was on a work trip this week so didn't get to review but in any case, please be patient.

Sure thing!

Multiple CI failures here, so this will need more work for sure. :)

Yeah, I'll check again to see what's wrong here.

germaniuss · 2026-05-24T13:49:47Z

@zeenix The CI issues should be fixed now.

zeenix

Apart from these, please also choose a more appropriate emoji. ♻️ is for refactoring and that's not a good catagorization of the change.

germaniuss · 2026-05-24T15:30:53Z

Addressed all of the comments. Not really sure what emoji I should use for the main commit though 🤔. Maybe ⚡️? Though I'm not sure since there is not a clear performance improvement.

zeenix · 2026-05-24T15:55:08Z

Addressed all of the comments.

Thanks. I unresolved one though. I'm sorry to ask you to do more but I did describe the reason for the changes I'm asking for.

Not really sure what emoji I should use for the main commit though 🤔. Maybe ⚡️? Though I'm not sure since there is not a clear performance improvement.

I think it's more appropriate than ♻️ still and I think there is a tiny performance improvement from not launching threads. Having said that 🧵is probably the best here.

zeenix · 2026-05-24T15:55:51Z

Addressed all of the comments.

Thanks. I unresolved one though.

Oh and the windows CI continues to be failing.

germaniuss · 2026-05-24T16:33:38Z

Switched out the order of the commits. Going to find a windows PC to test out why its failing.

germaniuss · 2026-05-24T19:37:40Z

@zeenix Not really sure if I like how that second commit turned out, but everything should be done now. Windows turned out to be more of a pain than I imagined.

zeenix · 2026-05-25T17:08:10Z

@zeenix Not really sure if I like how that second commit turned out, but everything should be done now. Windows turned out to be more of a pain than I imagined.

Ouch, sorry! I actually was considering to drop the Windows support as I also don't have a machine to test it on but some people do use zbus on Windows. 🤷

Move UnixSocket connection code to unix.rs from mod.rs for better readability and maintainability.

zeenix

Great work! I appreciate your patience and perseverance. 👍 I'm pretty sure the next iteration can be merged.

zeenix · 2026-05-26T17:37:14Z

    }

    #[cfg(any(unix, not(feature = "tokio")))]
-    async fn get_stream(self) -> Result<UnixStream> {


I don't think we need this change to be so intrusive and remove functions just added in the previous commit. Why not just simplify this method instead?

I've readded the function and made it windows specific since from a maintainability point of view it seems the best for the eventual windows specific code removal.

seems the best for the eventual windows specific code removal.

And to be fair, the UDS on windows support for Rust does seem to be going along quite well so maybe it's not so far off after all :D

When connecting to a UnixSocket a blocking/threaded API is being used. This commit changes this to use `tokio::net::UnixStream` and `Async<std::os::unix::net::UnixStream>` when possible preventing the use of extra threads. The windows version continues using the blocking/threaded API. The `UnixStream::connect_addr` function from `SocketAddrExt` is no longer used since neither tokio nor async-io supports it. Instead, we use the plain `connect` functions in both environments, since they allow for abstract names when the path is prepended with '\0' (a null byte).

germaniuss · 2026-05-26T20:02:35Z

Great work! I appreciate your patience and perseverance. 👍 I'm pretty sure the next iteration can be merged.

Great to hear! I rather appreciate the strict guidelines and expectation of code quality. That what makes open source have some of the best software out there!

zeenix · 2026-05-27T11:25:14Z

-        // This is a `path` in case of Windows until uds_windows provides the needed API:
-        // https://github.com/haraldh/rust_uds_windows/issues/14
+    #[cfg(any(unix, not(feature = "tokio")))]
+    fn take_addr(self) -> Result<PathBuf> {


you're renaming a method in the last commit that you created in the previous one and the commit still seems more intrusive than it should be IMO. This commit should mostly just be replacing spawn_blocking use for unix in get_stream (which should exist for both configs) so the caller is simply abstracted from creation of stream and this commit becomes simpler and very much to the point.

zeenix · 2026-07-09T23:18:01Z

Great work! I appreciate your patience and perseverance. 👍 I'm pretty sure the next iteration can be merged.

Great to hear! I rather appreciate the strict guidelines and expectation of code quality. That what makes open source have some of the best software out there!

Well?

zeenix · 2026-08-20T20:10:07Z

Ping? You were so close.

germaniuss force-pushed the main branch 2 times, most recently from 9ef832c to 318bda4 Compare May 22, 2026 11:30

germaniuss changed the title ~~zb: Use async versions of UnixStream when possible~~ ♻️ zb: Use async versions of UnixStream when possible May 22, 2026

germaniuss force-pushed the main branch 2 times, most recently from 2e24e0e to 4b8e92e Compare May 22, 2026 14:53

germaniuss force-pushed the main branch from 4b8e92e to dc5953b Compare May 24, 2026 13:48

zeenix requested changes May 24, 2026

View reviewed changes

germaniuss force-pushed the main branch from dc5953b to d603542 Compare May 24, 2026 15:14

germaniuss force-pushed the main branch from d603542 to d077422 Compare May 24, 2026 16:31

✏️ zb: Correct grammar in code comment

8128bb3

germaniuss force-pushed the main branch from d077422 to fd47715 Compare May 24, 2026 19:32

germaniuss changed the title ~~♻️ zb: Use async versions of UnixStream when possible~~ 🧵 zb: Use async versions of UnixStream when possible May 24, 2026

germaniuss force-pushed the main branch 5 times, most recently from 7b21f3a to dd22bde Compare May 24, 2026 21:23

zeenix requested changes May 25, 2026

View reviewed changes

germaniuss force-pushed the main branch from dd22bde to 14d7850 Compare May 25, 2026 18:50

♻️ zb: Move UnixSocket connection code to unix.rs

b3f0a61

Move UnixSocket connection code to unix.rs from mod.rs for better readability and maintainability.

germaniuss force-pushed the main branch from 14d7850 to 9f7d4e7 Compare May 25, 2026 18:51

zeenix reviewed May 26, 2026

View reviewed changes

zeenix requested changes May 26, 2026

View reviewed changes

germaniuss force-pushed the main branch from 9f7d4e7 to 0c38b23 Compare May 26, 2026 19:57

zeenix reviewed May 27, 2026

View reviewed changes

Uh oh!

Uh oh!

Conversation

germaniuss commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

germaniuss commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codspeed-hq Bot commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging this PR will not alter performance

Uh oh!

germaniuss commented May 23, 2026

Uh oh!

zeenix commented May 24, 2026

Uh oh!

zeenix commented May 24, 2026

Uh oh!

germaniuss commented May 24, 2026

Uh oh!

germaniuss commented May 24, 2026

Uh oh!

zeenix left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

germaniuss commented May 24, 2026

Uh oh!

zeenix commented May 24, 2026

Uh oh!

zeenix commented May 24, 2026

Uh oh!

germaniuss commented May 24, 2026

Uh oh!

germaniuss commented May 24, 2026

Uh oh!

zeenix commented May 25, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zeenix left a comment

Choose a reason for hiding this comment

Uh oh!

zeenix May 26, 2026

Choose a reason for hiding this comment

Uh oh!

germaniuss May 26, 2026

Choose a reason for hiding this comment

Uh oh!

germaniuss May 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

germaniuss commented May 26, 2026

Uh oh!

zeenix May 27, 2026

Choose a reason for hiding this comment

Uh oh!

zeenix commented Jul 9, 2026

Uh oh!

zeenix commented Aug 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

germaniuss commented May 22, 2026 •

edited

Loading

germaniuss commented May 22, 2026 •

edited

Loading

codspeed-hq Bot commented May 22, 2026 •

edited

Loading