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.

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

ref(service): Remove unused I/O threadpool #378

Merged
merged 1 commit into from
Feb 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions src/services/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ impl Service {
let config = Arc::new(config);

let cpu_pool = ThreadPool::new();
let io_pool = ThreadPool::new();
let spawnpool = procspawn::Pool::new(config.processing_pool_size)
.context("failed to create process pool")?;

Expand All @@ -74,12 +73,7 @@ impl Service {
caches
.clear_tmp(&config)
.context("failed to clear tmp caches")?;
let objects = ObjectsActor::new(
caches.object_meta,
caches.objects,
io_pool,
downloader.clone(),
);
let objects = ObjectsActor::new(caches.object_meta, caches.objects, downloader.clone());
let symcaches = SymCacheActor::new(caches.symcaches, objects.clone(), cpu_pool.clone());
let cficaches = CfiCacheActor::new(caches.cficaches, objects.clone(), cpu_pool.clone());

Expand Down
3 changes: 1 addition & 2 deletions src/services/objects/meta_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::services::cacher::{CacheItemRequest, CachePath, Cacher};
use crate::services::download::{ObjectFileSource, ObjectFileSourceURI};
use crate::sources::SourceId;
use crate::types::{ObjectFeatures, ObjectId, Scope};
use crate::utils::futures::{BoxedFuture, ThreadPool};
use crate::utils::futures::BoxedFuture;

use super::{FetchFileDataRequest, ObjectError, ObjectHandle};

Expand All @@ -35,7 +35,6 @@ pub(super) struct FetchFileMetaRequest {
// XXX: This kind of state is not request data. We should find a different way to get this into
// `<FetchFileMetaRequest as CacheItemRequest>::compute`, e.g. make the Cacher hold arbitrary
// state for computing.
pub(super) threadpool: ThreadPool,
pub(super) data_cache: Arc<Cacher<FetchFileDataRequest>>,
pub(super) download_svc: Arc<crate::services::download::DownloadService>,
}
Expand Down
12 changes: 1 addition & 11 deletions src/services/objects/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use crate::services::download::{
};
use crate::sources::{FileType, SourceConfig, SourceId};
use crate::types::{AllObjectCandidates, ObjectCandidate, ObjectDownloadInfo, ObjectId, Scope};
use crate::utils::futures::ThreadPool;

use data_cache::FetchFileDataRequest;
use meta_cache::FetchFileMetaRequest;
Expand Down Expand Up @@ -140,21 +139,14 @@ struct CacheLookupError {
pub struct ObjectsActor {
meta_cache: Arc<Cacher<FetchFileMetaRequest>>,
data_cache: Arc<Cacher<FetchFileDataRequest>>,
threadpool: ThreadPool,
download_svc: Arc<DownloadService>,
}

impl ObjectsActor {
pub fn new(
meta_cache: Cache,
data_cache: Cache,
threadpool: ThreadPool,
download_svc: Arc<DownloadService>,
) -> Self {
pub fn new(meta_cache: Cache, data_cache: Cache, download_svc: Arc<DownloadService>) -> Self {
ObjectsActor {
meta_cache: Arc::new(Cacher::new(meta_cache)),
data_cache: Arc::new(Cacher::new(data_cache)),
threadpool,
download_svc,
}
}
Expand Down Expand Up @@ -302,7 +294,6 @@ impl ObjectsActor {
for file_source in file_sources {
let object_id = identifier.clone();
let scope = scope.clone();
let threadpool = self.threadpool.clone();
let data_cache = self.data_cache.clone();
let download_svc = self.download_svc.clone();
let meta_cache = self.meta_cache.clone();
Expand All @@ -317,7 +308,6 @@ impl ObjectsActor {
scope,
file_source: file_source.clone(),
object_id,
threadpool,
data_cache,
download_svc,
};
Expand Down