To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit 83c91384 authored by qinsoon's avatar qinsoon
Browse files

Merge remote-tracking branch 'origin/develop' into open-source

parents b682b7dc 0d2cb2eb
......@@ -34,7 +34,7 @@ gcc = "*"
ast = {path = "src/ast"}
utils = {path = "src/utils"}
gc = {path = "src/gc"}
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal" }
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", version = "0.0.2" }
libc="*"
field-offset = "*"
libloading = "*"
......
......@@ -25,5 +25,4 @@ utils = {path = "../utils"}
lazy_static = "*"
log = "*"
simple_logger = "*"
#rodal = {path = "../../rodal"}
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal" }
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", version = "0.0.2" }
......@@ -38,5 +38,4 @@ simple_logger = "*"
aligned_alloc = "*"
crossbeam = "*"
field-offset = "*"
#rodal = {path = "../../rodal"}
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal" }
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", version = "0.0.2" }
......@@ -24,6 +24,6 @@ crate-type = ["rlib"]
memmap = "*"
memsec = "0.1.9"
byteorder = "*"
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal" }
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", version = "0.0.2" }
log = "*"
doubly = "1.1.3"
\ No newline at end of file
......@@ -100,8 +100,6 @@ pub struct VM { // The comments are the offset into the struct
exception_table: RwLock<HashMap<MuID, HashMap<MuName, MuName>>>, // +784
// ---do not serialize---
// WARNING: It will segfault if you try to acquire a lock, after loading a dump,
// from one of the fields that aren't dumped
pub global_locations: RwLock<HashMap<MuID, ValueLocation>>,
func_vers: RwLock<HashMap<MuID, RwLock<MuFunctionVersion>>>,
......@@ -134,9 +132,19 @@ unsafe impl rodal::Dump for VM {
dumper.dump_object(&self.compiled_funcs);
dumper.dump_object(&self.exception_table);
// Dump an emepty hashmap for the compiled_exception_table
// Dump empty maps so that we can safely read and modify them once loaded
dumper.dump_padding(&self.global_locations);
dumper.dump_object_here(&RwLock::new(rodal::EmptyHashMap::<MuID, ValueLocation>::new()));
dumper.dump_padding(&self.func_vers);
dumper.dump_object_here(&RwLock::new(rodal::EmptyHashMap::<MuID, RwLock<MuFunctionVersion>>::new()));
dumper.dump_padding(&self.aot_pending_funcref_store);
dumper.dump_object_here(&RwLock::new(rodal::EmptyHashMap::<Address, ValueLocation>::new()));
// Dump an emepty hashmap for the other hashmaps
dumper.dump_padding(&self.compiled_exception_table);
dumper.dump_object_here(&RwLock::new(HashMap::<Address, (Address, *const CompiledFunction)>::new()));
dumper.dump_object_here(&RwLock::new(rodal::EmptyHashMap::<Address, (Address, *const CompiledFunction)>::new()));
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment