diff options
| -rw-r--r-- | components/rand/lib.rs | 8 | ||||
| -rw-r--r-- | components/remutex/lib.rs | 28 | ||||
| -rw-r--r-- | components/script/dom/bindings/conversions.rs | 14 | ||||
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 8 | ||||
| -rw-r--r-- | components/script/dom/bindings/weakref.rs | 4 |
5 files changed, 31 insertions, 31 deletions
diff --git a/components/rand/lib.rs b/components/rand/lib.rs index 2771bc1f412..c1018c3deaa 100644 --- a/components/rand/lib.rs +++ b/components/rand/lib.rs @@ -77,14 +77,14 @@ impl<'a> SeedableRng<&'a [usize]> for ServoRng { /// Note that this RNG does not reseed itself, so care is needed to reseed the RNG /// is required to be cryptographically sound. fn from_seed(seed: &[usize]) -> ServoRng { - debug!("Creating new manually-reseeded ServoRng."); + trace!("Creating new manually-reseeded ServoRng."); let isaac_rng = IsaacWordRng::from_seed(as_isaac_seed(seed)); let reseeding_rng = ReseedingRng::new(isaac_rng, u64::MAX, ServoReseeder); ServoRng { rng: reseeding_rng } } /// Reseed the RNG. fn reseed(&mut self, seed: &'a [usize]) { - debug!("Manually reseeding ServoRng."); + trace!("Manually reseeding ServoRng."); self.rng.reseed((ServoReseeder, as_isaac_seed(seed))) } } @@ -95,7 +95,7 @@ impl ServoRng { /// This uses the shared `OsRng`, so avoids consuming /// a file descriptor. pub fn new() -> ServoRng { - debug!("Creating new ServoRng."); + trace!("Creating new ServoRng."); let mut os_rng = OS_RNG.lock().expect("Poisoned lock."); let isaac_rng = IsaacWordRng::rand(&mut *os_rng); let reseeding_rng = ReseedingRng::new(isaac_rng, RESEED_THRESHOLD, ServoReseeder); @@ -108,7 +108,7 @@ struct ServoReseeder; impl Reseeder<IsaacWordRng> for ServoReseeder { fn reseed(&mut self, rng: &mut IsaacWordRng) { - debug!("Reseeding ServoRng."); + trace!("Reseeding ServoRng."); let mut os_rng = OS_RNG.lock().expect("Poisoned lock."); *rng = IsaacWordRng::rand(&mut *os_rng); } diff --git a/components/remutex/lib.rs b/components/remutex/lib.rs index b2ea30d11a4..683dcc99c74 100644 --- a/components/remutex/lib.rs +++ b/components/remutex/lib.rs @@ -159,7 +159,7 @@ unsafe impl<T> Sync for ReentrantMutex<T> where T: Send {} impl<T> ReentrantMutex<T> { pub fn new(data: T) -> ReentrantMutex<T> { - debug!("{:?} Creating new lock.", ThreadId::current()); + trace!("{:?} Creating new lock.", ThreadId::current()); ReentrantMutex { mutex: HandOverHandMutex::new(), count: Cell::new(0), @@ -168,53 +168,53 @@ impl<T> ReentrantMutex<T> { } pub fn lock(&self) -> LockResult<ReentrantMutexGuard<T>> { - debug!("{:?} Locking.", ThreadId::current()); + trace!("{:?} Locking.", ThreadId::current()); if self.mutex.owner() != Some(ThreadId::current()) { - debug!("{:?} Becoming owner.", ThreadId::current()); + trace!("{:?} Becoming owner.", ThreadId::current()); if let Err(_) = self.mutex.lock() { - debug!("{:?} Poison!", ThreadId::current()); + trace!("{:?} Poison!", ThreadId::current()); return Err(PoisonError::new(self.mk_guard())); } - debug!("{:?} Became owner.", ThreadId::current()); + trace!("{:?} Became owner.", ThreadId::current()); } Ok(self.mk_guard()) } pub fn try_lock(&self) -> TryLockResult<ReentrantMutexGuard<T>> { - debug!("{:?} Try locking.", ThreadId::current()); + trace!("{:?} Try locking.", ThreadId::current()); if self.mutex.owner() != Some(ThreadId::current()) { - debug!("{:?} Becoming owner?", ThreadId::current()); + trace!("{:?} Becoming owner?", ThreadId::current()); if let Err(err) = self.mutex.try_lock() { match err { TryLockError::WouldBlock => { - debug!("{:?} Would block.", ThreadId::current()); + trace!("{:?} Would block.", ThreadId::current()); return Err(TryLockError::WouldBlock) }, TryLockError::Poisoned(_) => { - debug!("{:?} Poison!", ThreadId::current()); + trace!("{:?} Poison!", ThreadId::current()); return Err(TryLockError::Poisoned(PoisonError::new(self.mk_guard()))); }, } } - debug!("{:?} Became owner.", ThreadId::current()); + trace!("{:?} Became owner.", ThreadId::current()); } Ok(self.mk_guard()) } fn unlock(&self) { - debug!("{:?} Unlocking.", ThreadId::current()); + trace!("{:?} Unlocking.", ThreadId::current()); let count = self.count.get().checked_sub(1).expect("Underflowed lock count."); - debug!("{:?} Decrementing count to {}.", ThreadId::current(), count); + trace!("{:?} Decrementing count to {}.", ThreadId::current(), count); self.count.set(count); if count == 0 { - debug!("{:?} Releasing mutex.", ThreadId::current()); + trace!("{:?} Releasing mutex.", ThreadId::current()); self.mutex.unlock(); } } fn mk_guard(&self) -> ReentrantMutexGuard<T> { let count = self.count.get().checked_add(1).expect("Overflowed lock count."); - debug!("{:?} Incrementing count to {}.", ThreadId::current(), count); + trace!("{:?} Incrementing count to {}.", ThreadId::current(), count); self.count.set(count); ReentrantMutexGuard { mutex: self } } diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index 577cecb2fd4..f381d9c859c 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -362,7 +362,7 @@ pub unsafe fn get_dom_class(obj: *mut JSObject) -> Result<&'static DOMClass, ()> let dom_class: *const DOMClass = GetProxyHandlerExtra(obj) as *const DOMClass; return Ok(&*dom_class); } - debug!("not a dom object"); + trace!("not a dom object"); Err(()) } @@ -380,27 +380,27 @@ pub unsafe fn private_from_proto_check<F>(mut obj: *mut JSObject, { let dom_class = try!(get_dom_class(obj).or_else(|_| { if IsWrapper(obj) { - debug!("found wrapper"); + trace!("found wrapper"); obj = UnwrapObject(obj, /* stopAtWindowProxy = */ 0); if obj.is_null() { - debug!("unwrapping security wrapper failed"); + trace!("unwrapping security wrapper failed"); Err(()) } else { assert!(!IsWrapper(obj)); - debug!("unwrapped successfully"); + trace!("unwrapped successfully"); get_dom_class(obj) } } else { - debug!("not a dom wrapper"); + trace!("not a dom wrapper"); Err(()) } })); if proto_check(dom_class) { - debug!("good prototype"); + trace!("good prototype"); Ok(private_from_object(obj)) } else { - debug!("bad prototype"); + trace!("bad prototype"); Err(()) } } diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 6f211f82bef..f796c87fb4b 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -129,7 +129,7 @@ pub fn trace_jsval(tracer: *mut JSTracer, description: &str, val: &Heap<JSVal>) return; } - debug!("tracing value {}", description); + trace!("tracing value {}", description); CallValueTracer(tracer, val.ptr.get() as *mut _, GCTraceKindToAscii(val.get().trace_kind())); @@ -140,7 +140,7 @@ pub fn trace_jsval(tracer: *mut JSTracer, description: &str, val: &Heap<JSVal>) #[allow(unrooted_must_root)] pub fn trace_reflector(tracer: *mut JSTracer, description: &str, reflector: &Reflector) { unsafe { - debug!("tracing reflector {}", description); + trace!("tracing reflector {}", description); CallUnbarrieredObjectTracer(tracer, reflector.rootable(), GCTraceKindToAscii(TraceKind::Object)); @@ -150,7 +150,7 @@ pub fn trace_reflector(tracer: *mut JSTracer, description: &str, reflector: &Ref /// Trace a `JSObject`. pub fn trace_object(tracer: *mut JSTracer, description: &str, obj: &Heap<*mut JSObject>) { unsafe { - debug!("tracing {}", description); + trace!("tracing {}", description); CallObjectTracer(tracer, obj.ptr.get() as *mut _, GCTraceKindToAscii(TraceKind::Object)); @@ -734,7 +734,7 @@ impl<'a, T: JSTraceable> DerefMut for RootedVec<'a, T> { /// SM Callback that traces the rooted traceables pub unsafe fn trace_traceables(tracer: *mut JSTracer) { - debug!("tracing stack-rooted traceables"); + trace!("tracing stack-rooted traceables"); ROOTED_TRACEABLES.with(|ref traceables| { let traceables = traceables.borrow(); traceables.trace(tracer); diff --git a/components/script/dom/bindings/weakref.rs b/components/script/dom/bindings/weakref.rs index 234fc58260e..e6201bf3141 100644 --- a/components/script/dom/bindings/weakref.rs +++ b/components/script/dom/bindings/weakref.rs @@ -55,7 +55,7 @@ pub trait WeakReferenceable: DomObject + Sized { DOM_WEAK_SLOT) .to_private() as *mut WeakBox<Self>; if ptr.is_null() { - debug!("Creating new WeakBox holder for {:p}.", self); + trace!("Creating new WeakBox holder for {:p}.", self); ptr = Box::into_raw(box WeakBox { count: Cell::new(1), value: Cell::new(Some(NonZero::new(self))), @@ -65,7 +65,7 @@ pub trait WeakReferenceable: DomObject + Sized { let box_ = &*ptr; assert!(box_.value.get().is_some()); let new_count = box_.count.get() + 1; - debug!("Incrementing WeakBox refcount for {:p} to {}.", + trace!("Incrementing WeakBox refcount for {:p} to {}.", self, new_count); box_.count.set(new_count); |