Skip to content

feat: strip basedirs from Rust hash key for cross-machine cache hits #2678

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

Open
mmastrac wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: strip basedirs from Rust hash key for cross-machine cache hits #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions src/cache/readonly.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ mod test {

#[test]
fn readonly_storage_is_readonly() {
let storage = ReadOnlyStorage(Arc::new(MockStorage::new(None, false)));
let storage = ReadOnlyStorage(Arc::new(MockStorage::default()));
assert_eq!(
storage.check().now_or_never().unwrap().unwrap(),
CacheMode::ReadOnly
Expand All @@ -119,16 +119,15 @@ mod test {

#[test]
fn readonly_storage_forwards_preprocessor_cache_mode_config() {
let storage_no_preprocessor_cache =
ReadOnlyStorage(Arc::new(MockStorage::new(None, false)));
let storage_no_preprocessor_cache = ReadOnlyStorage(Arc::new(MockStorage::default()));
assert!(
!storage_no_preprocessor_cache
.preprocessor_cache_mode_config()
.use_preprocessor_cache_mode
);

let storage_with_preprocessor_cache =
ReadOnlyStorage(Arc::new(MockStorage::new(None, true)));
ReadOnlyStorage(Arc::new(MockStorage::new(None, true, vec![])));
assert!(
storage_with_preprocessor_cache
.preprocessor_cache_mode_config()
Expand Down Expand Up @@ -178,7 +177,7 @@ mod test {
.build()
.unwrap();

let storage = ReadOnlyStorage(Arc::new(MockStorage::new(None, true)));
let storage = ReadOnlyStorage(Arc::new(MockStorage::new(None, true, vec![])));
runtime.block_on(async move {
assert_eq!(
storage
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/clang.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ mod test {
too_hard_for_preprocessor_cache_mode: None,
};
let runtime = single_threaded_runtime();
let storage = MockStorage::new(None, false);
let storage = MockStorage::default();
let storage: std::sync::Arc<MockStorage> = std::sync::Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage, runtime.handle().clone());
let compiler = &f.bins[0];
Expand Down
10 changes: 5 additions & 5 deletions src/compiler/compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2369,7 +2369,7 @@ LLVM version: 6.0",
false,
pool,
false,
Arc::new(MockStorage::new(None, preprocessor_cache_mode)),
Arc::new(MockStorage::new(None, preprocessor_cache_mode, vec![])),
CacheControl::Default,
)
.wait()
Expand Down Expand Up @@ -2437,7 +2437,7 @@ LLVM version: 6.0",
false,
pool,
false,
Arc::new(MockStorage::new(None, preprocessor_cache_mode)),
Arc::new(MockStorage::new(None, preprocessor_cache_mode, vec![])),
CacheControl::Default,
)
.wait()
Expand Down Expand Up @@ -2503,7 +2503,7 @@ LLVM version: 6.0",
false,
pool,
false,
Arc::new(MockStorage::new(None, preprocessor_cache_mode)),
Arc::new(MockStorage::new(None, preprocessor_cache_mode, vec![])),
CacheControl::Default,
)
.wait()
Expand Down Expand Up @@ -2805,7 +2805,7 @@ LLVM version: 6.0",
let gcc = f.mk_bin("gcc").unwrap();
let runtime = Runtime::new().unwrap();
let pool = runtime.handle().clone();
let storage = MockStorage::new(None, preprocessor_cache_mode);
let storage = MockStorage::new(None, preprocessor_cache_mode, vec![]);
let storage: Arc<MockStorage> = Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage.clone(), pool.clone());

Expand Down Expand Up @@ -2898,7 +2898,7 @@ LLVM version: 6.0",
std::fs::write(f.tempdir.path().join("foo.c"), "whatever").unwrap();
// Make our storage wait 2ms for each get/put operation.
let storage_delay = Duration::from_millis(2);
let storage = MockStorage::new(Some(storage_delay), preprocessor_cache_mode);
let storage = MockStorage::new(Some(storage_delay), preprocessor_cache_mode, vec![]);
let storage: Arc<MockStorage> = Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage.clone(), pool.clone());
// Pretend to be GCC.
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/diab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ mod test {
too_hard_for_preprocessor_cache_mode: None,
};
let runtime = single_threaded_runtime();
let storage = MockStorage::new(None, false);
let storage = MockStorage::default();
let storage: std::sync::Arc<MockStorage> = std::sync::Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage, runtime.handle().clone());
let compiler = &f.bins[0];
Expand Down
6 changes: 3 additions & 3 deletions src/compiler/gcc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2389,7 +2389,7 @@ mod test {
too_hard_for_preprocessor_cache_mode: None,
};
let runtime = single_threaded_runtime();
let storage = MockStorage::new(None, false);
let storage = MockStorage::default();
let storage: std::sync::Arc<MockStorage> = std::sync::Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage, runtime.handle().clone());
let compiler = &f.bins[0];
Expand Down Expand Up @@ -2450,7 +2450,7 @@ mod test {
too_hard_for_preprocessor_cache_mode: None,
};
let runtime = single_threaded_runtime();
let storage = MockStorage::new(None, false);
let storage = MockStorage::default();
let storage: std::sync::Arc<MockStorage> = std::sync::Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage, runtime.handle().clone());
let compiler = &f.bins[0];
Expand Down Expand Up @@ -2509,7 +2509,7 @@ mod test {
too_hard_for_preprocessor_cache_mode: None,
};
let runtime = single_threaded_runtime();
let storage = MockStorage::new(None, false);
let storage = MockStorage::default();
let storage: std::sync::Arc<MockStorage> = std::sync::Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage, runtime.handle().clone());
let compiler = &f.bins[0];
Expand Down
4 changes: 2 additions & 2 deletions src/compiler/msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2852,7 +2852,7 @@ mod test {
too_hard_for_preprocessor_cache_mode: None,
};
let runtime = single_threaded_runtime();
let storage = MockStorage::new(None, false);
let storage = MockStorage::default();
let storage: std::sync::Arc<MockStorage> = std::sync::Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage, runtime.handle().clone());
let compiler = &f.bins[0];
Expand Down Expand Up @@ -2942,7 +2942,7 @@ mod test {
too_hard_for_preprocessor_cache_mode: None,
};
let runtime = single_threaded_runtime();
let storage = MockStorage::new(None, false);
let storage = MockStorage::default();
let storage: std::sync::Arc<MockStorage> = std::sync::Arc::new(storage);
let service = server::SccacheService::mock_with_storage(storage, runtime.handle().clone());
let compiler = &f.bins[0];
Expand Down
Loading