Skip to content

Commit

Permalink
add debug information for signal subscriptions
Browse files Browse the repository at this point in the history
  • Loading branch information
ealmloff committed Feb 26, 2024
1 parent c0f2e83 commit f539698
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 13 deletions.
11 changes: 11 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions packages/core/src/diff/component.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,7 @@ impl VNode {
// The target ScopeState still has the reference to the old props, so there's no need to update anything
// This also implicitly drops the new props since they're not used
if old_props.memoize(new_props.props()) {
tracing::trace!(
"Memoized props for component {:#?} ({})",
scope_id,
old_scope.state().name
);
tracing::trace!("Memoized props for component {:#?}", scope_id,);
return;
}

Expand Down
19 changes: 18 additions & 1 deletion packages/core/src/scopes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,26 @@ use std::{cell::Ref, fmt::Debug, rc::Rc};
/// time. We do try and guarantee that between calls to `wait_for_work`, no ScopeIds will be recycled in order to give
/// time for any logic that relies on these IDs to properly update.
#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, PartialOrd, Ord)]
#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub struct ScopeId(pub usize);

impl std::fmt::Debug for ScopeId {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let mut builder = f.debug_tuple("ScopeId");
let mut builder = builder.field(&self.0);
#[cfg(debug_assertions)]
{
if let Some(name) = Runtime::current()
.as_ref()
.and_then(|rt| rt.get_state(*self))
{
builder = builder.field(&name.name);
}
}
builder.finish()
}
}

impl ScopeId {
/// The root ScopeId.
///
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/virtual_dom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ impl VirtualDom {
return;
};

tracing::trace!("Marking scope {:?} ({}) as dirty", id, scope.name);
tracing::trace!("Marking scope {:?} as dirty", id);
self.dirty_scopes.insert(DirtyScope {
height: scope.height(),
id,
Expand Down
8 changes: 5 additions & 3 deletions packages/hooks/src/use_effect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ use dioxus_signals::ReactiveContext;
/// The signal will be owned by the current component and will be dropped when the component is dropped.
///
/// If the use_effect call was skipped due to an early return, the effect will no longer activate.
#[track_caller]
pub fn use_effect(mut callback: impl FnMut() + 'static) {
// let mut run_effect = use_hook(|| CopyValue::new(true));
// use_hook_did_run(move |did_run| run_effect.set(did_run));

let location = std::panic::Location::caller();

use_hook(|| {
spawn(async move {
let rc = ReactiveContext::new();

let rc = ReactiveContext::new_with_origin(location);
loop {
// Wait for the dom the be finished with sync work
flush_sync().await;
// flush_sync().await;

// Run the effect
rc.run_in(&mut callback);
Expand Down
49 changes: 47 additions & 2 deletions packages/signals/src/reactive_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,47 @@ thread_local! {
static CURRENT: RefCell<Vec<ReactiveContext>> = const { RefCell::new(vec![]) };
}

impl std::fmt::Display for ReactiveContext {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let read = self.inner.read();
match read.scope_subscriber {
Some(scope) => write!(f, "ReactiveContext for scope {:?}", scope),
None => {
#[cfg(debug_assertions)]
return write!(f, "ReactiveContext created at {}", read.origin);
#[cfg(not(debug_assertions))]
write!(f, "ReactiveContext")
}
}
}
}

impl Default for ReactiveContext {
#[track_caller]
fn default() -> Self {
Self::new_for_scope(None)
Self::new_for_scope(None, std::panic::Location::caller())
}
}

impl ReactiveContext {
/// Create a new reactive context
#[track_caller]
pub fn new() -> Self {
Self::default()
}

/// Create a new reactive context with a location for debugging purposes
/// This is useful for reactive contexts created within closures
pub fn new_with_origin(origin: &'static std::panic::Location<'static>) -> Self {
Self::new_for_scope(None, origin)
}

/// Create a new reactive context that may update a scope
pub(crate) fn new_for_scope(scope: Option<ScopeId>) -> Self {
#[allow(unused)]
pub(crate) fn new_for_scope(
scope: Option<ScopeId>,
origin: &'static std::panic::Location<'static>,
) -> Self {
let (tx, rx) = flume::unbounded();

let mut scope_subscribers = FxHashSet::default();
Expand All @@ -49,6 +76,8 @@ impl ReactiveContext {
self_: None,
update_any: schedule_update_any(),
receiver: rx,
#[cfg(debug_assertions)]
origin,
};

let mut self_ = Self {
Expand Down Expand Up @@ -87,6 +116,7 @@ impl ReactiveContext {
// Otherwise, create a new context at the current scope
Some(provide_context(ReactiveContext::new_for_scope(
current_scope_id(),
std::panic::Location::caller(),
)))
}

Expand All @@ -108,6 +138,17 @@ impl ReactiveContext {
/// Returns true if the context was marked as dirty, or false if the context has been dropped
pub fn mark_dirty(&self) -> bool {
if let Ok(self_read) = self.inner.try_read() {
#[cfg(debug_assertions)]
{
if let Some(scope) = self_read.scope_subscriber {
tracing::trace!("Marking reactive context for scope {:?} as dirty", scope);
} else {
tracing::trace!(
"Marking reactive context created at {} as dirty",
self_read.origin
);
}
}
if let Some(scope) = self_read.scope_subscriber {
(self_read.update_any)(scope);
}
Expand Down Expand Up @@ -148,4 +189,8 @@ struct Inner {
// Futures will call .changed().await
sender: flume::Sender<()>,
receiver: flume::Receiver<()>,

// Debug information for signal subscriptions
#[cfg(debug_assertions)]
origin: &'static std::panic::Location<'static>,
}
14 changes: 13 additions & 1 deletion packages/signals/src/signal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ impl<T, S: Storage<SignalData<T>>> Readable for Signal<T, S> {
let inner = self.inner.try_read()?;

if let Some(reactive_context) = ReactiveContext::current() {
tracing::trace!("Subscribing to the reactive context {}", reactive_context);
inner.subscribers.lock().unwrap().insert(reactive_context);
}

Expand Down Expand Up @@ -244,7 +245,11 @@ impl<T: 'static, S: Storage<SignalData<T>>> Writable for Signal<T, S> {
let borrow = S::map_mut(inner, |v| &mut v.value);
Write {
write: borrow,
drop_signal: Box::new(SignalSubscriberDrop { signal: *self }),
drop_signal: Box::new(SignalSubscriberDrop {
signal: *self,
#[cfg(debug_assertions)]
origin: std::panic::Location::caller(),
}),
}
})
}
Expand Down Expand Up @@ -344,10 +349,17 @@ impl<T: ?Sized, S: AnyStorage> DerefMut for Write<T, S> {

struct SignalSubscriberDrop<T: 'static, S: Storage<SignalData<T>>> {
signal: Signal<T, S>,
#[cfg(debug_assertions)]
origin: &'static std::panic::Location<'static>,
}

impl<T: 'static, S: Storage<SignalData<T>>> Drop for SignalSubscriberDrop<T, S> {
fn drop(&mut self) {
#[cfg(debug_assertions)]
tracing::trace!(
"Write on signal at {:?} finished, updating subscribers",
self.origin
);
self.signal.update_subscribers();
}
}

0 comments on commit f539698

Please sign in to comment.