Skip to content

Use parking lot for mutex, no poisoning #56

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 2, 2021
Merged

Use parking lot for mutex, no poisoning #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16f2fbb
Use parking lot for mutex, no poisoning
Sushisource Mar 2, 2021
492851e
Merge branch 'master' into parking_lot_mutex
Sushisource Mar 2, 2021
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
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ log = "0.4"
once_cell = "1.5"
opentelemetry-jaeger = "0.11"
opentelemetry = "0.12"
parking_lot = "0.11"
prost = "0.7"
prost-types = "0.7"
slotmap = "1.0"
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,6 @@ pub enum CoreError {
TokioInitError(std::io::Error),
/// Invalid URI: {0:?}
InvalidUri(#[from] InvalidUri),
/// A mutex was poisoned: {0:?}
LockPoisoned(String),
/// State machines are missing for the workflow with run id {0}!
MissingMachines(String),
}
Expand Down
3 changes: 1 addition & 2 deletions src/workflow/concurrency_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use crate::{
};
use crossbeam::channel::{bounded, unbounded, Receiver, Select, Sender, TryRecvError};
use dashmap::DashMap;
use parking_lot::Mutex;
use std::{
fmt::Debug,
sync::Mutex,
thread::{self, JoinHandle},
};
use tracing::Level;
Expand Down Expand Up @@ -124,7 +124,6 @@ impl WorkflowConcurrencyManager {
let _ = self.shutdown_chan.send(true);
self.wf_thread
.lock()
.expect("Workflow manager thread mutex must be lockable")
.take()
.unwrap()
.join()
Expand Down