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.

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

Some tentative support to get wasm support for Ractor #175

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions ractor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ rust-version = "1.64"
### Other features
cluster = []

# default = ["async-std"]
default = []

[dependencies]
Expand All @@ -26,23 +25,45 @@ async-trait = "0.1"
dashmap = "5"
futures = "0.3"
once_cell = "1"
rand = "0.8"

# Tracing feature requires --cfg=tokio_unstable
tokio = { version = "1", features = ["sync", "time", "rt", "macros", "tracing"] }
async-std = { version = "1", features = ["attributes"], optional = true}
tracing = { version = "0.1", features = ["attributes"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
# TODO #124 - this is due to the temporary disabling of the "factory" module
rand = "0.8"

[target.'cfg(target_arch = "wasm32")'.dependencies]
# instant = { version = "0.1", features = ["wasm-bindgen"]}
getrandom = { version = "0.2", features = ["js"] }
parking_lot = { version = "0.11", features = ["wasm-bindgen"] }
wasm-timer = { version = "0.2" }
wasm-bindgen-futures = { version = "0.4"}
wasm-bindgen-test = "0.3"
wasmtimer = { version = "0.2", features = ["tokio"] }

[dev-dependencies]
criterion = "0.5"
backtrace = "0.3"
function_name = "0.3"
paste = "1"
rand = "0.8"
tokio = { version = "1", features = ["rt", "time", "sync", "macros", "rt-multi-thread", "tracing"] }
tracing-glog = "0.3"
tracing-subscriber = { version = "0.3", features = ["env-filter"]}

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
console_error_panic_hook = "0.1"
tokio = { version = "1", features = ["rt", "time", "sync", "macros"] }
tracing-wasm = "0.2"
wasm-bindgen = "0.2"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
criterion = "0.5"
tokio = { version = "1", features = ["rt", "time", "sync", "macros", "rt-multi-thread", "tracing"] }
tracing-test = "0.2"


[[bench]]
name = "actor"
harness = false
Expand Down
10 changes: 10 additions & 0 deletions ractor/benches/actor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
// This source code is licensed under both the MIT license found in the
// LICENSE-MIT file in the root directory of this source tree.

#[cfg(not(target_arch = "wasm32"))]
#[macro_use]
extern crate criterion;

#[cfg(not(target_arch = "wasm32"))]
use criterion::{BatchSize, Criterion};
#[cfg(feature = "cluster")]
use ractor::Message;
Expand Down Expand Up @@ -45,6 +47,7 @@ impl Actor for BenchActor {
}
}

#[cfg(not(target_arch = "wasm32"))]
fn create_actors(c: &mut Criterion) {
let small = 100;
let large = 10000;
Expand Down Expand Up @@ -130,6 +133,7 @@ fn create_actors(c: &mut Criterion) {
});
}

#[cfg(not(target_arch = "wasm32"))]
fn schedule_work(c: &mut Criterion) {
let small = 100;
let large = 1000;
Expand Down Expand Up @@ -239,6 +243,7 @@ fn schedule_work(c: &mut Criterion) {
});
}

#[cfg(not(target_arch = "wasm32"))]
#[allow(clippy::async_yields_async)]
fn process_messages(c: &mut Criterion) {
const NUM_MSGS: u64 = 100000;
Expand Down Expand Up @@ -328,5 +333,10 @@ fn process_messages(c: &mut Criterion) {
});
}

#[cfg(not(target_arch = "wasm32"))]
criterion_group!(actors, create_actors, schedule_work, process_messages);
#[cfg(not(target_arch = "wasm32"))]
criterion_main!(actors);

#[cfg(target_arch = "wasm32")]
fn main() {}
3 changes: 2 additions & 1 deletion ractor/examples/counter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ fn init_logging() {
tracing::subscriber::set_global_default(subscriber).expect("to set global subscriber");
}

