Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

create uuid before sending PromoteMemory message

Browse source
This commit is contained in:
Russell Cousineau 2019-03-15 18:02:55 -07:00
parent 34fda66dfa
commit d9beca6fec
4 changed files with 20 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/net/filemanager_thread.rs
View file

@ -126,20 +126,8 @@ impl FileManager {
)
}
pub fn promote_memory(
&self,
blob_buf: BlobBuf,
set_valid: bool,
sender: IpcSender<Result<Uuid, BlobURLStoreError>>,
origin: FileOrigin,
) {
let store = self.store.clone();
thread::Builder::new()
.name("transfer memory".to_owned())
.spawn(move || {
store.promote_memory(blob_buf, set_valid, sender, origin);
})
.expect("Thread spawning failed");
pub fn promote_memory(&self, id: Uuid, blob_buf: BlobBuf, set_valid: bool, origin: FileOrigin) {
self.store.promote_memory(id, blob_buf, set_valid, origin);
}
/// Message handler
@ -168,8 +156,8 @@ impl FileManager {
FileManagerThreadMsg::ReadFile(sender, id, check_url_validity, origin) => {
self.read_file(sender, id, check_url_validity, origin);
},
FileManagerThreadMsg::PromoteMemory(blob_buf, set_valid, sender, origin) => {
self.promote_memory(blob_buf, set_valid, sender, origin);
FileManagerThreadMsg::PromoteMemory(id, blob_buf, set_valid, origin) => {
self.promote_memory(id, blob_buf, set_valid, origin);
},
FileManagerThreadMsg::AddSlicedURLEntry(id, rel_pos, sender, origin) => {
self.store.add_sliced_url_entry(id, rel_pos, sender, origin);
@ -667,17 +655,10 @@ impl FileManagerStore {
Ok(())
}
fn promote_memory(
&self,
blob_buf: BlobBuf,
set_valid: bool,
sender: IpcSender<Result<Uuid, BlobURLStoreError>>,
origin: FileOrigin,
) {
fn promote_memory(&self, id: Uuid, blob_buf: BlobBuf, set_valid: bool, origin: FileOrigin) {
match Url::parse(&origin) {
// parse to check sanity
Ok(_) => {
let id = Uuid::new_v4();
self.insert(
id,
FileStoreEntry {
@ -687,12 +668,8 @@ impl FileManagerStore {
is_valid_url: AtomicBool::new(set_valid),
},
);
let _ = sender.send(Ok(id));
},
Err(_) => {
let _ = sender.send(Err(BlobURLStoreError::InvalidOrigin));
},
Err(_) => {},
}
}

7
components/net/tests/fetch.rs
View file

@ -47,6 +47,7 @@ use std::path::Path;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::{Arc, Mutex};
use std::time::{Duration, SystemTime};
use uuid::Uuid;
// TODO write a struct that impls Handler for storing test values
@ -125,7 +126,6 @@ fn test_fetch_aboutblank() {
#[test]
fn test_fetch_blob() {
use ipc_channel::ipc;
use net_traits::blob_url_store::BlobBuf;
struct FetchResponseCollector {
@ -160,11 +160,10 @@ fn test_fetch_blob() {
let origin = ServoUrl::parse("http://www.example.org/").unwrap();
let (sender, receiver) = ipc::channel().unwrap();
let id = Uuid::new_v4();
context
.filemanager
.promote_memory(blob_buf, true, sender, "http://www.example.org".into());
let id = receiver.recv().unwrap().unwrap();
.promote_memory(id.clone(), blob_buf, true, "http://www.example.org".into());
let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.to_simple())).unwrap();
let mut request = Request::new(url, Some(Origin::Origin(origin.origin())), None);