Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix hang due to acquiring rng lock twice

Browse source
This commit is contained in:
Antonio Scandurra 2022-11-01 09:35:53 +01:00
parent 62547e87dd
commit c6e52dbef7
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/collab/src/integration_tests.rs
View file

@ -6533,8 +6533,8 @@ impl TestClient {
}); });
let project = if remote_projects.is_empty() || rng.lock().gen() { let project = if remote_projects.is_empty() || rng.lock().gen() {
if client.local_projects.is_empty() || rng.lock().gen() { if client.local_projects.is_empty() || rng.lock().gen() {
let paths = client.fs.paths().await; let dir_paths = client.fs.directories().await;
let local_project = if paths.is_empty() || rng.lock().gen() { let local_project = if dir_paths.is_empty() || rng.lock().gen() {
let root_path = format!( let root_path = format!(
"/{}-root-{}", "/{}-root-{}",
username, username,
@ -6550,7 +6550,7 @@ impl TestClient {
log::info!("{}: opening local project at {:?}", username, root_path); log::info!("{}: opening local project at {:?}", username, root_path);
client.build_local_project(root_path, cx).await.0 client.build_local_project(root_path, cx).await.0
} else { } else {
let root_path = paths.choose(&mut *rng.lock()).unwrap(); let root_path = dir_paths.choose(&mut *rng.lock()).unwrap();
log::info!("{}: opening local project at {:?}", username, root_path); log::info!("{}: opening local project at {:?}", username, root_path);
client.build_local_project(root_path, cx).await.0 client.build_local_project(root_path, cx).await.0
}; };
@ -6981,14 +6981,12 @@ impl TestClient {
let mut highlights = Vec::new(); let mut highlights = Vec::new();
let highlight_count = rng.lock().gen_range(1..=5); let highlight_count = rng.lock().gen_range(1..=5);
for _ in 0..highlight_count { for _ in 0..highlight_count {
let start = PointUtf16::new( let start_row = rng.lock().gen_range(0..100);
rng.lock().gen_range(0..100), let start_column = rng.lock().gen_range(0..100);
rng.lock().gen_range(0..100), let start = PointUtf16::new(start_row, start_column);
); let end_row = rng.lock().gen_range(0..100);
let end = PointUtf16::new( let end_column = rng.lock().gen_range(0..100);
rng.lock().gen_range(0..100), let end = PointUtf16::new(end_row, end_column);
rng.lock().gen_range(0..100),
);
let range = let range =
if start > end { end..start } else { start..end }; if start > end { end..start } else { start..end };
highlights.push(lsp::DocumentHighlight { highlights.push(lsp::DocumentHighlight {
@ -7012,7 +7010,7 @@ impl TestClient {
while op_start_signal.next().await.is_some() { while op_start_signal.next().await.is_some() {
if let Err(error) = tick(&mut self, &username, rng.clone(), &mut cx).await { if let Err(error) = tick(&mut self, &username, rng.clone(), &mut cx).await {
log::info!("{} error: {:?}", username, error); log::error!("{} error: {:?}", username, error);
} }
cx.background().simulate_random_delay().await; cx.background().simulate_random_delay().await;

4
crates/fs/src/fs.rs
View file

@ -631,7 +631,7 @@ impl FakeFs {
} }
} }
pub async fn paths(&self) -> Vec<PathBuf> { pub async fn directories(&self) -> Vec<PathBuf> {
let mut result = Vec::new(); let mut result = Vec::new();
let mut queue = collections::VecDeque::new(); let mut queue = collections::VecDeque::new();
queue.push_back((PathBuf::from("/"), self.state.lock().await.root.clone())); queue.push_back((PathBuf::from("/"), self.state.lock().await.root.clone()));
@ -640,8 +640,8 @@ impl FakeFs {
for (name, entry) in entries { for (name, entry) in entries {
queue.push_back((path.join(name), entry.clone())); queue.push_back((path.join(name), entry.clone()));
} }
result.push(path);
} }
result.push(path);
} }
result result
} }