Skip to content

Commit

Permalink
tracer: Improve navigation state handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@oleavr
oleavr committed Oct 6, 2024
1 parent 2ed4128 commit 4c7dbfa
Showing 1 changed file with 43 additions and 74 deletions.
117 changes: 43 additions & 74 deletions apps/tracer/src/model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function useModel() {
const [draftedCode, setDraftedCode] = useState("");
const [captureBacktraces, _setCaptureBacktraces] = useState(false);

const [selectedTabId, _setSelectedTabId] = useState("events");
const [selectedTab, _setSelectedTab] = useState<TabId>("events");

const [events, setEvents] = useState<Event[]>([]);
const [latestMatchingEventIndex, setLatestMatchingEventIndex] = useState<number | null>(null);
Expand All @@ -41,6 +41,18 @@ export function useModel() {

const cachedSymbolsRef = useRef(new Map<bigint, string>());

const pushState = useCallback((updates: Partial<AppNavigationState>) => {
const state: AppNavigationState = {
handler: selectedHandlerId,
tab: selectedTab,
eventIndex: selectedEventIndex,
disassemblyTarget,
memoryLocation,
...updates,
};
history.pushState(state, "");
}, [selectedHandlerId, selectedTab, selectedEventIndex, disassemblyTarget, memoryLocation]);

const request = useCallback(<T extends RequestType>(type: T, payload: RequestPayload[T]): Promise<ResponsePayload[T]> => {
const rpcState = rpcStateRef.current;
const id = rpcState.nextRequestId++;
Expand Down Expand Up @@ -120,8 +132,8 @@ export function useModel() {

const setSelectedHandlerId = useCallback((handler: HandlerId) => {
_setSelectedHandlerId(handler);
pushState({ type: "handler", handler });
}, []);
pushState({ handler });
}, [pushState]);

const setCaptureBacktraces = useCallback(async (enabled: boolean) => {
_setCaptureBacktraces(enabled);
Expand All @@ -134,16 +146,16 @@ export function useModel() {
}, [request, selectedHandler]);

const disassemble = useCallback((target: DisassemblyTarget) => {
_setSelectedTabId("disassembly");
_setSelectedTab("disassembly");
setDisassemblyTarget(target);
pushState({ type: "tab", tab: "disassembly", target });
}, []);
pushState({ tab: "disassembly", disassemblyTarget: target });
}, [pushState]);

const showMemoryLocation = useCallback((location: bigint) => {
_setSelectedTabId("memory");
_setSelectedTab("memory");
setMemoryLocation(location);
pushState({ type: "tab", tab: "memory", location });
}, []);
pushState({ tab: "memory", memoryLocation: location });
}, [pushState]);

const startAddingTargets = useCallback(() => {
setAddingTargets(true);
Expand Down Expand Up @@ -266,20 +278,10 @@ export function useModel() {
}
}, [lastJsonMessage]);

const setSelectedTabId = useCallback((tab: "events" | "disassembly" | "memory") => {
_setSelectedTabId(tab);
switch (tab) {
case "events":
pushState({ type: "tab", tab, eventIndex: selectedEventIndex });
break;
case "disassembly":
pushState({ type: "tab", tab, target: disassemblyTarget });
break;
case "memory":
pushState({ type: "tab", tab, location: memoryLocation });
break;
}
}, [selectedEventIndex, disassemblyTarget, memoryLocation]);
const setSelectedTabId = useCallback((tab: TabId) => {
_setSelectedTab(tab);
pushState({ tab });
}, [pushState]);

useEffect(() => {
if (selectedHandler !== null) {
Expand All @@ -296,39 +298,25 @@ export function useModel() {
}, [selectedHandler, events]);

const setSelectedEventIndex = useCallback((index: number | null) => {
_setSelectedTabId("events");
_setSelectedTab("events");
_setSelectedEventIndex(index);
}, []);

useEffect(() => {
function onPopState(event: PopStateEvent) {
const state: AppNavigationState | null = event.state;
if (state !== null) {
switch (state.type) {
case "handler":
_setSelectedHandlerId(state.handler);
_setSelectedTabId("events");
break;
case "tab":
switch (state.tab) {
case "events":
_setSelectedTabId("events");
setSelectedEventIndex(state.eventIndex);
break;
case "disassembly":
_setSelectedTabId("disassembly");
setDisassemblyTarget(state.target);
break;
case "memory":
_setSelectedTabId("memory");
setMemoryLocation(state.location);
break;
}
break;
}
_setSelectedHandlerId(state.handler);
_setSelectedTab(state.tab);
_setSelectedEventIndex(state.eventIndex);
setDisassemblyTarget(state.disassemblyTarget);
setMemoryLocation(state.memoryLocation);
} else {
_setSelectedTabId("events");
_setSelectedHandlerId(null);
_setSelectedTab("events");
_setSelectedEventIndex(null);
setDisassemblyTarget(undefined);
setMemoryLocation(undefined);
}
}

Expand Down Expand Up @@ -358,7 +346,7 @@ export function useModel() {
captureBacktraces,
setCaptureBacktraces,

selectedTabId,
selectedTabId: selectedTab,
setSelectedTabId,

events,
Expand Down Expand Up @@ -416,6 +404,8 @@ interface HandlerConfig {
capture_backtraces: boolean;
}

export type TabId = "events" | "disassembly" | "memory";

export type StagedItem = [id: StagedItemId, scope: ScopeName, member: MemberName];
export type StagedItemId = number;

Expand Down Expand Up @@ -570,31 +560,10 @@ interface RequestErrorMessage {
};
}

type AppNavigationState = HandlerNavigationState | EventsNavigationState | DisassemblyNavigationState | MemoryNavigationState;

interface HandlerNavigationState {
type: "handler";
handler: HandlerId;
}

interface EventsNavigationState {
type: "tab";
tab: "events";
interface AppNavigationState {
handler: HandlerId | null;
tab: TabId;
eventIndex: number | null;
}

interface DisassemblyNavigationState {
type: "tab";
tab: "disassembly";
target: DisassemblyTarget | undefined;
}

interface MemoryNavigationState {
type: "tab";
tab: "memory";
location: bigint | undefined;
}

function pushState(state: AppNavigationState) {
history.pushState(state, "");
disassemblyTarget: DisassemblyTarget | undefined;
memoryLocation: bigint | undefined;
}

0 comments on commit 4c7dbfa

Please sign in to comment.