Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Correct the position and record count of broken canary"

Browse source 
This reverts commit cb2772b46c.
This commit is contained in:
Manish Goregaokar 2017-10-23 13:45:09 -07:00
parent d48aa12b8d
commit 2931e71d40
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/hashglobe/src/diagnostic.rs
View file

@ -60,19 +60,17 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
fn verify(&self) {
let mut position = 0;
let mut count = 0;
let mut bad_canary = None;
let mut bad_canary: Option<(usize, *const usize)> = None;
for (_,v) in self.map.iter() {
let canary_ref = &v.0;
position += 1;
if *canary_ref == CANARY {
position += 1;
continue;
}
count += 1;
bad_canary = Some((*canary_ref, canary_ref, position));
bad_canary = Some((*canary_ref, canary_ref));
}
if let Some(c) = bad_canary {
self.report_corruption(c.0, c.1, c.2, count);
self.report_corruption(c.0, c.1, position);
}
}
@ -160,8 +158,7 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
&self,
canary: usize,
canary_addr: *const usize,
position: usize,
count: usize,
position: usize
) {
use ::std::ffi::CString;
let key = b"HashMapJournal\0";
@ -173,13 +170,11 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
);
}
panic!(
concat!("HashMap Corruption (sz={}, cap={}, pairsz={}, cnry={:#x}, count={}, ",
"last_pos={}, base_addr={:?}, cnry_addr={:?}, jrnl_len={})"),
"HashMap Corruption (sz={}, cap={}, pairsz={}, cnry={:#x}, pos={}, base_addr={:?}, cnry_addr={:?}, jrnl_len={})",
self.map.len(),
self.map.raw_capacity(),
::std::mem::size_of::<(K, (usize, V))>(),
canary,
count,
position,
self.map.raw_buffer(),
canary_addr,