fix(trace): weird indentation on new spans #354
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hawkw
added a commit
that referenced
this pull request
Oct 22, 2022
This branch adds support for APIC interrupt handling on x86_64 systems. In order to support Survival MultiPlayer, we need to be able to handle interrupts using the APIC rather than the PICs, because the APIC interrupt model allows multiple CPU cores to handle interrupts. This is part of the work towards SMP support (#345). This is a large change to the `hal-x86_64` crate's `interrupt` module in order to add types representing the `LocalApic` and `IoApic`, and to change the interrupt controller abstraction to switch to handling interrupts using APICs if the system has APICs. If APICs are not detected, we continue to use the PICs, but cannot support SMP. In addition, the kernel is updated to use the new HAL APIs. Several smaller changes to other parts of mycelium have been factored out from this PR to merge separately: * b99fb81 refac(hal-x86_64): move `pit` and `tsc` into `time` (#356) * 9994cd5 feat(hal-x86_64): add PIT driver (#355) * 30431a9 fix(trace): weird indentation on new spans (#354) * 91e97b7 feat(hal-x86_64): add `cpu::Msr` type for accessing MSRs (#353) We'll probably want to make additional changes to the new interrupt code in subsequent PRs, but this is enough to get mycelium to use the APICs, and demonstrate that he `maitake` timer wheel still works using the local APIC timer).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes an issue where nested spans were indented wrongly in
tracingoutput, and the wrong Unicode box drawing characters were usedwhen writing to the serial port. It also adds a delimiter character to
the framebuffer traces to make it more obvious when a span is entered.
This was factored out from #351 so that it can merge separately.
Before:
After: