std::future preview #849

bluejekyll · 2019-08-15T23:51:23Z

I was hoping this could be done without pulling a dependency on async/await, but no such luck. There are some complex areas that make this painful.

gfreezy · 2019-08-26T15:12:48Z

What's the progress of this PR? I want to do some help.

bluejekyll · 2019-09-22T22:58:40Z

FYI: Current progress. the base proto, client, and resolver crates are all fully passing tests with default features.

Now working on server, *tls, and the integration test crates. No interfaces have been updated yet to be async/await friendly, but getting there.

baloo · 2019-10-07T22:32:29Z

There is a weird file named "1" added by 6602c68, looks like an error.

bluejekyll · 2019-10-07T22:53:33Z

Oh, huh. I wonder how that happened. Thanks for the heads up.

bluejekyll · 2019-10-07T23:24:11Z

FYI, for an update on the progress of this. All crates are compiling with default features, and integration tests are all passing, except for one. There is a test that was reliant on task local storage for tracking the depth of CNAME chain lookups in the resolver. I'm working to rewrite that logic such that we can still make sure we don't follow CNAME chains beyond a reasonable level.

bluejekyll · 2019-10-09T06:46:12Z

Ok, all default features are now compiling, all tests passing. Max Query depth for CNAME chains is enforced again. This is getting close for a review.

bluejekyll · 2019-10-13T20:04:35Z

FYI, just push a rebase onto master. So any forks should be aware. I'm going to go through and review all of this change, I there are quite a few FIXMEs I sprinkled throughout, need to clean that up.

crates/proto/src/udp/udp_stream.rs

crates/proto/src/xfer/dns_multiplexer.rs

crates/https/src/https_client_stream.rs

crates/native-tls/src/tls_stream.rs

crates/proto/src/udp/udp_client_stream.rs

crates/resolver/src/system_conf/unix.rs

bluejekyll · 2019-10-15T04:44:22Z

crates/server/src/authority/catalog.rs

