Skip to content
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

Jump to bottom

perf(tarball): use tokio::task::spawn_blocking #203

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

perf(tarball): use tokio::task::spawn_blocking #203

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
692de46
perf(tarball): use tokio::task::spawn_blocking
KSXGitHub Nov 19, 2023
c9a454a
refactor: remove unnecessary function
KSXGitHub Nov 19, 2023
aca2c2b
chore(git): merge
KSXGitHub Nov 19, 2023
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
11 changes: 3 additions & 8 deletions crates/tarball/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use pacquet_store_dir::{
};
use pipe_trait::Pipe;
use reqwest::Client;
use ssri::{Integrity, IntegrityChecker};
use ssri::Integrity;
use tar::Archive;
use tokio::sync::{Notify, RwLock};
use tracing::instrument;
Expand Down Expand Up @@ -103,11 +103,6 @@ fn decompress_gzip(gz_data: &[u8], unpacked_size: Option<usize>) -> Result<Vec<u
.map_err(TarballError::DecodeGzip)
}

#[instrument(skip(data), fields(data_len = data.len()))]
fn verify_checksum(data: &[u8], integrity: Integrity) -> Result<ssri::Algorithm, ssri::Error> {
integrity.pipe(IntegrityChecker::new).chain(data).result()
}

/// This subroutine downloads and extracts a tarball to the store directory.
///
/// It returns a CAS map of files in the tarball.
Expand Down Expand Up @@ -200,8 +195,8 @@ impl<'a> DownloadTarballToStore<'a> {
Checksum(ssri::Error),
Other(TarballError),
}
let cas_paths = tokio::task::spawn(async move {
verify_checksum(&response, package_integrity.clone()).map_err(TaskError::Checksum)?;
let cas_paths = tokio::task::spawn_blocking(move || {
package_integrity.check(&response).map_err(TaskError::Checksum)?;

// TODO: move tarball extraction to its own function
// TODO: test it
Expand Down