Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From ump-server-0.3.0 To ump-server-0.4.0
2024-09-10
| ||
18:09 | Hardcode all features for pedantic clippy in bacon config. check-in: 09c247864d user: jan tags: trunk | |
01:14 | Release maintenance. check-in: ea36f2935c user: jan tags: trunk, ump-server-0.4.0 | |
01:09 | Update ump to 0.13.0. clippy fixes. check-in: 9cea401a86 user: jan tags: trunk | |
2024-03-29
| ||
15:52 | Update to tokio 1.37.0 to no longer require net feature in order to generate documentation. check-in: a2cfce208b user: jan tags: trunk | |
2024-02-20
| ||
16:10 | (Re)release maintenance. check-in: ed7a332d6a user: jan tags: trunk, ump-server-0.3.0 | |
11:58 | Changelog fixup. check-in: b99bf2d8a9 user: jan tags: trunk | |
Changes to Cargo.toml.
1 2 | [package] name = "ump-server" | | > | | < < | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | [package] name = "ump-server" version = "0.4.0" edition = "2021" license = "0BSD" categories = [ "concurrency", "asynchronous" ] keywords = [ "channel", "threads", "sync", "message-passing" ] repository = "https://repos.qrnch.tech/pub/ump-server" description = "Server message dispatch loop for ump." rust-version = "1.56" exclude = [ ".fossil-settings", ".efiles", ".fslckout", "www", "bacon.toml", "rustfmt.toml" ] [features] default = ["tokio"] tokio = ["dep:tokio", "dep:async-trait"] tracing = ["dep:tracing"] watchdog = ["dep:parking_lot"] [dependencies] async-trait = { version = "0.1.82", optional = true } parking_lot = { version = "0.12.3", optional = true } tokio = { version = "1.40.0", features = ["rt"], optional = true } tracing = { version = "0.1.40", optional = true } ump = { version = "0.13.0" } [dev-dependencies] tokio-test = { version = "0.4.4" } [package.metadata.docs.rs] all-features = true rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"] |
Added bacon.toml.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | # This is a configuration file for the bacon tool # # Bacon repository: https://github.com/Canop/bacon # Complete help on configuration: https://dystroy.org/bacon/config/ # You can also check bacon's own bacon.toml file # as an example: https://github.com/Canop/bacon/blob/main/bacon.toml # For information about clippy lints, see: # https://github.com/rust-lang/rust-clippy/blob/master/README.md #default_job = "check" default_job = "clippy-all-pedantic" [jobs.check] command = ["cargo", "check", "--color", "always"] need_stdout = false [jobs.check-all] command = ["cargo", "check", "--all-targets", "--color", "always"] need_stdout = false # Run clippy on the default target [jobs.clippy] command = [ "cargo", "clippy", "--color", "always", ] need_stdout = false # Run clippy on all targets # To disable some lints, you may change the job this way: # [jobs.clippy-all] # command = [ # "cargo", "clippy", # "--all-targets", # "--color", "always", # "--", # "-A", "clippy::bool_to_int_with_if", # "-A", "clippy::collapsible_if", # "-A", "clippy::derive_partial_eq_without_eq", # ] # need_stdout = false [jobs.clippy-all] command = [ "cargo", "clippy", "--all-targets", "--color", "always", ] need_stdout = false [jobs.clippy-pedantic] command = [ "cargo", "clippy", "--color", "always", "--", "-Wclippy::all", "-Wclippy::pedantic", "-Wclippy::nursery", "-Wclippy::cargo" ] need_stdout = false [jobs.clippy-all-pedantic] command = [ "cargo", "clippy", "--all-targets", "--color", "always", "--", "-Wclippy::all", "-Wclippy::pedantic", "-Wclippy::nursery", "-Wclippy::cargo" ] need_stdout = false # This job lets you run # - all tests: bacon test # - a specific test: bacon test -- config::test_default_files # - the tests of a package: bacon test -- -- -p config [jobs.test] command = [ "cargo", "test", "--color", "always", "--", "--color", "always", # see https://github.com/Canop/bacon/issues/124 ] need_stdout = true [jobs.doc] command = ["cargo", "doc", "--color", "always", "--no-deps"] need_stdout = false # If the doc compiles, then it opens in your browser and bacon switches # to the previous job [jobs.doc-open] command = ["cargo", "doc", "--color", "always", "--no-deps", "--open"] need_stdout = false on_success = "back" # so that we don't open the browser at each change # You can run your application and have the result displayed in bacon, # *if* it makes sense for this crate. # Don't forget the `--color always` part or the errors won't be # properly parsed. # If your program never stops (eg a server), you may set `background` # to false to have the cargo run output immediately displayed instead # of waiting for program's end. [jobs.run] command = [ "cargo", "run", "--color", "always", # put launch parameters for your program behind a `--` separator ] need_stdout = true allow_warnings = true background = true # This parameterized job runs the example of your choice, as soon # as the code compiles. # Call it as # bacon ex -- my-example [jobs.ex] command = ["cargo", "run", "--color", "always", "--example"] need_stdout = true allow_warnings = true # You may define here keybindings that would be specific to # a project, for example a shortcut to launch a specific job. # Shortcuts to internal functions (scrolling, toggling, etc.) # should go in your personal global prefs.toml file instead. [keybindings] # alt-m = "job:my-job" c = "job:clippy-all" # comment this to have 'c' run clippy on only the default target |
Changes to examples/wdog_timeout.rs.
1 2 3 4 5 6 7 | use std::ops::ControlFlow; #[derive(Debug)] pub enum Request { Delay(u64) } | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | use std::ops::ControlFlow; #[derive(Debug)] pub enum Request { Delay(u64) } #[derive(Debug, PartialEq, Eq)] pub enum Reply { DelayDone } pub struct ThreadedServer {} impl ump_server::ThreadedHandler<Request, Reply, (), u32> for ThreadedServer { |
︙ | ︙ |
Changes to src/task.rs.
︙ | ︙ | |||
108 109 110 111 112 113 114 115 116 117 118 119 120 121 | } /// Run a task which will process incoming messages from an ump server /// end-point. /// /// See top module's documentation for an overview of the [dispatch /// loop](crate#dispatch-loop). #[allow(clippy::type_complexity)] pub fn spawn<S, R, E, RV, F>( hbldr: impl FnOnce(&Client<S, R, E>) -> Result<F, E> ) -> Result<(Client<S, R, E>, JoinHandle<Option<RV>>), E> where S: 'static + Send, R: 'static + Send, | > > > > | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | } /// Run a task which will process incoming messages from an ump server /// end-point. /// /// See top module's documentation for an overview of the [dispatch /// loop](crate#dispatch-loop). /// /// # Errors /// An application-defined error `E` is returned if the dispatch loop is /// terminated by a handler returning `ControlFlow::Break(E)`. #[allow(clippy::type_complexity)] pub fn spawn<S, R, E, RV, F>( hbldr: impl FnOnce(&Client<S, R, E>) -> Result<F, E> ) -> Result<(Client<S, R, E>, JoinHandle<Option<RV>>), E> where S: 'static + Send, R: 'static + Send, |
︙ | ︙ | |||
144 145 146 147 148 149 150 | let res = handler.proc_req(msg, rctx).await; #[cfg(feature = "watchdog")] wdog.end_process(); match res { | | | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | let res = handler.proc_req(msg, rctx).await; #[cfg(feature = "watchdog")] wdog.end_process(); match res { ControlFlow::Continue(()) => {} ControlFlow::Break(rv) => break Some(rv) } }; #[cfg(feature = "watchdog")] let _ = wdog.kill(); |
︙ | ︙ |
Changes to src/thread.rs.
︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 | } /// Run a thread which will process incoming messages from an ump server /// end-point. /// /// See top module's documentation for an overview of the [dispatch /// loop](crate#dispatch-loop). #[allow(clippy::type_complexity)] pub fn spawn<S, R, E, RV, F>( hbldr: impl FnOnce(&Client<S, R, E>) -> Result<F, E> ) -> Result<(Client<S, R, E>, thread::JoinHandle<Option<RV>>), E> where S: 'static + Send, R: 'static + Send, | > > > > | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | } /// Run a thread which will process incoming messages from an ump server /// end-point. /// /// See top module's documentation for an overview of the [dispatch /// loop](crate#dispatch-loop). /// /// # Errors /// An application-defined error `E` is returned if the dispatch loop is /// terminated by a handler returning `ControlFlow::Break(E)`. #[allow(clippy::type_complexity)] pub fn spawn<S, R, E, RV, F>( hbldr: impl FnOnce(&Client<S, R, E>) -> Result<F, E> ) -> Result<(Client<S, R, E>, thread::JoinHandle<Option<RV>>), E> where S: 'static + Send, R: 'static + Send, |
︙ | ︙ | |||
135 136 137 138 139 140 141 | let res = handler.proc_req(msg, rctx); #[cfg(feature = "watchdog")] wdog.end_process(); match res { | | | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | let res = handler.proc_req(msg, rctx); #[cfg(feature = "watchdog")] wdog.end_process(); match res { ControlFlow::Continue(()) => {} ControlFlow::Break(rv) => break Some(rv) } }; #[cfg(feature = "watchdog")] let _ = wdog.kill(); |
︙ | ︙ |
Changes to src/wdog.rs.
︙ | ︙ | |||
29 30 31 32 33 34 35 | } struct Shared { inner: Mutex<Inner>, signal: Condvar } | | | | > > > | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | } struct Shared { inner: Mutex<Inner>, signal: Condvar } pub fn run() -> WatchDog { let inner = Inner { state: State::Idle }; let shared = Shared { inner: Mutex::new(inner), signal: Condvar::new() }; let sh = Arc::new(shared); let shared = Arc::clone(&sh); let jh = std::thread::spawn(move || monitor_thread(&shared)); WatchDog { sh, jh } } pub struct WatchDog { sh: Arc<Shared>, jh: JoinHandle<()> } impl WatchDog { pub(crate) fn begin_process(&self) { let mut g = self.sh.inner.lock(); g.state = State::Processing { start_time: Instant::now() }; self.sh.signal.notify_one(); drop(g); } pub(crate) fn end_process(&self) { let mut g = self.sh.inner.lock(); g.state = State::Idle; self.sh.signal.notify_one(); drop(g); } pub(crate) fn kill(self) -> std::thread::Result<()> { let mut g = self.sh.inner.lock(); g.state = State::Term; self.sh.signal.notify_one(); drop(g); self.jh.join() } } #[allow(clippy::significant_drop_tightening)] fn monitor_thread(sh: &Arc<Shared>) { let mut g = sh.inner.lock(); loop { match g.state { State::Idle => { // Wait to be notified about a state change sh.signal.wait(&mut g); } |
︙ | ︙ |
Changes to tests/common/mod.rs.
1 2 3 4 5 6 7 8 | use std::ops::ControlFlow; #[derive(Debug)] pub enum Request { Add(u32, u32), Croak } | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | use std::ops::ControlFlow; #[derive(Debug)] pub enum Request { Add(u32, u32), Croak } #[derive(Debug, PartialEq, Eq)] pub enum Reply { Sum(u64), OkIWillCroak } pub struct ThreadedServer {} impl ump_server::ThreadedHandler<Request, Reply, (), u32> for ThreadedServer { fn proc_req( &mut self, msg: Request, rctx: ump_server::ReplyContext<Reply, ()> ) -> ControlFlow<u32, ()> { match msg { Request::Add(a, b) => { rctx.reply(Reply::Sum(u64::from(a + b))).unwrap(); ControlFlow::Continue(()) } Request::Croak => { rctx.reply(Reply::OkIWillCroak).unwrap(); ControlFlow::Break(42) } } |
︙ | ︙ | |||
43 44 45 46 47 48 49 | async fn proc_req( &mut self, msg: Request, rctx: ump_server::ReplyContext<Reply, ()> ) -> ControlFlow<u32, ()> { match msg { Request::Add(a, b) => { | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | async fn proc_req( &mut self, msg: Request, rctx: ump_server::ReplyContext<Reply, ()> ) -> ControlFlow<u32, ()> { match msg { Request::Add(a, b) => { rctx.reply(Reply::Sum(u64::from(a + b))).unwrap(); ControlFlow::Continue(()) } Request::Croak => { rctx.reply(Reply::OkIWillCroak).unwrap(); ControlFlow::Break(42) } } } } // vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 : |
Changes to www/changelog.md.
1 2 3 4 | # Change Log ## [Unreleased] | > > | > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | # Change Log ⚠️ indicates a breaking change. ## [Unreleased] [Details](/vdiff?from=ump-server-0.4.0&to=trunk) ### Added ### Changed ### Removed --- ## [0.4.0] - 2024-09-10 [Details](/vdiff?from=ump-server-0.3.0&to=ump-server-0.4.0) ### Changed - ⚠️ Updated to `ump` to `0.13.0`. --- ## [0.3.0] - 2024-02-20 [Details](/vdiff?from=ump-server-0.2.1&to=ump-server-0.3.0) Yanked 0.2.1 and rereleased as 0.3.0 due to breaking changes. |
︙ | ︙ |
Changes to www/index.md.
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | The crate's documentation uses automatically generated feature labels, which currently requires nightly featuers. To build the documentation locally use: ``` RUSTFLAGS="--cfg docsrs" RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features ``` ## Change log The details of changes can always be found in the timeline, but for a high-level view of changes between released versions there's a manually maintained [Change Log](./changelog.md). | > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | The crate's documentation uses automatically generated feature labels, which currently requires nightly featuers. To build the documentation locally use: ``` RUSTFLAGS="--cfg docsrs" RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features ``` ## Change log The details of changes can always be found in the timeline, but for a high-level view of changes between released versions there's a manually maintained [Change Log](./changelog.md). |
︙ | ︙ |