-            HandleRequest::Result(Ok(_)) => Ok(Async::Ready(())),
-            HandleRequest::Result(Err(res)) => {
+    // TODO: return ()
+    type Output = Result<(), ()>;


Convert to ()

bluejekyll · 2019-10-15T04:44:55Z

crates/server/src/authority/catalog.rs

-    type Item = ();
-    type Error = ();
+impl<R: ResponseHandler + Unpin> Future for LookupFuture<R> {
+    // TODO: return ()


convert to ()

proto types all updated all types updated to new tokio and futures tcp_stream compiling wip: most types updated tcp stream updated to std::future proto crate compiling, need to fix some udp apis proto compiling and all tests passing mdns and secure socket handle compiling

all types compiling cleanup some usage of the pins all default feature tests passing for resolver!

server and tests compiling, wip: need tests to pass fix server runtime, all default-features passing

https_client_stream compiling https passing all tests

all tests passing but chained

wip: review cleanup clean up for merge

crates/proto/src/xfer/dns_multiplexer.rs

bluejekyll · 2019-10-17T02:29:09Z

Ok. I believe this is ready to go. I’ll be merging in then will publish the first preview! We’ll want to adjust some of the APIss I’m sure.

zonyitoo · 2019-10-17T03:38:36Z

Still cannot pass travis' tests.

bluejekyll · 2019-10-17T14:21:12Z

Yes. I think those are my last cleanup changes. They were passing just before this.

baloo · 2019-10-18T05:04:04Z

@bluejekyll congrats! and thanks for your work.

bluejekyll · 2019-10-18T06:18:39Z

Thanks, I'm just happy all the Futures work stabilized, so there shouldn't be a need to do a massive upgrade like this again. That was a slog.

bluejekyll changed the title ~~Std future preview~~ (WIP) std::future preview Aug 15, 2019

bluejekyll force-pushed the std-future-preview branch from 884a4ad to f708035 Compare August 16, 2019 00:06

bluejekyll mentioned this pull request Aug 18, 2019

Refactor with new futures APIs (async/await) #850

Closed

zonyitoo mentioned this pull request Aug 24, 2019

是否有计划迁移到 async/await ？ shadowsocks/shadowsocks-rust#164

Closed

zonyitoo mentioned this pull request Aug 31, 2019

Migrate to std::future, async/await shadowsocks/shadowsocks-rust#165

Merged

12 tasks

bluejekyll mentioned this pull request Oct 11, 2019

Support TSIG for authenticated dynamic DNS updates #14

Closed

rotty mentioned this pull request Oct 11, 2019

The error types should implement std::error::Error #880

Closed

bluejekyll force-pushed the std-future-preview branch from 9ceb235 to c1734e5 Compare October 13, 2019 19:37

bluejekyll force-pushed the std-future-preview branch from d3935ff to 2dfebd5 Compare October 13, 2019 20:17

bluejekyll commented Oct 15, 2019

View reviewed changes

bluejekyll force-pushed the std-future-preview branch from 4d94c4e to 4d9fc79 Compare October 15, 2019 06:11

bluejekyll added 12 commits October 14, 2019 23:29

update resolver to new std::future

a4e69d7

all types compiling cleanup some usage of the pins all default feature tests passing for resolver!

update client to new std::future

e041b1a

update native-tls to new std::future

9dbc320

update server to new std::future

5c43669

server and tests compiling, wip: need tests to pass fix server runtime, all default-features passing

udpate rustls to new std::future

6e907f1

udpate openssl to new std::future

c873e6a

update https to new std::future

91b12d8

https_client_stream compiling https passing all tests

update all crates for tls features with std::future

1f25dc7

update integration tests to new std::future

1c5d3a4

all tests passing but chained

cleanup std::sync::Mutex uses change to futures::lock

fb239c5

rewritten lookup_state in resolver, max_depth working in std::future

296273c

bluejekyll added 9 commits October 14, 2019 23:34

fix Handle reference in mDNS

bc6f0f8

all-features now compiling and passing tests

a96dff7

switch travis to rust beta until async/await release

ee7a937

update all crate versions to the same 0.18

1124365

change client crate name to trust-dns-client

9cb51cd

fix openssl integration for std::future

0724dff

reformat all code

1283c94

merge CHANGELOGS from top-level and Resolver

ab1cf20

cleanup invalid FIXMEs and prepare for std::future to master

c956e10

wip: review cleanup clean up for merge

bluejekyll force-pushed the std-future-preview branch from 4d9fc79 to c956e10 Compare October 15, 2019 06:36

baloo reviewed Oct 16, 2019

View reviewed changes

crates/proto/src/xfer/dns_multiplexer.rs Show resolved Hide resolved

bluejekyll marked this pull request as ready for review October 16, 2019 16:43

bluejekyll changed the title ~~(WIP) std::future preview~~ std::future preview Oct 16, 2019

bluejekyll force-pushed the std-future-preview branch from 4536e3b to 83756c4 Compare October 17, 2019 16:16

fix DnsRequestSender to take task::Context for Waker

83756c4

rotty mentioned this pull request Oct 17, 2019

Add resolver methods for SOA and NS records #890

Merged

bluejekyll mentioned this pull request Oct 17, 2019

Simplify Client interface #891

Closed

cleanup all clippy warnings

8c91b59

bluejekyll force-pushed the std-future-preview branch from fe1c917 to 7f70fb9 Compare October 18, 2019 00:19

update OpenSSL for Windows tests

187006a

bluejekyll force-pushed the std-future-preview branch from 7f70fb9 to 187006a Compare October 18, 2019 02:58

bluejekyll merged commit 6c4e08e into master Oct 18, 2019

bluejekyll deleted the std-future-preview branch October 28, 2019 16:30

daxpedda mentioned this pull request Dec 19, 2019

Re-enable trust-dns feature seanmonstar/reqwest#618

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

std::future preview #849

std::future preview #849

bluejekyll commented Aug 15, 2019 •

edited

gfreezy commented Aug 26, 2019

bluejekyll commented Sep 22, 2019

baloo commented Oct 7, 2019

bluejekyll commented Oct 7, 2019

bluejekyll commented Oct 7, 2019

bluejekyll commented Oct 9, 2019

bluejekyll commented Oct 13, 2019

bluejekyll Oct 15, 2019

bluejekyll Oct 15, 2019

bluejekyll commented Oct 17, 2019

zonyitoo commented Oct 17, 2019

bluejekyll commented Oct 17, 2019

baloo commented Oct 18, 2019 •

edited

bluejekyll commented Oct 18, 2019

std::future preview #849

std::future preview #849

Conversation

bluejekyll commented Aug 15, 2019 • edited

gfreezy commented Aug 26, 2019

bluejekyll commented Sep 22, 2019

baloo commented Oct 7, 2019

bluejekyll commented Oct 7, 2019

bluejekyll commented Oct 7, 2019

bluejekyll commented Oct 9, 2019

bluejekyll commented Oct 13, 2019

bluejekyll Oct 15, 2019

Choose a reason for hiding this comment

bluejekyll Oct 15, 2019

Choose a reason for hiding this comment

bluejekyll commented Oct 17, 2019

zonyitoo commented Oct 17, 2019

bluejekyll commented Oct 17, 2019

baloo commented Oct 18, 2019 • edited

bluejekyll commented Oct 18, 2019

bluejekyll commented Aug 15, 2019 •

edited

baloo commented Oct 18, 2019 •

edited