Merge pull request #9 from jlizen/dev

Refactor: Switch to accepting sync input closures, add builder, adjust defaults, add docs

Cargo.toml

@@ -1,33 +1,33 @@
 [package]
-name = "compute-heavy-future-executor"
+name = "vacation"
 version = "0.1.0"
 edition = "2021"
 license = "MIT"
-repository = "https://github.com/jlizen/compute-heavy-future-executor"
-homepage = "https://github.com/jlizen/compute-heavy-future-executor"
+repository = "https://github.com/jlizen/vacation"
+homepage = "https://github.com/jlizen/vacation"
 rust-version = "1.70"
 exclude = ["/.github", "/examples", "/scripts"]
 readme = "README.md"
-description = "Additional executor patterns for handling compute-bounded, blocking futures."
-categories = ["asynchronous"]
+description = "Give your (runtime) workers a break!"
+categories = ["asynchronous", "executor"]
 
 [features]
-tokio = ["tokio/rt"]
-tokio_block_in_place = ["tokio", "tokio/rt-multi-thread"]
-secondary_tokio_runtime = ["tokio", "tokio/rt-multi-thread", "dep:libc", "dep:num_cpus"]
+default = ["tokio"]
+tokio = ["tokio/rt",]
 
 [dependencies]
-libc = { version = "0.2.168", optional = true }
 log = "0.4.22"
-num_cpus = { version = "1.0", optional = true }
-tokio = { version = "1.0", features = ["macros", "sync"] }
+num_cpus = "1.0"
+tokio = { version = "1.0", features = ["sync"] }
 
 [dev-dependencies]
-tokio = { version = "1.0", features = ["full"]}
+tokio = { version = "1", features = ["full"]}
 futures-util = "0.3.31"
+rayon = "1"
 
 [package.metadata.docs.rs]
 all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
 
 
 [lints.rust]

README.md

@@ -1,2 +1,89 @@
-# compute-heavy-future-executor
-Experimental crate that adds additional executor patterns to use with frequently blocking futures.
+# vacation
+ Vacation: Give your (runtime) workers a break! 
+
+## Overview
+
+Today, when library authors write async APIs, they don't have a good way to handle long-running sync segments.
+
+An application author can use selective handling such as `tokio::task::spawn_blocking()` along with concurrency control to delegate sync segments to blocking threads. Or, they might send the work to a `rayon` threadpool.
+
+But, library authors generally don't have this flexibility. As, they generally want to be agnostic across runtime. Or, even if they are `tokio`-specific, they generally don't want to call `tokio::task::spawn_blocking()` as it is
+suboptimal without extra configuration (concurrency control) as well as highly opinionated to send the work across threads.
+
+This library solves this problem by providing libray authors a static, globally scoped strategy that they can delegate blocking sync work to without drawing any conclusions about handling.
+
+And then, the applications using the library can tune handling based on their preferred approach.
+
+## Usage - Library Authors
+For library authors, it's as simple as adding a dependency enabling `vacation` (perhaps behind a feature flag).
+
+```ignore
+[dependencies]
+vacation = { version = "0.1", default-features = false }
+```
+
+And then wrap any sync work by passing it as a closure to a global `execute()` call:
+
+```
+fn sync_work(input: String)-> u8 {
+    std::thread::sleep(std::time::Duration::from_secs(5));
+    println!("{input}");
+    5
+}
+pub async fn a_future_that_has_blocking_sync_work() -> u8 {
+    // relies on application-specified strategy for translating execute into a future that won't
+    // block the current worker thread
+    vacation::execute(move || { sync_work("foo".to_string()) }, vacation::ChanceOfBlocking::High).await.unwrap()
+}
+
+```
+
+## Usage - Application owners
+Application authors will need to add this library as a a direct dependency in order to customize the execution strategy.
+By default, the strategy is just a non-op.
+
+### Simple example
+
+```ignore
+[dependencies]
+// enables `tokio` feature by default => spawn_blocking strategy
+vacation = { version = "0.1" }
+```
+
+And then call the `install_tokio_strategy()` helper that uses some sensible defaults:
+```
+#[tokio::main]
+async fn main() {
+    vacation::install_tokio_strategy().unwrap();
+}
+```
+
+### Rayon example
+Or, you can add an alternate strategy, for instance a custom closure using Rayon.
+
+```ignore
+[dependencies]
+vacation = { version = "0.1", default-features = false }
+// used for example with custom executor
+rayon = "1"
+```
+
+```
+use std::sync::OnceLock;
+use rayon::ThreadPool;
+
+static THREADPOOL: OnceLock<ThreadPool> = OnceLock::new();
+
+fn initialize_strategy() {
+    THREADPOOL.set(rayon::ThreadPoolBuilder::default().build().unwrap());
+
+    let custom_closure = |f: vacation::CustomClosureInput| {
+        Box::new(async move { Ok(THREADPOOL.get().unwrap().spawn(f)) }) as vacation::CustomClosureOutput
+    };
+
+    vacation::init()
+        // probably no need for max concurrency as rayon already is defaulting to a thread per core
+        // and using a task queue
+        .custom_executor(custom_closure).install().unwrap();
+}
+```

