rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dont spawn a runtime in machine; inherit from outside with runtime::handle::Current

Browse Source
This commit is contained in:
Joshua Parkin
2023-08-03 16:22:03 +01:00
parent 3ff02da314
commit 65eb93793c
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/machine/system_calls.rs
View File

@@ -3864,7 +3864,8 @@ impl Machine {
let address_string = address_sink.as_str(); //to_string();
let address: Uri = address_string.parse().unwrap();
let stream = self.runtime.block_on(async {
let runtime = tokio::runtime::Handle::current();
let stream = runtime.block_on(async {
let https = HttpsConnector::new();
let client = Client::builder()
.build::<_, hyper::Body>(https);
@@ -3945,7 +3946,8 @@ impl Machine {
let (tx, rx) = channel(1);
let tx = Arc::new(Mutex::new(tx));
let _guard = self.runtime.enter();
let runtime = tokio::runtime::Handle::current();
let _guard = runtime.enter();
let server = match Server::try_bind(&addr) {
Ok(server) => server,
Err(_) => {
@@ -3953,7 +3955,7 @@ impl Machine {
}
};
self.runtime.spawn(async move {
runtime.spawn(async move {
let make_svc = make_service_fn(move |_conn| {
let tx = tx.clone();
async move { Ok::<_, Infallible>(service_fn(move |req| http::serve_req(req, tx.clone()))) }
@@ -4016,7 +4018,8 @@ impl Machine {
let query_cell = string_as_cstr_cell!(query_atom);
let hyper_req = request.request;
let buf = self.runtime.block_on(async {hyper::body::aggregate(hyper_req).await.unwrap()});
let runtime = tokio::runtime::Handle::current();
let buf = runtime.block_on(async {hyper::body::aggregate(hyper_req).await.unwrap()});
let reader = buf.reader();
let mut stream = Stream::from_http_stream(