Compare commits
No commits in common. "84ea4bea89d51c129fd56568b425036574423297" and "8cc21f4803610d243de29eb484d4ca5cb0d00db2" have entirely different histories.
84ea4bea89
...
8cc21f4803
2 changed files with 8 additions and 12 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -2,5 +2,4 @@
|
|||
.env
|
||||
cache
|
||||
flamegraph*.svg
|
||||
perf.data*
|
||||
dhat.out.*
|
||||
perf.data*
|
17
src/cache/fs.rs
vendored
17
src/cache/fs.rs
vendored
|
@ -6,13 +6,12 @@ use once_cell::sync::Lazy;
|
|||
use serde::Deserialize;
|
||||
use std::collections::HashMap;
|
||||
use std::fmt::Display;
|
||||
use std::io::SeekFrom;
|
||||
use std::num::NonZeroU64;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::pin::Pin;
|
||||
use std::task::{Context, Poll};
|
||||
use tokio::fs::{create_dir_all, remove_file, File};
|
||||
use tokio::io::{AsyncRead, AsyncSeekExt, AsyncWriteExt, ReadBuf};
|
||||
use tokio::io::{AsyncRead, AsyncWriteExt, ReadBuf};
|
||||
use tokio::sync::mpsc::UnboundedSender;
|
||||
use tokio::sync::watch::{channel, Receiver};
|
||||
use tokio::sync::RwLock;
|
||||
|
@ -86,15 +85,14 @@ pub async fn write_file(
|
|||
file
|
||||
};
|
||||
|
||||
let metadata = serde_json::to_string(&metadata).unwrap();
|
||||
let metadata_size = metadata.len();
|
||||
// need owned variant because async lifetime
|
||||
let path_buf = path.to_path_buf();
|
||||
tokio::spawn(async move {
|
||||
let path_buf = path_buf; // moves path buf into async
|
||||
let mut errored = false;
|
||||
let mut bytes_written: u64 = 0;
|
||||
file.write_all(&metadata.as_bytes()).await?;
|
||||
file.write_all(serde_json::to_string(&metadata).unwrap().as_bytes())
|
||||
.await?;
|
||||
while let Some(bytes) = byte_stream.next().await {
|
||||
if let Ok(mut bytes) = bytes {
|
||||
loop {
|
||||
|
@ -151,7 +149,7 @@ pub async fn write_file(
|
|||
});
|
||||
|
||||
Ok(CacheStream::Concurrent(
|
||||
ConcurrentFsStream::new(path, metadata_size, WatchStream::new(rx)).await?,
|
||||
ConcurrentFsStream::new(path, WatchStream::new(rx)).await?,
|
||||
))
|
||||
}
|
||||
|
||||
|
@ -165,12 +163,11 @@ pub struct ConcurrentFsStream {
|
|||
impl ConcurrentFsStream {
|
||||
async fn new(
|
||||
path: &Path,
|
||||
seek: usize,
|
||||
receiver: WatchStream<WritingStatus>,
|
||||
) -> Result<Self, std::io::Error> {
|
||||
let mut file = File::open(path).await?;
|
||||
file.seek(SeekFrom::Start(seek as u64)).await?;
|
||||
Ok(Self::from_file(file, receiver))
|
||||
File::open(path)
|
||||
.await
|
||||
.map(|file| Self::from_file(file, receiver))
|
||||
}
|
||||
|
||||
fn from_file(file: File, receiver: WatchStream<WritingStatus>) -> Self {
|
||||
|
|
Loading…
Reference in a new issue