Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: Add intrusive linkedlist for callsite registry #988

Merged
merged 9 commits into from
Oct 2, 2020
Merged

core: Add intrusive linkedlist for callsite registry #988

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a7a5b03
core: Add intrusive linkedlist for callsite registry
LucioFranco Sep 24, 2020
486103b
Add registration contrusctor and address comments
LucioFranco Sep 28, 2020
2638e89
Address clippy warnings
LucioFranco Sep 28, 2020
c28c714
Apply suggestions from code review
LucioFranco Sep 28, 2020
699e526
Apply suggestions from code review
LucioFranco Sep 28, 2020
d7ae64b
Move assert and clean up locking
LucioFranco Sep 28, 2020
57c19ee
Remove `Callsite::registration`
LucioFranco Sep 29, 2020
93483e6
Apply suggestions from code review
hawkw Oct 1, 2020
3fd30ad
Update tracing-core/src/callsite.rs
hawkw Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions tracing-core/src/callsite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,13 @@ pub trait Callsite: Sync {
/// [metadata]: ../metadata/struct.Metadata.html
fn metadata(&self) -> &Metadata<'_>;

/// Retrive the callsites intrusive registration.
/// Returns the callsite's [`Registration`] in the global callsite registry.
///
/// Every type implementing `Callsite` must own a single [`Registration`] which
/// is constructed with a static reference to that callsite. The `Registration` is
/// used to store the callsite in the global list of callsites. `Registration`s must be
/// unique per callsite; a callsite's `Registration` method must always return the
/// same `Registration`.
fn registration(&'static self) -> &'static Registration;
}

Expand Down Expand Up @@ -202,7 +208,10 @@ impl<T> Registration<T> {

impl fmt::Debug for Registration {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Registration").finish()
f.debug_struct("Registration")
.field("callsite", &format_args!("{:p}", self.callsite))
.field("next", &format_args!("{:p}", self.next.load(Ordering::Acquire))
.finish()
}
}

Expand All @@ -223,8 +232,7 @@ impl LinkedList {
fn for_each(&self, mut f: impl FnMut(&'static dyn Callsite)) {
let mut head = self.head.load(Ordering::Acquire);

while !head.is_null() {
let reg = unsafe { &*head };
while let Some(reg) = unsafe { head.as_ref() } {
f(reg.callsite);

head = reg.next.load(Ordering::Acquire);
Expand Down Expand Up @@ -274,7 +282,7 @@ mod tests {
impl Callsite for Cs1 {
fn set_interest(&self, _interest: Interest) {}
fn metadata(&self) -> &Metadata<'_> {
todo!()
unimplemented!("not needed for this test")
}

fn registration(&'static self) -> &'static Registration {
Expand Down