leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hacked in mmap default

Browse source
This commit is contained in:
Igor Katson 2024-05-02 19:43:09 +01:00
parent 79a523f2fe
commit 07a5b69a25
4 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/librqbit/src/peer_connection.rs
View file

@ -103,9 +103,9 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
handshake: Handshake<ByteBufOwned>,
mut conn: tokio::net::TcpStream,
) -> anyhow::Result<()> {
if self.addr.ip().to_string() != "213.189.217.38" {
bail!("DEBUG, NOT MY PEER")
}
// if self.addr.ip().to_string() != "213.189.217.38" {
// bail!("DEBUG, NOT MY PEER")
// }
use tokio::io::AsyncWriteExt;
let rwtimeout = self
@ -153,9 +153,9 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
outgoing_chan: tokio::sync::mpsc::UnboundedReceiver<WriterRequest>,
) -> anyhow::Result<()> {
use tokio::io::AsyncWriteExt;
if self.addr.ip().to_string() != "213.189.217.38" {
bail!("DEBUG, NOT MY PEER")
}
// if self.addr.ip().to_string() != "213.189.217.38" {
// bail!("DEBUG, NOT MY PEER")
// }
let rwtimeout = self
.options

12
crates/librqbit/src/session.rs
View file

@ -16,7 +16,10 @@ use crate::{
peer_connection::PeerConnectionOptions,
read_buf::ReadBuf,
spawn_utils::BlockingSpawner,
storage::{filesystem::FilesystemStorageFactory, BoxStorageFactory, StorageFactoryExt},
storage::{
filesystem::{FilesystemStorageFactory, MmapFilesystemStorageFactory},
BoxStorageFactory, StorageFactoryExt,
},
torrent_state::{
ManagedTorrentBuilder, ManagedTorrentHandle, ManagedTorrentState, TorrentStateLive,
},
@ -190,6 +193,8 @@ pub struct Session {
default_defer_writes: bool,
// default_storage_factory: Option<BoxStorageFactory>,
// This is stored for all tasks to stop when session is dropped.
_cancellation_token_drop_guard: DropGuard,
}
@ -425,6 +430,7 @@ pub struct SessionOptions {
// If true, will write to disk in separate threads. The downside is additional allocations.
// May be useful if the disk is slow.
pub default_defer_writes: bool,
// pub default_storage_factory: Option<BoxStorageFactory>,
}
async fn create_tcp_listener(
@ -1017,7 +1023,9 @@ impl Session {
let storage_factory = opts
.storage_factory
.take()
.unwrap_or_else(|| FilesystemStorageFactory::default().boxed());
// .unwrap_or_else(|| self.default_storage_factory.clone())
// .unwrap_or_else(|| FilesystemStorageFactory::default().boxed());
.unwrap_or_else(|| MmapFilesystemStorageFactory::default().boxed());
if opts.list_only {
return Ok(AddTorrentResponse::ListOnly(ListOnlyResponse {

1
crates/librqbit/src/storage/filesystem/mod.rs
View file

@ -3,3 +3,4 @@ mod mmap;
mod opened_file;
pub use fs::{FilesystemStorage, FilesystemStorageFactory};
pub use mmap::{MmapFilesystemStorage, MmapFilesystemStorageFactory};

14
crates/rqbit/src/main.rs
View file

@ -7,15 +7,10 @@ use librqbit::{
api::ApiAddTorrentResponse,
http_api::{HttpApi, HttpApiOptions},
http_api_client, librqbit_spawn,
<<<<<<< HEAD
storage::{
filesystem::FilesystemStorageFactory,
middleware::{slow::SlowStorageFactory, timing::TimingStorageFactory},
filesystem::{FilesystemStorageFactory, MmapFilesystemStorageFactory},
StorageFactoryExt,
},
=======
storage::mmap::MmapStorageFactory,
>>>>>>> a557afc (Add --experimental-mmap-storage)
tracing_subscriber_config_utils::{init_logging, InitLoggingOptions},
AddTorrent, AddTorrentOptions, AddTorrentResponse, Api, ListOnlyResponse,
PeerConnectionOptions, Session, SessionOptions, TorrentStatsState,
@ -401,13 +396,6 @@ async fn async_main(opts: Opts) -> anyhow::Result<()> {
sub_folder: download_opts.sub_folder.clone(),
initial_peers: download_opts.initial_peers.clone().map(|p| p.0),
disable_trackers: download_opts.disable_trackers,
storage_factory: Some({
let sf = FilesystemStorageFactory::default();
let sf = SlowStorageFactory::new(sf);
TimingStorageFactory::new("fs".to_owned(), sf).boxed()
}),
..Default::default()
};
let connect_to_existing = match client.validate_rqbit_server().await {