src/concurrency_limit.rs

@@ -23,19 +23,13 @@ impl ConcurrencyLimit {
     /// Internally turns errors into a no-op (`None`) and outputs log lines.
     pub(crate) async fn acquire_permit(&self) -> Option<OwnedSemaphorePermit> {
         match self.semaphore.clone() {
-            Some(semaphore) => {
-                match semaphore
-                    .acquire_owned()
-                    .await
-                    .map_err(|err| Error::Semaphore(err))
-                {
-                    Ok(permit) => Some(permit),
-                    Err(err) => {
-                        log::error!("failed to acquire permit: {err}");
-                        None
-                    }
+            Some(semaphore) => match semaphore.acquire_owned().await.map_err(Error::Semaphore) {
+                Ok(permit) => Some(permit),
+                Err(err) => {
+                    log::error!("failed to acquire permit: {err}");
+                    None
                 }
-            }
+            },
             None => None,
         }
     }

src/error.rs

@@ -2,33 +2,30 @@ use core::fmt;
 
 use crate::ExecutorStrategy;
 
+/// An error from the custom executor
 #[non_exhaustive]
 #[derive(Debug)]
 pub enum Error {
+    /// Executor has already had a global strategy configured.
     AlreadyInitialized(ExecutorStrategy),
-    InvalidConfig(InvalidConfig),
+    /// Issue listening on the custom executor response channel.
     RecvError(tokio::sync::oneshot::error::RecvError),
+    /// Error enforcing concurrency
     Semaphore(tokio::sync::AcquireError),
+    /// Dynamic error from the custom executor closure
     BoxError(Box<dyn std::error::Error + Send + Sync>),
     #[cfg(feature = "tokio")]
+    /// Background spawn blocking task panicked
     JoinError(tokio::task::JoinError),
 }
 
-#[derive(Debug)]
-pub struct InvalidConfig {
-    pub field: &'static str,
-    pub received: String,
-    pub expected: &'static str,
-}
-
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Error::AlreadyInitialized(strategy) => write!(
                 f,
-                "global strategy is already initialzed with strategy: {strategy:#?}"
+                "global strategy is already initialized with strategy: {strategy:#?}"
             ),
-            Error::InvalidConfig(err) => write!(f, "invalid config: {err:#?}"),
             Error::BoxError(err) => write!(f, "custom executor error: {err}"),
             Error::RecvError(err) => write!(f, "error in custom executor response channel: {err}"),
             Error::Semaphore(err) => write!(
@@ -43,3 +40,12 @@ impl fmt::Display for Error {
         }
     }
 }
+
+impl std::error::Error for Error {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            Self::BoxError(err) => Some(err.source()?),
+            _ => None,
+        }
+    }
+}