#[tokio::main]
#[cfg_attr(not(target_arch = "wasm32"), tokio::main)]
#[cfg_attr(target_arch = "wasm32", tokio::main(flavor = "current_thread"))]
async fn main() {
init_logging();

Expand Down
3 changes: 2 additions & 1 deletion ractor/examples/monte_carlo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ fn init_logging() {
tracing::subscriber::set_global_default(subscriber).expect("to set global subscriber");
}

#[tokio::main]
#[cfg_attr(not(target_arch = "wasm32"), tokio::main)]
#[cfg_attr(target_arch = "wasm32", tokio::main(flavor = "current_thread"))]
async fn main() {
init_logging();

Expand Down
3 changes: 2 additions & 1 deletion ractor/examples/output_port.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ fn init_logging() {
tracing::subscriber::set_global_default(subscriber).expect("to set global subscriber");
}

#[tokio::main]
#[cfg_attr(not(target_arch = "wasm32"), tokio::main)]
#[cfg_attr(target_arch = "wasm32", tokio::main(flavor = "current_thread"))]
async fn main() {
init_logging();

Expand Down
3 changes: 2 additions & 1 deletion ractor/examples/philosophers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,8 @@ fn init_logging() {
tracing::subscriber::set_global_default(subscriber).expect("to set global subscriber");
}

#[tokio::main]
#[cfg_attr(not(target_arch = "wasm32"), tokio::main)]
#[cfg_attr(target_arch = "wasm32", tokio::main(flavor = "current_thread"))]
async fn main() {
init_logging();

Expand Down
3 changes: 2 additions & 1 deletion ractor/examples/ping_pong.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ fn init_logging() {
tracing::subscriber::set_global_default(subscriber).expect("to set global subscriber");
}

#[tokio::main]
#[cfg_attr(not(target_arch = "wasm32"), tokio::main)]
#[cfg_attr(target_arch = "wasm32", tokio::main(flavor = "current_thread"))]
async fn main() {
init_logging();

Expand Down
3 changes: 2 additions & 1 deletion ractor/examples/supervisor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ fn init_logging() {
tracing::subscriber::set_global_default(subscriber).expect("to set global subscriber");
}

#[tokio::main]
#[cfg_attr(not(target_arch = "wasm32"), tokio::main)]
#[cfg_attr(target_arch = "wasm32", tokio::main(flavor = "current_thread"))]
async fn main() {
init_logging();

Expand Down
10 changes: 5 additions & 5 deletions ractor/src/actor/actor_cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use std::any::TypeId;
use std::sync::Arc;

#[cfg(feature = "async-std")]
#[cfg(any(feature = "async-std", target_arch = "wasm32"))]
use futures::FutureExt;

use super::messages::{Signal, StopMessage};
Expand Down Expand Up @@ -110,7 +110,7 @@ impl ActorPortSet {
where
TState: crate::State,
{
#[cfg(feature = "async-std")]
#[cfg(any(feature = "async-std", target_arch = "wasm32"))]
{
crate::concurrency::select! {
// supervision or message processing work
Expand All @@ -124,7 +124,7 @@ impl ActorPortSet {
}
}
}
#[cfg(not(feature = "async-std"))]
#[cfg(not(any(feature = "async-std", target_arch = "wasm32")))]
{
crate::concurrency::select! {
// supervision or message processing work
Expand All @@ -149,7 +149,7 @@ impl ActorPortSet {
/// Returns [Ok(ActorPortMessage)] on a successful message reception, [MessagingErr]
/// in the event any of the channels is closed.
pub async fn listen_in_priority(&mut self) -> Result<ActorPortMessage, MessagingErr<()>> {
#[cfg(feature = "async-std")]
#[cfg(any(feature = "async-std", target_arch = "wasm32"))]
{
crate::concurrency::select! {
signal = self.signal_rx.recv().fuse() => {
Expand All @@ -166,7 +166,7 @@ impl ActorPortSet {
}
}
}
#[cfg(not(feature = "async-std"))]
#[cfg(not(any(feature = "async-std", target_arch = "wasm32")))]
{
crate::concurrency::select! {
signal = self.signal_rx.recv() => {
Expand Down
49 changes: 32 additions & 17 deletions ractor/src/actor/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
Actor, ActorCell, ActorProcessingErr, ActorRef, ActorStatus, SpawnErr, SupervisionEvent,
};

mod supervisor;
pub mod supervisor;

struct EmptyMessage;
#[cfg(feature = "cluster")]
impl crate::Message for EmptyMessage {}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 26 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L26

Added line #L26 was not covered by tests
async fn test_panic_on_start_captured() {
crate::common_test::setup();
struct TestActor;

#[async_trait::async_trait]
Expand All @@ -47,8 +48,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 51 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L51

Added line #L51 was not covered by tests
async fn test_error_on_start_captured() {
crate::common_test::setup();
struct TestActor;

#[async_trait::async_trait]
Expand All @@ -71,8 +73,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 76 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L76

Added line #L76 was not covered by tests
async fn test_stop_higher_priority_over_messages() {
crate::common_test::setup();
let message_counter = Arc::new(AtomicU8::new(0u8));

struct TestActor {
Expand Down Expand Up @@ -150,8 +153,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 156 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L156

Added line #L156 was not covered by tests
async fn test_kill_terminates_work() {
crate::common_test::setup();
struct TestActor;

#[async_trait::async_trait]
Expand Down Expand Up @@ -196,8 +200,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 203 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L203

Added line #L203 was not covered by tests
async fn test_stop_does_not_terminate_async_work() {
crate::common_test::setup();
struct TestActor;

#[async_trait::async_trait]
Expand Down Expand Up @@ -251,8 +256,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 259 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L259

Added line #L259 was not covered by tests
async fn test_kill_terminates_supervision_work() {
crate::common_test::setup();
struct TestActor;

#[async_trait::async_trait]
Expand Down Expand Up @@ -299,8 +305,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 308 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L308

Added line #L308 was not covered by tests
async fn test_sending_message_to_invalid_actor_type() {
crate::common_test::setup();
struct TestActor1;
struct TestMessage1;
#[cfg(feature = "cluster")]
Expand Down Expand Up @@ -357,8 +364,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 367 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L367

Added line #L367 was not covered by tests
async fn test_sending_message_to_dead_actor() {
crate::common_test::setup();
struct TestActor;

#[async_trait::async_trait]
Expand Down Expand Up @@ -391,8 +399,9 @@

#[cfg(feature = "cluster")]
#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 402 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L402

Added line #L402 was not covered by tests
async fn test_serialized_cast() {
crate::common_test::setup();
use crate::message::{BoxedDowncastErr, SerializedMessage};
use crate::Message;

Expand Down Expand Up @@ -506,8 +515,9 @@

#[cfg(feature = "cluster")]
#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 518 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L518

Added line #L518 was not covered by tests
async fn test_serialized_rpc() {
crate::common_test::setup();
use crate::message::{BoxedDowncastErr, SerializedMessage};
use crate::{Message, RpcReplyPort};

Expand Down Expand Up @@ -616,8 +626,9 @@

#[cfg(feature = "cluster")]
#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 629 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L629

Added line #L629 was not covered by tests
async fn test_remote_actor() {
crate::common_test::setup();
use crate::message::{BoxedDowncastErr, SerializedMessage};
use crate::{ActorId, ActorRuntime, Message};

Expand Down Expand Up @@ -725,8 +736,9 @@

#[cfg(feature = "cluster")]
#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 739 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L739

Added line #L739 was not covered by tests
async fn spawning_local_actor_as_remote_fails() {
crate::common_test::setup();
use crate::ActorProcessingErr;

struct RemoteActor;
Expand Down Expand Up @@ -782,8 +794,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 797 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L797

Added line #L797 was not covered by tests
async fn instant_spawns() {
crate::common_test::setup();
let counter = Arc::new(AtomicU8::new(0));

struct EmptyActor;
Expand Down Expand Up @@ -843,7 +856,7 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 859 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L859

Added line #L859 was not covered by tests
async fn stop_and_wait() {
struct SlowActor;
#[async_trait::async_trait]
Expand Down Expand Up @@ -872,8 +885,9 @@
}

#[crate::concurrency::test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]
async fn kill_and_wait() {
crate::common_test::setup();
struct SlowActor;
#[async_trait::async_trait]
impl Actor for SlowActor {
Expand Down Expand Up @@ -901,8 +915,9 @@
}

#[test]
#[tracing_test::traced_test]
#[cfg_attr(not(target_arch = "wasm32"), tracing_test::traced_test)]

Check warning on line 918 in ractor/src/actor/tests/mod.rs

View check run for this annotation

Codecov / codecov/patch

ractor/src/actor/tests/mod.rs#L918

Added line #L918 was not covered by tests
fn test_err_map() {
crate::common_test::setup();
let err: RactorErr<i32> = RactorErr::Messaging(MessagingErr::SendErr(123));

let _: RactorErr<()> = err.map(|_| ());
Expand Down
Loading
Loading